Add manage_firewall conditional
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful

Allow us to enroll machines in Salt which do not yet have their firewall
configuration imported without having their rules overwritten.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
Georg Pfuetzenreuter 2023-04-30 16:07:21 +02:00
parent f90197f791
commit b685f16c91
Signed by: Georg
GPG Key ID: 1ED2F138E7E6FF57
7 changed files with 11 additions and 0 deletions

View File

@ -212,6 +212,7 @@ nginx:
- error_log: /var/log/nginx/libsso_public.error.log - error_log: /var/log/nginx/libsso_public.error.log
- access_log: /var/log/nginx/libsso_public.access.log combined - access_log: /var/log/nginx/libsso_public.access.log combined
manage_firewall: True
firewalld: firewalld:
zones: zones:
public: public:

View File

@ -267,6 +267,7 @@ profile:
host: 'chillnet\.matterbridge\.dericom02\.rigel\.lysergic\.dev' host: 'chillnet\.matterbridge\.dericom02\.rigel\.lysergic\.dev'
root: {{ mediapath }}chill root: {{ mediapath }}chill
manage_firewall: True
firewalld: firewalld:
zones: zones:
web: web:

View File

@ -12,3 +12,5 @@ tor:
hostname: cr36xbvmgjwnfw4sly4kuc6c3ozhesjre3y5pggq5xdkkmbrq6dz4fad.onion hostname: cr36xbvmgjwnfw4sly4kuc6c3ozhesjre3y5pggq5xdkkmbrq6dz4fad.onion
hs_ed25519_public_key: PT0gZWQyNTUxOXYxLXB1YmxpYzogdHlwZTAgPT0AAAAUd+uGrDJs0tuSXjiqC8LbsnJJMSbx15jQ7calMDGHhw== hs_ed25519_public_key: PT0gZWQyNTUxOXYxLXB1YmxpYzogdHlwZTAgPT0AAAAUd+uGrDJs0tuSXjiqC8LbsnJJMSbx15jQ7calMDGHhw==
hs_ed25519_secret_key: ${'secret_tor:hidden_services:irc:key'} hs_ed25519_secret_key: ${'secret_tor:hidden_services:irc:key'}
manage_firewall: True

View File

@ -441,3 +441,4 @@ nginx:
- sub_filter_types: application/xml - sub_filter_types: application/xml
- sub_filter: takahe.rigel.lysergic.dev:8000 exhausted.life - sub_filter: takahe.rigel.lysergic.dev:8000 exhausted.life
manage_firewall: True

View File

@ -108,3 +108,5 @@ prometheus:
require_tls: false require_tls: false
smarthost: 'zz0.email:465' smarthost: 'zz0.email:465'
send_resolved: yes send_resolved: yes
manage_firewall: True

View File

@ -142,6 +142,7 @@ profile:
pwd: ${'secret_privatebin:model_options:pwd'} pwd: ${'secret_privatebin:model_options:pwd'}
opt[12]: true opt[12]: true
manage_firewall: True
firewalld: firewalld:
zones: zones:
backend: backend:

View File

@ -1,5 +1,8 @@
include: include:
{#- drop pillar check after all firewall configurations have been imported #}
{%- if salt['pillar.get']('manage_firewall'), False %}
- firewalld - firewalld
{%- endif %}
- profile.seccheck - profile.seccheck
- profile.zypp - profile.zypp
- profile.prometheus.node_exporter - profile.prometheus.node_exporter