From 5e0c0e4bffc6966f56c233b0af1b18b0ef42e3bc Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 19 Feb 2023 00:37:20 +0100 Subject: Add bookstack profile+role Signed-off-by: Georg Pfuetzenreuter --- salt/profile/bookstack/init.sls | 70 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 salt/profile/bookstack/init.sls (limited to 'salt/profile') diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls new file mode 100644 index 0000000..af14a4b --- /dev/null +++ b/salt/profile/bookstack/init.sls @@ -0,0 +1,70 @@ +{%- set mypillar = salt['pillar.get']('profile:bookstack', {}) -%} +{%- set configfile = '/etc/sysconfig/BookStack' -%} + +bookstack_packages: + pkg.installed: + - names: + - BookStack-config-php-fpm-apache + +bookstack_permissions: + file.managed: + - mode: '0640' + - user: root + - group: wwwrun + - names: + - {{ configfile }} + +{%- if mypillar | length %} +{{ configfile }}: + file.keyvalue: + - separator: '=' + - show_changes: False + - require: + - pkg: bookstack_packages + - key_values: + {%- macro condconf(option) %} + {%- if option in mypillar -%} + {{ option | upper }}: {{ mypillar[option] }} + {%- endif -%} + {%- endmacro %} + {{ condconf('app_url') }} + {{ condconf('db_host') }} + {{ condconf('db_database') }} + {{ condconf('db_username') }} + {{ condconf('db_password') }} + {{ condconf('mail_driver') }} + {{ condconf('mail_from_name') }} + {{ condconf('mail_from') }} + {{ condconf('mail_host') }} + {{ condconf('mail_port') }} + {{ condconf('mail_username') }} + {{ condconf('mail_password') }} + {{ condconf('mail_encryption') }} + {{ condconf('app_theme') }} + {{ condconf('cache_driver') }} + {{ condconf('session_driver') }} + {{ condconf('memcached_servers') }} + {{ condconf('session_secure_cookie') }} + {{ condconf('session_cookie_name') }} + {{ condconf('app_debug') }} + {{ condconf('session_lifetime') }} + {{ condconf('auth_method') }} + {{ condconf('auth_auto_initiate') }} + {{ condconf('saml2_name') }} + {{ condconf('saml2_email_attribute') }} + {{ condconf('saml2_external_id_attribute') }} + {{ condconf('saml2_display_name_attributes') }} + {{ condconf('saml2_idp_entityid') }} + {{ condconf('saml2_idp_entityid') }} + {{ condconf('saml2_idp_sso') }} + {{ condconf('saml2_idp_slo') }} + {{ condconf('saml2_idp_x509') }} + {{ condconf('saml2_autoload_metadata') }} + {{ condconf('saml2_sp_x509') }} + {{ condconf('saml2_user_to_groups') }} + {{ condconf('saml2_group_attribute') }} + {{ condconf('saml2_remove_from_groups') }} + {{ condconf('saml2_dump_user_details') }} + {{ condconf('queue_connection') }} + {{ condconf('app_views_books') }} +{%- endif %} -- cgit v1.2.3 From 4653655010c16d8f1f128480b55d4cd2e9f5a9e7 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 19 Feb 2023 13:40:47 +0100 Subject: profile.apache-httpd: manage snippets - add apache-httpd profile with snippets configuration - add TLS snippet to apache-httpd role pillar Signed-off-by: Georg Pfuetzenreuter --- salt/profile/apache-httpd/init.sls | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 salt/profile/apache-httpd/init.sls (limited to 'salt/profile') diff --git a/salt/profile/apache-httpd/init.sls b/salt/profile/apache-httpd/init.sls new file mode 100644 index 0000000..db5b6f9 --- /dev/null +++ b/salt/profile/apache-httpd/init.sls @@ -0,0 +1,31 @@ +{%- set snippetsdir = '/etc/apache2/snippets.d' -%} +{%- set mypillar = salt['pillar.get']('profile:apache-httpd', {}) -%} + +{{ snippetsdir }}: + file.directory: + - makedirs: True + +{%- if 'snippets' in mypillar %} +{%- for snippet, config in mypillar['snippets'].items() %} +{{ snippetsdir }}/{{ snippet }}.conf: + file.managed: + - contents: + {%- for line in config %} + - {{ line }} + {%- endfor %} + - require: + - file: {{ snippetsdir }} + {#- formula dependencies #} + - require_in: + - module: apache-service-running-restart + - service: apache-service-running + - watch_in: + - module: apache-service-running-reload +{%- endfor %} +{%- endif %} + +include: + - apache.config + + + -- cgit v1.2.3 From c932881cd70bd64db40245ea1e3df283f3859c78 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sat, 11 Mar 2023 18:10:07 +0100 Subject: profile.bookstack: quote keys Some keys needed quoting to pass the YAML parser. Signed-off-by: Georg Pfuetzenreuter --- salt/profile/bookstack/init.sls | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'salt/profile') diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls index af14a4b..3dc5a36 100644 --- a/salt/profile/bookstack/init.sls +++ b/salt/profile/bookstack/init.sls @@ -24,7 +24,12 @@ bookstack_permissions: - key_values: {%- macro condconf(option) %} {%- if option in mypillar -%} - {{ option | upper }}: {{ mypillar[option] }} + {%- if mypillar[option] is string and mypillar[option].startswith('$') or mypillar[option] is number %} + {%- set value = mypillar[option] %} + {%- else %} + {%- set value = mypillar[option] | quote %} + {%- endif %} + {{ option | upper }}: {{ value }} {%- endif -%} {%- endmacro %} {{ condconf('app_url') }} @@ -55,7 +60,6 @@ bookstack_permissions: {{ condconf('saml2_external_id_attribute') }} {{ condconf('saml2_display_name_attributes') }} {{ condconf('saml2_idp_entityid') }} - {{ condconf('saml2_idp_entityid') }} {{ condconf('saml2_idp_sso') }} {{ condconf('saml2_idp_slo') }} {{ condconf('saml2_idp_x509') }} -- cgit v1.2.3