LibertaCasa/salt
LibertaCasa/salt
9
1
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge pull request 'BookStack fixups' (#51) from bookstack-fixup into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details

Browse Source 
Reviewed-on: #51
This commit is contained in:
Georg Pfuetzenreuter 2023-04-30 18:34:12 +02:00
commit 8d9af70941
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pillar/id/themis_lysergic_dev.sls
View File

@ -88,9 +88,9 @@ profile:
saml2_email_attribute: email saml2_email_attribute: email
saml2_external_id_attribute: uid saml2_external_id_attribute: uid
saml2_display_name_attributes: fullname 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_idp_x509: ${'secret_bookstack:saml2_idp_x509'}
saml2_autoload_metadata: false saml2_autoload_metadata: false
saml2_sp_x509: ${'secret_bookstack:saml2_sp_x509'} saml2_sp_x509: ${'secret_bookstack:saml2_sp_x509'}

4
salt/profile/bookstack/init.sls
View File

@ -10,7 +10,7 @@ bookstack_permissions:
file.managed: file.managed:
- mode: '0640' - mode: '0640'
- user: root - user: root
- group: wwwrun - group: www
- names: - names:
- {{ configfile }} - {{ configfile }}
@ -27,7 +27,7 @@ bookstack_permissions:
{%- 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] %} {%- set value = mypillar[option] %}
{%- else %} {%- else %}
{%- set value = mypillar[option] | quote %} {%- set value = "'" ~ mypillar[option] ~ "'" | quote %}
{%- endif %} {%- endif %}
{{ option | upper }}: {{ value }} {{ option | upper }}: {{ value }}
{%- endif -%} {%- endif -%}