diff --git a/pillar/role/calendar.sls b/pillar/role/calendar.sls index 55de7b1..0376928 100644 --- a/pillar/role/calendar.sls +++ b/pillar/role/calendar.sls @@ -1,3 +1,5 @@ +{%- from 'macros.jinja' import redis %} + include: {%- if salt['grains.get']('include_secrets', True) %} - secrets.role.calendar @@ -35,3 +37,5 @@ nginx: - access_log: /var/log/nginx/calendar.access.log combined - error_log: /var/log/nginx/calendar.error.log enabled: True + +{{ redis('calendar', True) }} diff --git a/pillar/role/paste.sls b/pillar/role/paste.sls index 7abe451..875c811 100644 --- a/pillar/role/paste.sls +++ b/pillar/role/paste.sls @@ -1,3 +1,5 @@ +{%- from 'macros.jinja' import redis %} + include: {% if salt['grains.get']('include_secrets', True) %} - secrets.role.paste @@ -36,6 +38,8 @@ nginx: - error_log: /var/log/nginx/paste.error.log enabled: True +{{ redis('paste', True) }} + zypper: repositories: devel:languages:ruby: diff --git a/salt/role/calendar.sls b/salt/role/calendar.sls index a00a54b..857e153 100644 --- a/salt/role/calendar.sls +++ b/salt/role/calendar.sls @@ -1,4 +1,4 @@ include: + - redis - profile.web.server.nginx - profile.calendar - - profile.pagure.redis diff --git a/salt/role/paste.sls b/salt/role/paste.sls index 157b218..d2ad095 100644 --- a/salt/role/paste.sls +++ b/salt/role/paste.sls @@ -1,4 +1,4 @@ include: + - redis - profile.web.server.nginx - profile.paste - - profile.pagure.redis