LibertaCasa/salt
LibertaCasa/salt
9
1
Fork 0
Code Issues 5 Pull Requests Releases Activity
285 Commits 10 Branches 0 Tags 849 KiB
937b3c99b7
Commit Graph

285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Georg Pfuetzenreuter
b7f34f8b9d Merge pull request 'Add manage_firewall conditional' (#48) from firewall-optional into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #48
 2023-04-30 16:11:46 +02:00
Georg Pfuetzenreuter
b685f16c91
Add manage_firewall conditional
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
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>
 2023-04-30 16:07:21 +02:00
Georg Pfuetzenreuter
f90197f791 Merge pull request 'Add empty role.bookstack pillar' (#47) from bookstack-pillar into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #47
 2023-04-30 14:58:14 +02:00
Georg Pfuetzenreuter
e8107a3054
Add empty role.bookstack pillar
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
For some reason Salt complains about the file missing (albeit us using
having "ignore_missing" enabled in the pillar top).

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-04-30 14:54:43 +02:00
Georg Pfuetzenreuter
524c82cafa Merge pull request 'Allow saltenv/pillarenv override' (#45) from saltenv into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #45
 2023-04-30 14:49:12 +02:00
Georg Pfuetzenreuter
d4f39e8e5f
Allow saltenv/pillarenv override
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
To ease development, allow saltenv=<branch>/pillarenv=<branch> instead
of enforcing the production branch.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-04-30 14:43:59 +02:00
Georg Pfuetzenreuter
a7cd6609e6 Merge pull request 'Watch httpd service for snippets' (#46) from httpd-service into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #46
 2023-04-30 14:43:42 +02:00
Georg Pfuetzenreuter
d65cb9a43b
Watch httpd service for snippets
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
The reload/restart module calls have been dropped from the formula.
Watch the service.running state instead.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-04-30 14:39:27 +02:00
Georg Pfuetzenreuter
b1249e69eb Merge pull request 'Import themis / PrivateBin' (#40) from privatebin into production
Some checks failed
ci/lysergic/push/pipeline Pipeline failed
Details 
Reviewed-on: #40
 2023-04-30 14:37:12 +02:00
Georg Pfuetzenreuter
87bb69fa37 Merge pull request 'Split out salt.formulas state' (#44) from profile-formulas into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #44
 2023-04-29 19:07:32 +02:00
Georg Pfuetzenreuter
76d1da11d9
Split out salt.formulas state
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Allow formulas update on Salt master without applying the complete Salt
master profile.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-04-29 18:55:49 +02:00
Georg Pfuetzenreuter
f32d814658
id.themis: import backend firewall rules
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Allow HTTPS traffic.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-04-29 18:39:30 +02:00
Georg Pfuetzenreuter
a6319da822 Merge pull request 'Add tg lucy channel mapping' (#43) from mattertgbridge into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #43
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-04-14 17:07:49 +02:00
Pratyush Desai
9d9e61d51d
Add tg lucy channel mapping
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-04-14 18:45:51 +05:30
Georg Pfuetzenreuter
8420bbdf6f Merge pull request 'Add ChillNet matterbridge' (#42) from chillnet into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #42
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-04-09 21:24:24 +02:00
Pratyush Desai
508c0dc1b2
Add Chillnet to matterbridge
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-04-10 00:25:14 +05:30
Pratyush Desai
6ebd02042f
Refactor matterbridge_media macro 
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-04-10 00:18:59 +05:30
Georg Pfuetzenreuter
4ff7a39f0e
id.themis: import PrivateBin httpd vhost
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-03-12 17:21:32 +01:00
Georg Pfuetzenreuter
bf3aaa5ff1
id.themis: import PrivateBin configuration
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-03-12 17:01:17 +01:00
Georg Pfuetzenreuter
96daffc979
Add privatebin profile+role 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-03-12 17:01:00 +01:00
Pratyush Desai
84c1cecf61 Merge pull request 'Import themis / BookStack' (#35) from bookstack into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #35
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-03-11 22:11:32 +01:00
Georg Pfuetzenreuter
c932881cd7
profile.bookstack: quote keys
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Some keys needed quoting to pass the YAML parser.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-03-11 18:10:07 +01:00
Georg Pfuetzenreuter
a1ce36fd6c
Enable php-formula
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:29 +01:00
Georg Pfuetzenreuter
c28a4f5a52
role.bookstack: include php-fpm 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:29 +01:00
Georg Pfuetzenreuter
361e118b31
Add php-fpm role 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:29 +01:00
Georg Pfuetzenreuter
f55e5363a0
Enable memcached-formula 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:28 +01:00
Georg Pfuetzenreuter
edbf9f3f20
role.bookstack: include memcached 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:28 +01:00
Georg Pfuetzenreuter
f820978b78
Add memcached role 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:28 +01:00
Georg Pfuetzenreuter
4653655010
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 <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:28 +01:00
Georg Pfuetzenreuter
d8d848055f
id.themis: add BookStack configuration 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:28 +01:00
Georg Pfuetzenreuter
e36d40dbc3
id.themis: add BookStack httpd configuration 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:28 +01:00
Georg Pfuetzenreuter
5e0c0e4bff
Add bookstack profile+role 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 13:14:27 +01:00
Georg Pfuetzenreuter
906dd92d7e
Add web.apache-httpd role 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 11:10:05 +01:00
Georg Pfuetzenreuter
e58c63decc
Enable apache-formula 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-26 11:10:04 +01:00
Georg Pfuetzenreuter
cc007e6470 Merge pull request 'Import moni Prometheus configuration' (#32) from prometheus-moni into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #32
 2023-02-25 16:47:21 +01:00
Pratyush Desai
c8c91269fd Merge pull request 'pipeline.gommit: allow more characters in prefix' (#38) from commit-lint into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #38
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-02-22 20:37:50 +01:00
Georg Pfuetzenreuter
ddb72f1cb3
Disable commit linting
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Temporary change until imports with existing messages are finished.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-21 19:08:27 +01:00
Georg Pfuetzenreuter
0730cbb4c2
Manage Prometheus firewall rules 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-21 19:06:04 +01:00
Georg Pfuetzenreuter
cade9c0aca
Moni: Read Blackbox targets as JSON 
Use uniform JSON target files instead of a JSON/YAML mix.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-21 19:06:03 +01:00
Georg Pfuetzenreuter
8016f86164
p.node_exporter->p.prometheus.node_exporter 
Since the last commit introduced a new Prometheus targets profile, it
makes sense to move node_exporter underneath the Prometheus tree as
well.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-21 19:06:01 +01:00
Georg Pfuetzenreuter
2bafbeedd7
Manage Prometheus targets 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-21 19:05:40 +01:00
Georg Pfuetzenreuter
979021f5c4
Import Prometheus server configuration 
* add new roles:
  - monitoring.prometheus
  - monitoring.prometheus-alertmanager
  - monitoring.prometheus-exporter-blackbox
* add common Prometheus and Prometheus Alertmanager pillar data
* add moni.lysergic.dev specific Prometheus pillar data

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-21 19:05:03 +01:00
Georg Pfuetzenreuter
cdd09ed524
pipeline.gommit: allow more characters in prefix
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
- For profiles/roles with - or _ in their name
- In the future we should rename all - to _ and adjust the regex to forbid all -

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-20 20:09:14 +01:00
Pratyush Desai
a705925aa6 Merge pull request 'Commmit lint: allow pipeline + more characters' (#37) from commit-lint into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #37
 2023-02-20 19:34:14 +01:00
Georg Pfuetzenreuter
0c8e3159d3
pipeline.gommit: allow pipeline + more characters
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
- allow pipeline.* prefix
- allow some special characters in summary

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-19 22:18:43 +01:00
Pratyush Desai
6e43bbbe44 Merge pull request 'Enable commit message linting' (#36) from commit-lint into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #36
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2023-02-19 20:54:59 +01:00
Georg Pfuetzenreuter
68e41ceab8
Enable commit linting
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-19 20:43:10 +01:00
Georg Pfuetzenreuter
d082729a66
Add commit linting 
- add gommit configuration
- add wrapper script

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-19 20:43:09 +01:00
Georg Pfuetzenreuter
51da14de69 Merge pull request 'Linting' (#33) from linting into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
Reviewed-on: #33
 2023-02-15 23:22:08 +01:00
Georg Pfuetzenreuter
18d28c3b7f
Address salt-lint errors/warnings
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details 
- remove trailing whitespaces
- format octal modes correctly

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2023-02-15 23:18:54 +01:00