summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-04-30 18:34:12 +0200
committerGeorg Pfuetzenreuter2023-04-30 18:34:12 +0200
commit8d9af70941de7c4856a7187b58af10c673c33815 (patch)
treeb9cd1a911041c8d73324b523ac202df649ebad46
parent600a73a984f5452e840c1c69db2b91763d760734 (diff)
parentef0a931157da5823c4eb54da41c9d60f4d582eab (diff)
downloadsalt-8d9af70941de7c4856a7187b58af10c673c33815.tar.gz
salt-8d9af70941de7c4856a7187b58af10c673c33815.tar.bz2
salt-8d9af70941de7c4856a7187b58af10c673c33815.zip
Merge pull request 'BookStack fixups' (#51) from bookstack-fixup into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/51
-rw-r--r--pillar/id/themis_lysergic_dev.sls6
-rw-r--r--salt/profile/bookstack/init.sls4
2 files changed, 5 insertions, 5 deletions
diff --git a/pillar/id/themis_lysergic_dev.sls b/pillar/id/themis_lysergic_dev.sls
index 52186a6..503ec80 100644
--- 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_sso: https://libsso.net/realms/libertacasa/protocol/saml
- saml2_idp_slo: https://libsso.net/realms/libertacasa/protocol/saml
+ saml2_idp_entityid: https://libsso.net/realms/LibertaCasa
+ saml2_idp_sso: 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'}
diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls
index 3dc5a36..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 }}
@@ -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 -%}