summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request 'enroll derigsm01' (#94) from add_derigsm01 into productionGeorg Pfuetzenreuter2024-01-251-0/+1
|\
| * enroll derigsm01Pratyush Desai2024-01-091-0/+1
|/
* Merge pull request 'attempt disc-chilldevirc connect' (#93) from chillcord in...Pratyush Desai2023-10-041-1/+5
|\
| * Merge branch 'production' into chillcordPratyush Desai2023-10-040-0/+0
| |\ | |/ |/|
* | Merge pull request 'Remove chillops bridge gateway' (#92) from bridgeupdates ...Pratyush Desai2023-10-031-4/+0
|\ \
| | * attempt disc-chilldevirc connectPratyush Desai2023-10-041-1/+5
| |/
| * remove chillops gateway matterbPratyush Desai2023-10-031-4/+0
|/
* Merge pull request 'link keytomb irclc<->tg' (#90) from matterb-tg-irc-keytom...Pratyush Desai2023-08-201-0/+3
|\
| * link keytomb irclc<->tgPratyush Desai2023-08-201-0/+3
|/
* Merge pull request 'attempt at fixing the irc-tg link' (#89) from add/matterb...Pratyush Desai2023-08-191-1/+1
|\
| * attempt at fixing the irc-tg linkPratyush Desai2023-08-191-1/+1
|/
* Merge pull request 'add petals irccasa<->tg' (#88) from add/matterb-lcirc-tg-...Pratyush Desai2023-08-181-4/+4
|\
| * add petals irccasa<->tgPratyush Desai2023-08-151-4/+4
|/
* Merge pull request 'fix syntax error in pull 86' (#87) from fix/matterb-chill...Pratyush Desai2023-08-101-1/+1
|\
| * fix syntax error in pull 86Pratyush Desai2023-08-101-1/+1
|/
* Merge pull request 'bridge ircdevchan tgdevchan' (#86) from add/matterbridge-...Pratyush Desai2023-08-101-0/+3
|\
| * bridge ircdevchan tgdevchanadd/matterbridge-chillnet-tgchanPratyush Desai2023-08-101-0/+3
|/
* Merge pull request 'denc-webcluster: include proxy in agola' (#85) from fix/n...Pratyush Desai2023-07-311-0/+1
|\
| * denc-webcluster: include proxy in agolaGeorg Pfuetzenreuter2023-07-311-0/+1
|/
* Merge pull request 'Repair boolean' (#84) from fix/nginx/boolean into productionPratyush Desai2023-07-311-1/+1
|\
| * Repair booleanGeorg Pfuetzenreuter2023-07-311-1/+1
* | Merge pull request 'denc-webcluster: exclude 949110' (#83) from fix/bookstack...Pratyush Desai2023-07-311-1/+1
|\ \ | |/ |/|
| * denc-webcluster: exclude 949110Georg Pfuetzenreuter2023-07-311-1/+1
|/
* Merge pull request 'Repair boolean' (#82) from ci into productionGeorg Pfuetzenreuter2023-07-211-1/+1
|\
| * Repair booleanGeorg Pfuetzenreuter2023-07-211-1/+1
|/
* Merge pull request 'Add reverse proxy for Agola' (#81) from ci into productionGeorg Pfuetzenreuter2023-07-211-0/+11
|\
| * Add reverse proxy for AgolaGeorg Pfuetzenreuter2023-07-211-0/+11
|/
* Merge pull request 'Initialize OpenBSD support' (#80) from OpenBSD into produ...Georg Pfuetzenreuter2023-07-161-0/+1
|\
| * Initialize OpenBSD supportGeorg Pfuetzenreuter2023-07-161-0/+1
* | Merge pull request 'Optimize minion' (#79) from minion-optimization into prod...Georg Pfuetzenreuter2023-07-161-0/+2
|\ \ | |/ |/|
| * Optimize minionGeorg Pfuetzenreuter2023-07-161-0/+2
|/
* Merge pull request 'Add http(s) to thetrip public zone' (#78) from thetrip-fi...Georg Pfuetzenreuter2023-07-011-0/+6
|\
| * Add http(s) to thetrip public zoneGeorg Pfuetzenreuter2023-07-011-0/+6
|/
* Merge pull request 'Manage firewall on thetrip' (#77) from thetrip-firewall i...Georg Pfuetzenreuter2023-07-011-0/+1
|\
| * Manage firewall on thetripGeorg Pfuetzenreuter2023-07-011-0/+1
|/
* Merge pull request 'Manage firewall on derutil01' (#76) from derutil01-fw int...Georg Pfuetzenreuter2023-06-281-0/+1
|\
| * Manage firewall on derutil01Georg Pfuetzenreuter2023-06-281-0/+1
|/
* Merge pull request 'Change redis to redis7' (#75) from salt-redis7 into produ...Georg Pfuetzenreuter2023-06-281-6/+6
|\
| * Change redis to redis7Georg Pfuetzenreuter2023-06-281-6/+6
|/
* Merge pull request 'Remove backslashes in string' (#74) from fix-matterb-medi...Pratyush Desai2023-06-281-3/+3
|\
| * Merge branch 'production' into fix-matterb-mediapathPratyush Desai2023-06-280-0/+0
| |\ | |/ |/|
* | Merge pull request 'Update mediapath for matterbridge' (#73) from fix-matterb...Pratyush Desai2023-06-271-2/+2
|\ \
| | * remove backslashPratyush Desai2023-06-281-3/+3
| |/
| * update mediapath for matterbridgePratyush Desai2023-06-271-2/+2
|/
* Merge pull request 'Add chillnet matterbridge uploads' (#72) from upload-matt...Pratyush Desai2023-06-242-6/+8
|\
| * Add chillnet matterbridge uploadsPratyush Desai2023-06-252-6/+8
|/
* Merge pull request 'Rename Chillnet staff channel' (#71) from matter_remap in...Pratyush Desai2023-05-031-2/+2
|\
| * Used /RENAME for #fightclubPratyush Desai2023-05-031-2/+2
|/
* Merge pull request 'Init psyched.dev' (#70) from psyched into productionGeorg Pfuetzenreuter2023-05-023-0/+3
|\
| * Init psyched.devGeorg Pfuetzenreuter2023-05-023-0/+3
|/
* Merge pull request 'Init dencpod01.lysergic.dev' (#68) from dencpod01 into pr...Georg Pfuetzenreuter2023-05-021-0/+1
|\
| * Init dencpod01.lysergic.devGeorg Pfuetzenreuter2023-05-021-0/+1
|/
* Merge pull request 'Move backup_mode to minion dict' (#67) from file-backup i...Georg Pfuetzenreuter2023-05-021-1/+1
|\
| * Move backup_mode to minion dictGeorg Pfuetzenreuter2023-05-021-1/+1
|/
* Merge pull request 'Enable minion file backup' (#66) from file-backup into pr...Georg Pfuetzenreuter2023-05-021-0/+1
|\
| * Enable minion file backupGeorg Pfuetzenreuter2023-05-021-0/+1
|/
* Merge pull request 'Import moni firewall configuration' (#65) from moni into ...Georg Pfuetzenreuter2023-05-021-0/+11
|\
| * Import moni firewall configurationGeorg Pfuetzenreuter2023-05-021-0/+11
|/
* Merge pull request 'Init phoebe.lysergic.dev' (#64) from phoebe into productionGeorg Pfuetzenreuter2023-05-021-0/+1
|\
| * Init phoebe.lysergic.devGeorg Pfuetzenreuter2023-05-021-0/+1
|/
* Merge pull request 'Add manage_sshd conditional' (#63) from sshd-optional int...Georg Pfuetzenreuter2023-05-022-0/+3
|\
| * Disable manage_sshd for philiaGeorg Pfuetzenreuter2023-05-021-0/+1
| * Add manage_sshd conditionalGeorg Pfuetzenreuter2023-05-021-0/+2
|/
* Merge pull request 'No longer remove libX11' (#62) from libX11 into productionGeorg Pfuetzenreuter2023-05-021-5/+0
|\
| * No longer remove libX11Georg Pfuetzenreuter2023-05-021-5/+0
|/
* Merge pull request 'Add users conditional for sss' (#61) from skip-users-if-s...Georg Pfuetzenreuter2023-05-011-0/+4
|\
| * Add users conditional for sssGeorg Pfuetzenreuter2023-05-011-0/+4
|/
* Merge pull request 'Check files in nbroles to grains script' (#60) from nbrol...Georg Pfuetzenreuter2023-05-011-1/+11
|\
| * Check files in nbroles to grains scriptGeorg Pfuetzenreuter2023-05-011-1/+11
|/
* Merge pull request 'Repair manage_firewall behavior' (#59) from firewall-opti...Georg Pfuetzenreuter2023-05-011-1/+1
|\
| * Repair manage_firewall behaviorGeorg Pfuetzenreuter2023-05-011-1/+1
|/
* Merge pull request 'Set env_order + ping_on_rotate' (#58) from saltenv into p...Georg Pfuetzenreuter2023-05-011-0/+2
|\
| * Set ping_on_rotateGeorg Pfuetzenreuter2023-05-011-0/+1
| * Set env_orderGeorg Pfuetzenreuter2023-05-011-0/+1
|/
* Merge pull request 'Repair BookStack httpd configuration' (#57) from themis-h...Georg Pfuetzenreuter2023-05-011-9/+9
|\
| * Repair BookStack httpd configurationGeorg Pfuetzenreuter2023-05-011-9/+9
|/
* Merge pull request 'Repair PrivateBin config quoting' (#56) from privatebin-q...Georg Pfuetzenreuter2023-04-301-2/+2
|\
| * Repair PrivateBin config quotingGeorg Pfuetzenreuter2023-04-301-2/+2
|/
* Merge pull request 'Repair undefined id' (#55) from common-id-var into produc...Georg Pfuetzenreuter2023-04-301-1/+1
|\
| * Repair undefined idGeorg Pfuetzenreuter2023-04-301-1/+1
* | Merge pull request 'Adjust themis httpd directory options' (#50) from themis-...Georg Pfuetzenreuter2023-04-301-1/+1
|\ \ | |/ |/|
| * Adjust themis httpd directory optionsGeorg Pfuetzenreuter2023-04-301-1/+1
* | Merge pull request 'Exclude libX11 removal for FPM hosts' (#54) from libX11-p...Georg Pfuetzenreuter2023-04-302-1/+5
|\ \
| * | Exclude libX11 removal for FPM hostsGeorg Pfuetzenreuter2023-04-302-1/+5
|/ /
* | Merge pull request 'Repair BookStack quoting' (#53) from bookstack-quoting in...Georg Pfuetzenreuter2023-04-301-1/+1
|\ \
| * | Repair BookStack quotingGeorg Pfuetzenreuter2023-04-301-1/+1
|/ /
* | Merge pull request 'Repair BookStack quoting' (#52) from bookstack-quoting in...Georg Pfuetzenreuter2023-04-301-2/+2
|\ \
| * | Repair BookStack quotingGeorg Pfuetzenreuter2023-04-301-2/+2
|/ /
* | Merge pull request 'BookStack fixups' (#51) from bookstack-fixup into productionGeorg Pfuetzenreuter2023-04-302-5/+5
|\ \ | |/ |/|
| * Correct BookStack groupGeorg Pfuetzenreuter2023-04-301-1/+1
| * Correct SAML realm capitalizationGeorg Pfuetzenreuter2023-04-301-3/+3
| * Quote BookStack valuesGeorg Pfuetzenreuter2023-04-301-1/+1
|/
* Merge pull request 'Add empty role.privatebin pillar' (#49) from privatebin-r...Georg Pfuetzenreuter2023-04-301-0/+1
|\
| * Add empty role.privatebin pillarGeorg Pfuetzenreuter2023-04-301-0/+1
* | Merge pull request 'Add manage_firewall conditional' (#48) from firewall-opti...Georg Pfuetzenreuter2023-04-307-0/+11
|\ \ | |/ |/|
| * Add manage_firewall conditionalGeorg Pfuetzenreuter2023-04-307-0/+11
|/
* Merge pull request 'Add empty role.bookstack pillar' (#47) from bookstack-pil...Georg Pfuetzenreuter2023-04-301-0/+1
|\
| * Add empty role.bookstack pillarGeorg Pfuetzenreuter2023-04-301-0/+1
|/
* Merge pull request 'Allow saltenv/pillarenv override' (#45) from saltenv into...Georg Pfuetzenreuter2023-04-301-2/+2
|\
| * Allow saltenv/pillarenv overrideGeorg Pfuetzenreuter2023-04-301-2/+2
|/
* Merge pull request 'Watch httpd service for snippets' (#46) from httpd-servic...Georg Pfuetzenreuter2023-04-301-4/+1
|\
| * Watch httpd service for snippetsGeorg Pfuetzenreuter2023-04-301-4/+1
|/
* Merge pull request 'Import themis / PrivateBin' (#40) from privatebin into pr...Georg Pfuetzenreuter2023-04-303-13/+144
|\
| * id.themis: import backend firewall rulesprivatebinGeorg Pfuetzenreuter2023-04-291-0/+6
| * id.themis: import PrivateBin httpd vhostGeorg Pfuetzenreuter2023-03-121-13/+37
| * id.themis: import PrivateBin configurationGeorg Pfuetzenreuter2023-03-121-0/+42
| * Add privatebin profile+roleGeorg Pfuetzenreuter2023-03-122-0/+59
* | Merge pull request 'Split out salt.formulas state' (#44) from profile-formula...Georg Pfuetzenreuter2023-04-292-7/+7
|\ \
| * | Split out salt.formulas stateGeorg Pfuetzenreuter2023-04-292-7/+7
|/ /
* | Merge pull request 'Add tg lucy channel mapping' (#43) from mattertgbridge in...Georg Pfuetzenreuter2023-04-141-0/+1
|\ \
| * | Add tg lucy channel mappingPratyush Desai2023-04-141-0/+1
|/ /
* | Merge pull request 'Add ChillNet matterbridge' (#42) from chillnet into produ...Georg Pfuetzenreuter2023-04-092-6/+39
|\ \ | |/ |/|
| * Add Chillnet to matterbridgePratyush Desai2023-04-102-0/+34
| * Refactor matterbridge_media macroPratyush Desai2023-04-101-6/+5
|/
* Merge pull request 'Import themis / BookStack' (#35) from bookstack into prod...Pratyush Desai2023-03-1111-0/+212
|\
| * profile.bookstack: quote keysbookstackGeorg Pfuetzenreuter2023-03-111-2/+6
| * Enable php-formulaGeorg Pfuetzenreuter2023-02-261-0/+1
| * role.bookstack: include php-fpmGeorg Pfuetzenreuter2023-02-261-0/+1
| * Add php-fpm roleGeorg Pfuetzenreuter2023-02-262-0/+3
| * Enable memcached-formulaGeorg Pfuetzenreuter2023-02-261-0/+1
| * role.bookstack: include memcachedGeorg Pfuetzenreuter2023-02-261-0/+1
| * Add memcached roleGeorg Pfuetzenreuter2023-02-262-0/+4
| * profile.apache-httpd: manage snippetsGeorg Pfuetzenreuter2023-02-263-1/+42
| * id.themis: add BookStack configurationGeorg Pfuetzenreuter2023-02-261-0/+41
| * id.themis: add BookStack httpd configurationGeorg Pfuetzenreuter2023-02-261-0/+36
| * Add bookstack profile+roleGeorg Pfuetzenreuter2023-02-262-0/+73
| * Add web.apache-httpd roleGeorg Pfuetzenreuter2023-02-262-0/+5
| * Enable apache-formulaGeorg Pfuetzenreuter2023-02-261-0/+1
|/
* Merge pull request 'Import moni Prometheus configuration' (#32) from promethe...Georg Pfuetzenreuter2023-02-2511-10/+223
|\
| * Disable commit lintingGeorg Pfuetzenreuter2023-02-211-9/+9
| * Manage Prometheus firewall rulesGeorg Pfuetzenreuter2023-02-212-0/+15
| * Moni: Read Blackbox targets as JSONGeorg Pfuetzenreuter2023-02-211-2/+2
| * p.node_exporter->p.prometheus.node_exporterGeorg Pfuetzenreuter2023-02-212-1/+1
| * Manage Prometheus targetsGeorg Pfuetzenreuter2023-02-214-2/+21
| * Import Prometheus server configurationGeorg Pfuetzenreuter2023-02-217-0/+179
* | Merge pull request 'pipeline.gommit: allow more characters in prefix' (#38) f...Pratyush Desai2023-02-221-1/+1
|\ \ | |/ |/|
| * pipeline.gommit: allow more characters in prefixGeorg Pfuetzenreuter2023-02-201-1/+1
|/
* Merge pull request 'Commmit lint: allow pipeline + more characters' (#37) fro...Pratyush Desai2023-02-201-1/+1
|\
| * pipeline.gommit: allow pipeline + more charactersGeorg Pfuetzenreuter2023-02-191-1/+1
|/
* Merge pull request 'Enable commit message linting' (#36) from commit-lint int...Pratyush Desai2023-02-193-1/+73
|\
| * Enable commit lintingGeorg Pfuetzenreuter2023-02-191-1/+11
| * Add commit lintingGeorg Pfuetzenreuter2023-02-192-0/+62
|/
* Merge pull request 'Linting' (#33) from linting into productionGeorg Pfuetzenreuter2023-02-158-12/+28
|\
| * Address salt-lint errors/warningsGeorg Pfuetzenreuter2023-02-156-10/+12
| * Address yamllint errors/warningsGeorg Pfuetzenreuter2023-02-152-2/+5
| * Add linting pipelineGeorg Pfuetzenreuter2023-02-151-0/+11
|/
* Merge pull request 'Enable prometheus-formula' (#31) from prometheus-formula ...Georg Pfuetzenreuter2023-02-151-0/+1
|\
| * Enable prometheus-formulaGeorg Pfuetzenreuter2023-02-151-0/+1
|/
* Merge pull request 'denc-webcluster: add ModSecurity adjustments' (#30) from ...Georg Pfuetzenreuter2023-02-131-0/+9
|\
| * denc-webcluster: add ModSecurity adjustmentsGeorg Pfuetzenreuter2023-02-121-0/+9
|/
* Merge pull request 'denc-webcluster: nginx listen on HA addresses' (#29) from...Georg Pfuetzenreuter2023-02-121-5/+5
|\
| * denc-webcluster: nginx listen on HA addressesGeorg Pfuetzenreuter2023-02-121-5/+5
|/
* Merge pull request 'AppArmor: reload on drop-in changes' (#28) from reload-ap...Georg Pfuetzenreuter2023-02-121-0/+13
|\
| * AppArmor: reload on drop-in changesGeorg Pfuetzenreuter2023-02-121-0/+13
|/
* Merge pull request 'Manage AppArmor on web-proxie's' (#27) from import-denc-w...Georg Pfuetzenreuter2023-02-123-0/+17
|\
| * denc-webcluster: nginx AppArmor rulesGeorg Pfuetzenreuter2023-02-121-0/+7
| * web-proxy: include apparmor.localGeorg Pfuetzenreuter2023-02-121-0/+1
| * Add AppArmor profileGeorg Pfuetzenreuter2023-02-121-0/+9
|/
* Merge pull request 'denc-webcluster: nginx config fixup' (#26) from import-de...Georg Pfuetzenreuter2023-02-121-5/+2
|\
| * denc-webcluster: nginx config fixupGeorg Pfuetzenreuter2023-02-121-5/+2
|/
* Merge pull request 'ha-node: vrrp is a protocol' (#25) from vrrp-fixup into p...Georg Pfuetzenreuter2023-02-121-1/+1
|\
| * ha-node: vrrp is a protocolGeorg Pfuetzenreuter2023-02-121-1/+1
|/
* Merge pull request 'denc-webcluster: allow http(s) publicly' (#24) from impor...Georg Pfuetzenreuter2023-02-121-0/+8
|\
| * denc-webcluster: enable keepalived script securityGeorg Pfuetzenreuter2023-02-121-0/+1
| * denc-webcluster: allow http(s) publiclyGeorg Pfuetzenreuter2023-02-121-0/+7
|/
* Merge pull request 'Import denc webcluster (nemesis/hubris)' (#12) from impor...Georg Pfuetzenreuter2023-02-1211-0/+367
|\
| * Manage backend firewall zoneimport-denc-webclusterGeorg Pfuetzenreuter2023-02-122-0/+7
| * ha-node: allow vrrp in firewallGeorg Pfuetzenreuter2023-02-122-0/+7
| * Add ha-netcup roleGeorg Pfuetzenreuter2023-02-121-0/+3
| * Add keepalived_script_user profileGeorg Pfuetzenreuter2023-02-121-0/+7
| * Add netcup_failover profileGeorg Pfuetzenreuter2023-02-123-0/+133
| * nemesis/hubris: import keepalived configurationGeorg Pfuetzenreuter2023-02-121-4/+61
| * nemesis/hubris: include denc.web-proxyGeorg Pfuetzenreuter2023-02-122-0/+4
| * nemesis/hubris: import nginx configurationGeorg Pfuetzenreuter2023-02-121-0/+149
|/
* Merge pull request 'common-suse: add qemu-guest-agent + remove AutoYaST' (#23...Georg Pfuetzenreuter2023-02-121-1/+22
|\
| * common.suse: manage qemu-guest-agentGeorg Pfuetzenreuter2023-02-121-0/+9
| * common.suse: remove AutoYaSTGeorg Pfuetzenreuter2023-02-121-1/+13
* | Merge pull request 'dericom02: manage web firewall zone' (#22) from dericom02...Georg Pfuetzenreuter2023-02-121-0/+8
|\ \ | |/ |/|
| * dericom02: manage web firewall zoneGeorg Pfuetzenreuter2023-02-121-0/+8
|/
* Merge pull request 'lighttpd: improve dependencies' (#21) from lighttpd-watch...Georg Pfuetzenreuter2023-02-121-0/+5
|\
| * lighttpd: improve dependenciesGeorg Pfuetzenreuter2023-02-121-0/+5
|/
* Merge pull request 'dericom02: disable matterbridge XMPP debug' (#20) from ma...Georg Pfuetzenreuter2023-02-121-1/+1
|\
| * dericom02: disable matterbridge XMPP debugGeorg Pfuetzenreuter2023-02-121-1/+1
|/
* Merge pull request 'matterbridge: restart on changes' (#19) from matterbridge...Georg Pfuetzenreuter2023-02-121-0/+4
|\
| * matterbridge: restart on changesGeorg Pfuetzenreuter2023-02-121-0/+4
|/
* Merge pull request 'matterbridge: quote numbers' (#18) from matterbridge-bool...Georg Pfuetzenreuter2023-02-121-1/+1
|\
| * matterbridge: quote numbersGeorg Pfuetzenreuter2023-02-121-1/+1
* | Merge pull request 'Disable "aithunder" Discord bridge' (#17) from matterbrid...Georg Pfuetzenreuter2023-02-121-1/+3
|\ \ | |/ |/|
| * Disable "aithunder" Discord bridgeGeorg Pfuetzenreuter2023-02-121-1/+3
|/
* Merge pull request 'dericom02: quote matterbridge booleans' (#16) from matter...Georg Pfuetzenreuter2023-02-121-31/+31
|\
| * dericom02: quote matterbridge booleansGeorg Pfuetzenreuter2023-02-121-31/+31
|/
* Merge pull request 'Matterbridge media' (#15) from matterbridge-media into pr...Pratyush Desai2023-02-122-2/+24
|\
| * dericom02: manage matterbridge mediaGeorg Pfuetzenreuter2023-02-121-2/+13
| * matterbridge: manage media directoriesGeorg Pfuetzenreuter2023-02-121-0/+11
|/
* Merge pull request 'matterbridge: add role pillar' (#14) from matterbridge-pi...Pratyush Desai2023-02-091-0/+1
|\
| * matterbridge: add role pillarGeorg Pfuetzenreuter2023-02-091-0/+1
|/
* Merge pull request 'Import Matterbridge configuration' (#10) from import-deri...Pratyush Desai2023-02-091-0/+221
|\
| * dericom02: import Matterbridge configurationGeorg Pfuetzenreuter2023-02-071-0/+221
* | Merge pull request 'Refactor Matterbridge profile' (#11) from matterbridge-re...Pratyush Desai2023-02-092-23/+26
|\ \
| * | Refactor matterbridge profileGeorg Pfuetzenreuter2023-02-072-23/+26
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 05:11:38 +0000