Commit Graph

Select branches

Hide Pull Requests

add/matterbridge-chillnet-tgchan

bookstack

fix/matterb-trashtgirclinks

fix/pillar_boolquotes

import-denc-webcluster

mta-optional

nsd

orpheus

privatebin

production

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#35

#36

#37

#38

#4

#40

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

Mono Color

• 8231c71927 Merge pull request 'cleanup interprotocol bridges' (#96) from cfg_matterbridge into production production Pratyush Desai 2024-09-07 22:07:22 +0200
• 00e7832e9d
  
  cleanup interprotocol bridges #96 Pratyush Desai 2024-09-01 21:55:45 +0530
• 47c7b56e86 Merge pull request 'fix firewalld not updating interfaces during reload' (#95) from fw_flushreload into production Georg Pfuetzenreuter 2024-06-19 19:45:21 +0200
• f46758fe53
  
  fix firewalld not updating interfaces #95 Pratyush Desai 2024-06-19 17:31:23 +0530
• b7ffc08af9 Merge pull request 'enroll derigsm01' (#94) from add_derigsm01 into production Georg Pfuetzenreuter 2024-01-25 18:47:07 +0100
• 6d931c54cb
  
  enroll derigsm01 #94 Pratyush Desai 2024-01-09 02:33:03 +0530
• 46f5fd365c Merge pull request 'attempt disc-chilldevirc connect' (#93) from chillcord into production Pratyush Desai 2023-10-04 14:03:01 +0200
• 931403de64 Merge branch 'production' into chillcord #93 Pratyush Desai 2023-10-04 13:42:01 +0200
• f26bace747
  
  attempt disc-chilldevirc connect Pratyush Desai 2023-10-04 16:33:56 +0530
• 3c1cb027ba Merge pull request 'Remove chillops bridge gateway' (#92) from bridgeupdates into production Pratyush Desai 2023-10-03 15:12:27 +0200
• 95edd4bcb4
  
  remove chillops gateway matterb #92 Pratyush Desai 2023-10-03 17:20:06 +0530
• ca1dec082c
  
  attempt at fixing the irc-tg link #91 fix/matterb-trashtgirclinks Pratyush Desai 2023-08-20 12:45:06 +0530
• b454b5f5b9 Merge pull request 'link keytomb irclc<->tg' (#90) from matterb-tg-irc-keytomb into production Pratyush Desai 2023-08-20 08:41:24 +0200
• b2aa0317e5
  
  link keytomb irclc<->tg #90 Pratyush Desai 2023-08-20 11:49:09 +0530
• 10e380c3c1 Merge pull request 'attempt at fixing the irc-tg link' (#89) from add/matterb-lcirc-tgpetals into production Pratyush Desai 2023-08-19 05:48:17 +0200
• 0e3300bb49
  
  attempt at fixing the irc-tg link #89 Pratyush Desai 2023-08-19 09:05:18 +0530
• fd68a06188 Merge pull request 'add petals irccasa<->tg' (#88) from add/matterb-lcirc-tg-petals into production Pratyush Desai 2023-08-18 22:48:48 +0200
• f0a2afc714
  
  add petals irccasa<->tg #88 Pratyush Desai 2023-08-15 01:45:22 +0530
• 14109af928 Merge pull request 'fix syntax error in pull 86' (#87) from fix/matterb-chillnet-tgchanaddop into production Pratyush Desai 2023-08-10 01:26:19 +0200
• e91ce0f58f
  
  fix syntax error in pull 86 #87 Pratyush Desai 2023-08-10 04:52:52 +0530
• e8a5ec5594 Merge pull request 'bridge ircdevchan tgdevchan' (#86) from add/matterbridge-chillnet-tgchan into production Pratyush Desai 2023-08-10 01:06:54 +0200
• 90abdc179b
  
  bridge ircdevchan tgdevchan #86 add/matterbridge-chillnet-tgchan Pratyush Desai 2023-08-10 04:08:34 +0530
• 4df811c834 Merge pull request 'denc-webcluster: include proxy in agola' (#85) from fix/nginx/sslproxy into production Pratyush Desai 2023-07-31 21:29:10 +0200
• 32a0f8d653
  
  denc-webcluster: include proxy in agola #85 Georg Pfuetzenreuter 2023-07-31 21:25:28 +0200
• 0df71b4331 Merge pull request 'Repair boolean' (#84) from fix/nginx/boolean into production Pratyush Desai 2023-07-31 21:15:42 +0200
• 13d5e44baa
  
  Repair boolean #84 Georg Pfuetzenreuter 2023-07-31 21:10:35 +0200
• beec7cde28 Merge pull request 'denc-webcluster: exclude 949110' (#83) from fix/bookstack/400 into production Pratyush Desai 2023-07-31 20:49:31 +0200
• fb981646e5
  
  denc-webcluster: exclude 949110 #83 Georg Pfuetzenreuter 2023-07-31 20:44:52 +0200
• 5d4350aed3 Merge pull request 'Repair boolean' (#82) from ci into production Georg Pfuetzenreuter 2023-07-21 17:08:41 +0200
• b6e9f75352
  
  Repair boolean #82 Georg Pfuetzenreuter 2023-07-21 17:04:49 +0200
• 40b7913d32 Merge pull request 'Add reverse proxy for Agola' (#81) from ci into production Georg Pfuetzenreuter 2023-07-21 16:37:16 +0200
• 24d6de3a5d
  
  Add reverse proxy for Agola #81 Georg Pfuetzenreuter 2023-07-21 15:17:28 +0200
• 8b735d45e2 Merge pull request 'Initialize OpenBSD support' (#80) from OpenBSD into production Georg Pfuetzenreuter 2023-07-16 20:13:41 +0200
• e03e939bf9 Merge pull request 'Optimize minion' (#79) from minion-optimization into production Georg Pfuetzenreuter 2023-07-16 20:12:36 +0200
• 4778c43503
  
  Initialize OpenBSD support #80 Georg Pfuetzenreuter 2023-07-16 20:10:26 +0200
• dc3cbea053
  
  Optimize minion #79 Georg Pfuetzenreuter 2023-07-16 20:04:26 +0200
• c7e590843f Merge pull request 'Add http(s) to thetrip public zone' (#78) from thetrip-firewall into production Georg Pfuetzenreuter 2023-07-01 22:25:51 +0200
• 29ceb78cde
  
  Add http(s) to thetrip public zone #78 Georg Pfuetzenreuter 2023-07-01 22:21:39 +0200
• fffbaf4698 Merge pull request 'Manage firewall on thetrip' (#77) from thetrip-firewall into production Georg Pfuetzenreuter 2023-07-01 22:15:30 +0200
• 8519dfec68
  
  Manage firewall on thetrip #77 Georg Pfuetzenreuter 2023-07-01 22:12:14 +0200
• b73c0805cd Merge pull request 'Manage firewall on derutil01' (#76) from derutil01-fw into production Georg Pfuetzenreuter 2023-06-28 22:17:07 +0200
• 080002e642
  
  Manage firewall on derutil01 #76 Georg Pfuetzenreuter 2023-06-28 22:10:58 +0200
• 1bd2f39312 Merge pull request 'Change redis to redis7' (#75) from salt-redis7 into production Georg Pfuetzenreuter 2023-06-28 22:00:16 +0200
• 58c100acc1
  
  Change redis to redis7 #75 Georg Pfuetzenreuter 2023-06-28 21:46:26 +0200
• 47a364290c Merge pull request 'Remove backslashes in string' (#74) from fix-matterb-mediapath into production Pratyush Desai 2023-06-28 19:53:24 +0200
• b36dc960c8 Merge branch 'production' into fix-matterb-mediapath #74 Pratyush Desai 2023-06-28 19:45:43 +0200
• ddf1c03dbb
  
  remove backslash Pratyush Desai 2023-06-28 23:10:34 +0530
• f4f7f93583 Merge pull request 'Update mediapath for matterbridge' (#73) from fix-matterb-mediapath into production Pratyush Desai 2023-06-27 20:27:16 +0200
• 7145ae4481
  
  update mediapath for matterbridge #73 Pratyush Desai 2023-06-27 23:47:53 +0530
• 937b3c99b7 Merge pull request 'Add chillnet matterbridge uploads' (#72) from upload-matterbridge-chillnet into production Pratyush Desai 2023-06-24 22:27:51 +0200
• 667646a295 Add chillnet matterbridge uploads #72 Pratyush Desai 2023-06-25 01:32:42 +0530
• 36c70f4016 Merge pull request 'Rename Chillnet staff channel' (#71) from matter_remap into production Pratyush Desai 2023-05-03 20:51:09 +0200
• 97045b5f12 Used /RENAME for #fightclub #71 Pratyush Desai 2023-05-03 19:38:05 +0200
• 3789895228
  
  Add manage_postfix conditional mta-optional Georg Pfuetzenreuter 2023-05-02 21:11:57 +0200
• ffbd2dc4c3 Merge pull request 'Init psyched.dev' (#70) from psyched into production Georg Pfuetzenreuter 2023-05-02 21:07:25 +0200
• c1fcf5f3b1
  
  Init psyched.dev #70 Georg Pfuetzenreuter 2023-05-02 20:57:40 +0200
• 52803b6f55
  
  Init orpheus.psyched.dev #69 orpheus Georg Pfuetzenreuter 2023-05-02 20:57:40 +0200
• ac0a2b6587 Merge pull request 'Init dencpod01.lysergic.dev' (#68) from dencpod01 into production Georg Pfuetzenreuter 2023-05-02 20:51:55 +0200
• b6b129c41f
  
  Init dencpod01.lysergic.dev #68 Georg Pfuetzenreuter 2023-05-02 20:40:09 +0200
• 774706211e Merge pull request 'Move backup_mode to minion dict' (#67) from file-backup into production Georg Pfuetzenreuter 2023-05-02 20:28:34 +0200
• 2ce85f172e
  
  Move backup_mode to minion dict #67 Georg Pfuetzenreuter 2023-05-02 20:25:33 +0200
• ffe1e60baf Merge pull request 'Enable minion file backup' (#66) from file-backup into production Georg Pfuetzenreuter 2023-05-02 20:19:46 +0200
• c4532b4686
  
  Enable minion file backup #66 Georg Pfuetzenreuter 2023-05-02 20:13:24 +0200
• 3143bfd96d Merge pull request 'Import moni firewall configuration' (#65) from moni into production Georg Pfuetzenreuter 2023-05-02 20:06:31 +0200
• d89138e2a7
  
  Import moni firewall configuration #65 Georg Pfuetzenreuter 2023-05-02 20:02:21 +0200
• 05d86ce689 Merge pull request 'Init phoebe.lysergic.dev' (#64) from phoebe into production Georg Pfuetzenreuter 2023-05-02 19:52:06 +0200
• 55acb1dea4
  
  Init phoebe.lysergic.dev #64 Georg Pfuetzenreuter 2023-05-02 19:48:22 +0200
• 9f176609a5 Merge pull request 'Add manage_sshd conditional' (#63) from sshd-optional into production Georg Pfuetzenreuter 2023-05-02 19:39:20 +0200
• 409016ea75
  
  Disable manage_sshd for philia #63 Georg Pfuetzenreuter 2023-05-02 19:32:36 +0200
• 8776b16be1
  
  Add manage_sshd conditional Georg Pfuetzenreuter 2023-05-02 19:30:33 +0200
• 6763d1b64e Merge pull request 'No longer remove libX11' (#62) from libX11 into production Georg Pfuetzenreuter 2023-05-02 00:16:20 +0200
• d4d7d41ca7
  
  No longer remove libX11 #62 Georg Pfuetzenreuter 2023-05-02 00:09:35 +0200
• 16827d7318 Merge pull request 'Add users conditional for sss' (#61) from skip-users-if-sss into production Georg Pfuetzenreuter 2023-05-01 23:15:45 +0200
• 51e33815df
  
  Add users conditional for sss #61 Georg Pfuetzenreuter 2023-05-01 22:04:40 +0200
• bfeeb8673e Merge pull request 'Check files in nbroles to grains script' (#60) from nbroles-to-grains-refactor into production Georg Pfuetzenreuter 2023-05-01 21:48:34 +0200
• de9ac40e3f
  
  Check files in nbroles to grains script #60 Georg Pfuetzenreuter 2023-05-01 21:45:13 +0200
• c951f48b71 Merge pull request 'Repair manage_firewall behavior' (#59) from firewall-optional into production Georg Pfuetzenreuter 2023-05-01 20:39:02 +0200
• f96e9a4901
  
  Repair manage_firewall behavior #59 Georg Pfuetzenreuter 2023-05-01 20:35:27 +0200
• 75c91e72cb Merge pull request 'Set env_order + ping_on_rotate' (#58) from saltenv into production Georg Pfuetzenreuter 2023-05-01 20:27:12 +0200
• 2a9a5cf394
  
  Set ping_on_rotate #58 Georg Pfuetzenreuter 2023-05-01 20:24:13 +0200
• 1089146801
  
  Set env_order Georg Pfuetzenreuter 2023-05-01 20:20:32 +0200
• 27d178d852 Merge pull request 'Repair BookStack httpd configuration' (#57) from themis-httpd-fixup into production Georg Pfuetzenreuter 2023-05-01 00:08:00 +0200
• 841317e0f4
  
  Repair BookStack httpd configuration #57 Georg Pfuetzenreuter 2023-05-01 00:00:31 +0200
• 5f1793547b Merge pull request 'Repair PrivateBin config quoting' (#56) from privatebin-quoting into production Georg Pfuetzenreuter 2023-04-30 20:42:21 +0200
• 942b71815e
  
  Repair PrivateBin config quoting #56 Georg Pfuetzenreuter 2023-04-30 20:38:43 +0200
• edd16ff3a7 Merge pull request 'Repair undefined id' (#55) from common-id-var into production Georg Pfuetzenreuter 2023-04-30 20:14:32 +0200
• 1290fd5ec7
  
  Repair undefined id #55 Georg Pfuetzenreuter 2023-04-30 20:11:24 +0200
• f56ed6f64e Merge pull request 'Adjust themis httpd directory options' (#50) from themis-httpd-fixup into production Georg Pfuetzenreuter 2023-04-30 20:04:42 +0200
• d8263f9b80 Merge pull request 'Exclude libX11 removal for FPM hosts' (#54) from libX11-php into production Georg Pfuetzenreuter 2023-04-30 19:58:19 +0200
• 269b30ce9f
  
  Exclude libX11 removal for FPM hosts #54 Georg Pfuetzenreuter 2023-04-30 19:43:25 +0200
• 21f8818a52 Merge pull request 'Repair BookStack quoting' (#53) from bookstack-quoting into production Georg Pfuetzenreuter 2023-04-30 19:00:05 +0200
• 985b401aaa
  
  Repair BookStack quoting #53 Georg Pfuetzenreuter 2023-04-30 18:57:03 +0200
• 65af33d4fb Merge pull request 'Repair BookStack quoting' (#52) from bookstack-quoting into production Georg Pfuetzenreuter 2023-04-30 18:53:40 +0200
• 4053be45d2
  
  Repair BookStack quoting #52 Georg Pfuetzenreuter 2023-04-30 18:37:46 +0200
• 8d9af70941 Merge pull request 'BookStack fixups' (#51) from bookstack-fixup into production Georg Pfuetzenreuter 2023-04-30 18:34:12 +0200
• ef0a931157
  
  Correct BookStack group #51 Georg Pfuetzenreuter 2023-04-30 18:27:35 +0200
• d8359f002d
  
  Correct SAML realm capitalization Georg Pfuetzenreuter 2023-04-30 18:22:58 +0200
• 938be46faf
  
  Quote BookStack values Georg Pfuetzenreuter 2023-04-30 18:20:54 +0200
• 0a3d34d962
  
  Adjust themis httpd directory options #50 Georg Pfuetzenreuter 2023-04-30 18:05:28 +0200
• 600a73a984 Merge pull request 'Add empty role.privatebin pillar' (#49) from privatebin-role into production Georg Pfuetzenreuter 2023-04-30 16:44:56 +0200