From 938be46fafe1ef125a941693687a5c6822dbfe52 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 30 Apr 2023 18:20:54 +0200 Subject: Quote BookStack values Some strings contain spaces or special characters and should be quoted. Signed-off-by: Georg Pfuetzenreuter --- salt/profile/bookstack/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'salt') diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls index 3dc5a36..a9ef891 100644 --- a/salt/profile/bookstack/init.sls +++ b/salt/profile/bookstack/init.sls @@ -27,7 +27,7 @@ bookstack_permissions: {%- 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] ~ "'" | quote %} {%- endif %} {{ option | upper }}: {{ value }} {%- endif -%} -- cgit v1.2.3 From ef0a931157da5823c4eb54da41c9d60f4d582eab Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 30 Apr 2023 18:27:35 +0200 Subject: Correct BookStack group Environment file needs to be readable by the www, not the wwwrun, group for PHP-FPM to be able to access it. Signed-off-by: Georg Pfuetzenreuter --- salt/profile/bookstack/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'salt') diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls index a9ef891..05f07b6 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 }} -- cgit v1.2.3