diff options
Diffstat (limited to 'salt')
| -rw-r--r-- | salt/common/suse.sls | 4 | ||||
| -rw-r--r-- | salt/profile/bookstack/init.sls | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/salt/common/suse.sls b/salt/common/suse.sls index 01c7333..da0a99e 100644 --- a/salt/common/suse.sls +++ b/salt/common/suse.sls @@ -1,3 +1,5 @@ +{%- set roles = salt['http.query']('http://machine-roles.lysergic.dev:4580/roles', decode=True, decode_type='json', params={"machine": id})['dict']['roles'] -%} + include: {#- drop pillar check after all firewall configurations have been imported #} {%- if salt['pillar.get']('manage_firewall'), False %} @@ -65,7 +67,9 @@ common_packages_remove: {#- we only use AutoYaST for the OS deployment #} - autoyast2 - autoyast2-installation + {%- if not 'php-fpm' in roles %} - libX11-data + {%- endif %} - yast2-add-on - yast2-services-manager - yast2-slp diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls index 3dc5a36..ea75ec4 100644 --- a/salt/profile/bookstack/init.sls +++ b/salt/profile/bookstack/init.sls @@ -10,7 +10,7 @@ bookstack_permissions: file.managed: - mode: '0640' - user: root - - group: wwwrun + - group: www - names: - {{ configfile }} @@ -24,10 +24,10 @@ bookstack_permissions: - key_values: {%- macro condconf(option) %} {%- if option in mypillar -%} - {%- if mypillar[option] is string and mypillar[option].startswith('$') or mypillar[option] is number %} + {%- if ( mypillar[option] is string and mypillar[option].startswith('$') ) or mypillar[option] is number %} {%- set value = mypillar[option] %} {%- else %} - {%- set value = mypillar[option] | quote %} + {%- set value = "\"'" ~ mypillar[option] ~ "'\"" %} {%- endif %} {{ option | upper }}: {{ value }} {%- endif -%} |