Merge pull request 'BookStack fixups' (#51 ) from bookstack-fixup into production

Reviewed-on: #51
Correct BookStack group
2023-04-30 18:34:12 +02:00 · 2023-04-30 18:27:35 +02:00 · 2023-04-30 18:22:58 +02:00 · 2023-04-30 18:20:54 +02:00
2 changed files with 5 additions and 5 deletions
--- a/pillar/id/themis_lysergic_dev.sls
+++ b/pillar/id/themis_lysergic_dev.sls
@ -88,9 +88,9 @@ profile:
    saml2_email_attribute: email
    saml2_external_id_attribute: uid
    saml2_display_name_attributes: fullname
-    saml2_idp_entityid: https://libsso.net/realms/libertacasa
+    saml2_idp_entityid: https://libsso.net/realms/LibertaCasa
-    saml2_idp_sso: https://libsso.net/realms/libertacasa/protocol/saml
+    saml2_idp_sso: https://libsso.net/realms/LibertaCasa/protocol/saml
-    saml2_idp_slo: https://libsso.net/realms/libertacasa/protocol/saml
+    saml2_idp_slo: https://libsso.net/realms/LibertaCasa/protocol/saml
    saml2_idp_x509: ${'secret_bookstack:saml2_idp_x509'}
    saml2_autoload_metadata: false
    saml2_sp_x509: ${'secret_bookstack:saml2_sp_x509'}
--- 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 }}
@ -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 -%}
Author	SHA1	Message	Date
Georg Pfuetzenreuter	8d9af70941	Merge pull request 'BookStack fixups' (#51 ) from bookstack-fixup into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #51	2023-04-30 18:34:12 +02:00
Georg Pfuetzenreuter	ef0a931157	Correct BookStack group All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details 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 <mail@georg-pfuetzenreuter.net>	2023-04-30 18:27:35 +02:00
Georg Pfuetzenreuter	d8359f002d	Correct SAML realm capitalization All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details The Keycloak realm is named "LibertaCasa", not "libertacasa". Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-30 18:22:58 +02:00
Georg Pfuetzenreuter	938be46faf	Quote BookStack values All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Some strings contain spaces or special characters and should be quoted. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-30 18:20:54 +02:00