diff options
| author | Georg Pfuetzenreuter | 2023-02-15 23:22:08 +0100 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-02-15 23:22:08 +0100 |
| commit | 51da14de69ac98ddd49cae393a76d64bded041b0 (patch) | |
| tree | e16882e59a3f08fe1a09220d2a8d7c8358b7f23c /pillar | |
| parent | 6096be0f8107b89e50bc54ffd224fd3e88ca8c2f (diff) | |
| parent | 18d28c3b7fed42e29eb9ff7b11b4dd1a54f8a510 (diff) | |
| download | salt-51da14de69ac98ddd49cae393a76d64bded041b0.tar.gz salt-51da14de69ac98ddd49cae393a76d64bded041b0.tar.bz2 salt-51da14de69ac98ddd49cae393a76d64bded041b0.zip | |
Merge pull request 'Linting' (#33) from linting into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/33
Diffstat (limited to 'pillar')
| -rw-r--r-- | pillar/formulas.yaml | 1 | ||||
| -rw-r--r-- | pillar/id/dericom02_rigel_lysergic_dev.sls | 2 | ||||
| -rw-r--r-- | pillar/id/deriweb01_rigel_lysergic_dev.sls | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pillar/formulas.yaml b/pillar/formulas.yaml index 89f7405..191a8e1 100644 --- a/pillar/formulas.yaml +++ b/pillar/formulas.yaml @@ -1,3 +1,4 @@ +--- - firewalld - keepalived - nginx diff --git a/pillar/id/dericom02_rigel_lysergic_dev.sls b/pillar/id/dericom02_rigel_lysergic_dev.sls index 4309cf9..51a487e 100644 --- a/pillar/id/dericom02_rigel_lysergic_dev.sls +++ b/pillar/id/dericom02_rigel_lysergic_dev.sls @@ -23,7 +23,7 @@ profile: NickServNick: viaduct NickServPassword: ${'secret_matterbridge:general:accounts:irc.libertacasa:NickServPassword'} ColorNicks: 'true' - Charset: utf8 + Charset: utf8 MessageSplit: 'true' MessageQueue: 60 UseRelayMsg: 'true' diff --git a/pillar/id/deriweb01_rigel_lysergic_dev.sls b/pillar/id/deriweb01_rigel_lysergic_dev.sls index ca607ba..77b553a 100644 --- a/pillar/id/deriweb01_rigel_lysergic_dev.sls +++ b/pillar/id/deriweb01_rigel_lysergic_dev.sls @@ -412,7 +412,7 @@ nginx: - location /: - proxy_pass: http://media.takahe.rigel.lysergic.dev:8001 {{ takaheresolver }} - {#- despair.life is a second entry-point to social.liberta.casa instead of only a secondary domain in Takahe #} + {#- despair.life is a second entry-point to social.liberta.casa instead of only a secondary domain in Takahe #} - server: {{ takahe_includes() }} - server_name: despair.life @@ -436,7 +436,7 @@ nginx: - snippets/error - server_name: exhausted.life {{ takahe_gohome() }} - - location /.well-known/: + - location /.well-known/: - proxy_pass: {{ backend.takahe }} - sub_filter_types: application/xml - sub_filter: takahe.rigel.lysergic.dev:8000 exhausted.life |