Commit Graph

1288 Commits

Author SHA1 Message Date
lassulus
40572ba261 l: remove archprism 2019-12-01 16:23:19 +01:00
lassulus
33d48ec6ee bepasty-server use python3 2019-12-01 16:16:17 +01:00
lassulus
b025e28b42 ci: redownload all repos 2019-11-29 14:11:18 +01:00
lassulus
5fa963b6bc delete mb 2019-11-24 18:17:31 +01:00
7ec0d0aec7 m: use correct tinc addresses for amy/clara
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
2019-11-15 11:36:29 +01:00
lassulus
ab85707acc Merge remote-tracking branch 'enklave/master' 2019-10-31 08:44:39 +01:00
lassulus
36fb248f88 Merge remote-tracking branch 'gum/master' 2019-10-31 08:43:51 +01:00
Jeschli
f4a7434eea j reagenzglas: add new retiolum key 2019-10-30 19:59:35 +01:00
2e4841969a l: add host amy/clara
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
2019-10-30 19:29:54 +01:00
makefu
f566e34335
rtorrent module: set listen.owner in phpfpm 2019-10-28 11:00:11 +01:00
lassulus
f8d1d7f938 reaktor2: fix invalid character crash 2019-10-23 00:49:48 +02:00
lassulus
5ab261df3a Merge remote-tracking branch 'enklave/master' 2019-10-22 18:17:52 +02:00
Jeschli
a6f7523edd j reagenzglas: change formating 2019-10-22 18:14:39 +02:00
Ingolf Wagner
002913eb9b external: change palos ssh key 2019-10-21 23:56:10 +02:00
lassulus
8d7afcf703 l: remove deprecated users & keys 2019-10-17 16:59:12 +02:00
lassulus
1cfe17faa0 Merge remote-tracking branch 'gum/19.09' 2019-10-16 11:39:55 +02:00
Ingolf Wagner
005d456ef4 external: remove kruck and add sterni to retiolum 2019-10-15 17:31:33 +02:00
makefu
0c7b43e760
rtorrent module: switch from poolConfigs to pools for phpfpm 2019-10-15 13:59:11 +02:00
lassulus
29c1679d74 l morpheus.r: RIP 2019-10-14 16:18:56 +02:00
lassulus
7f7ce8077e Merge remote-tracking branch 'gum/19.09' into 19.09 2019-10-14 16:02:12 +02:00
lassulus
8f411d8c91 power-action: string -> str 2019-10-14 13:11:56 +02:00
lassulus
e1547f13f7 l: add lass-yubikey 2019-10-14 13:11:31 +02:00
makefu
c288a54f76
Merge remote-tracking branch 'lass/19.09' into 19.09 2019-10-14 09:25:42 +02:00
makefu
0459d44921
ma pigstarter: revive dead links in vulnerability disclosures 2019-10-13 02:32:55 +02:00
lassulus
c8e29c89bc bepasty-server: fix proxied host header spoofing 2019-10-10 14:48:45 +02:00
Luis Hebendanz
8c067f260b external qubasa.r: rotate tinc key 2019-10-03 23:51:20 +02:00
lassulus
ea7aa76e0e Merge remote-tracking branch 'ni/master' 2019-09-25 21:50:44 +02:00
nin
7050df8789 Revert "remove nin"
This reverts commit 6b08d5aa46.
2019-09-25 21:36:01 +02:00
nin
c75710a489 Revert "remove nin"
This reverts commit 62314e64c2.
2019-09-25 20:59:21 +02:00
lassulus
2b53aaa178 ci get-steps: add show-trace 2019-09-25 20:47:49 +02:00
lassulus
d94cdfaff4 Merge remote-tracking branch 'enklave/master' 2019-09-25 16:28:56 +02:00
makefu
be19e6a618
Merge remote-tracking branch 'lass/master' 2019-09-25 15:21:03 +02:00
makefu
1f4ae89faf
ma shiori: init, add to gum 2019-09-24 18:41:36 +02:00
lassulus
a72d092a11 l: add hilum.r 2019-09-22 11:40:48 +02:00
jeschli
ad0515d93d j: add reagenzglas to retiolum 2019-09-20 16:53:20 +02:00
lassulus
8cb8de31d0 Merge remote-tracking branch 'ni/master' 2019-09-11 14:57:39 +02:00
tv
4c2184a0f1 krebs.tinc.*.hostsArchive: fix file mode 2019-09-11 14:48:18 +02:00
lassulus
95d219e486 external: add jongepad.r 2019-09-11 11:53:11 +02:00
tv
0182f1bd64 Merge remote-tracking branch 'prism/master' 2019-09-11 10:34:02 +02:00
lassulus
fbca35a6b4 external: add qubasa ssh pubkey 2019-09-07 22:45:07 +02:00
lassulus
c2773285eb Merge remote-tracking branch 'ni/master' 2019-09-06 15:33:04 +02:00
lassulus
5d24345ff4 external crustacea.r: use another key + ed25519 2019-09-04 13:35:33 +02:00
lassulus
8d4adbf38c external: add crustacea.r (0x4A6F) 2019-09-04 00:13:26 +02:00
lassulus
3047fea88d Merge remote-tracking branch 'gum/master' 2019-08-13 18:55:08 +02:00
lassulus
0699b41b05 Merge remote-tracking branch 'ni/master' 2019-08-13 15:35:12 +02:00
tv
ccb7fb731c urlwatch: use writeJSON 2019-08-13 09:44:26 +02:00
tv
b13d9d3149 urlwatch: add ignore_cached option 2019-08-13 09:42:14 +02:00
tv
13d7c14bd0 urlwatch: filter defaults to null 2019-08-13 09:41:55 +02:00
tv
681075a8f4 urlwatch: (re-) enable sendmail by default 2019-08-13 09:30:21 +02:00
lassulus
e754ced01e l phone.r: rotate secrets 2019-08-08 17:34:51 +02:00
tv
7c522820bd Merge remote-tracking branch 'prism/master' 2019-08-02 17:04:39 +02:00
2885fbd942 external: public ips for rose/martha/donna
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
2019-07-18 11:50:49 +02:00
lassulus
9bc7f594f5 syncthing: run preStart as root on 19.09 2019-07-15 18:26:30 +02:00
lassulus
035cf33ab9 l: add domsen-backup host 2019-07-15 18:23:27 +02:00
lassulus
3f0435e89c l xerxes.r: revive more 2019-07-14 16:27:44 +02:00
lassulus
9b0e78fcb6 Merge remote-tracking branch 'mb/master' 2019-07-14 13:43:30 +02:00
magenbluten
08b8105196 mb: add rofl.r 2019-07-14 13:24:59 +02:00
lassulus
13d8d9f7d3 Revert "l: rip xerxes"
This reverts commit 4e04b2ac99.
2019-07-11 16:09:14 +02:00
tv
421a97927b Merge remote-tracking branches 'prism/master' and 'kmein/master' 2019-07-09 20:52:23 +02:00
Kierán Meinhardt
b9ab844635 urlwatch: add telegram reporting options 2019-07-09 20:50:28 +02:00
Kierán Meinhardt
41a4936144 urlwatch: optionalise custom sendmail 2019-07-09 20:48:56 +02:00
lassulus
03aea512d8 external: add rose,martha,donna (Mic92) 2019-07-09 19:44:08 +02:00
makefu
1ba49c0ffe
Merge remote-tracking branch 'lass/master' 2019-06-28 22:02:41 +02:00
name
1d23dceb5d external: Add pie 2019-06-25 20:52:11 +02:00
zx9w
f58c0e3366 external: Added user ilmu, and email. 2019-06-25 20:42:55 +02:00
zx9w
0820daacaa external: Put Matchbox and Inspector in alphabetic order 2019-06-25 20:42:55 +02:00
lassulus
a60cb26535 uppreisn fixup 2019-06-25 20:42:55 +02:00
zx9w
b951f7a50b external: Added uppreisn to the VPN (Ilmu) 2019-06-25 20:42:28 +02:00
tv
8c667f09c0 Merge remote-tracking branch 'prism/master' 2019-06-25 20:16:12 +02:00
tv
d343910e98 exim-retiolum module: optionalize rspamd log level 2019-06-24 03:16:02 +02:00
tv
8a48f8dd68 exim-retiolum module: replace UCL by "JSON" 2019-06-24 03:15:34 +02:00
tv
bd12c487c3 exim-retiolum module: integrate rspamd 2019-06-23 21:16:32 +02:00
tv
3d4d39eecc exim modules: mark nested syntax 2019-06-22 12:55:16 +02:00
tv
167176b417 exim-retiolum module: drop api and imp 2019-06-22 12:43:32 +02:00
tv
f63aa737e6 syncthing: get GUI address from config 2019-06-22 03:17:05 +02:00
tv
f76f819cd7 syncthing: alias config.services.syncthing 2019-06-22 02:12:46 +02:00
tv
43141c67fd syncthing folders: add ignoreDelete option 2019-06-21 23:56:07 +02:00
lassulus
5eaa8844e3
external: add wilde.r (kmein) 2019-06-19 23:18:10 +02:00
lassulus
335d15d4ec
external: add rilke.w 2019-06-19 23:18:09 +02:00
makefu
c33078ddf6
ma wiregrill: rockit -> shackdev 2019-06-17 07:51:41 +02:00
lassulus
ff283af7b2 external: add wilde.r (kmein) 2019-06-15 18:24:06 +02:00
lassulus
14954b9632 Merge remote-tracking branch 'gum/master' 2019-06-15 02:09:37 +02:00
makefu
cdd1c018ec
ma wiregrill: ipv4 for wiregrill
LOL!
2019-06-15 01:37:03 +02:00
lassulus
71ce7ab952 Merge remote-tracking branch 'gum/master' 2019-06-15 01:06:42 +02:00
makefu
eda35fc0a6
ma: add rockit, wiregrill for gum 2019-06-15 01:05:01 +02:00
lassulus
cb7fcd8efa Merge remote-tracking branch 'gum/master' 2019-06-15 00:53:40 +02:00
lassulus
ec93824f05 external: add rilke.w 2019-06-15 00:53:35 +02:00
makefu
b6caea7a62
ma wiregrill: update gum, add rockit 2019-06-14 23:56:07 +02:00
makefu
276ad5f9d5
Merge remote-tracking branch 'lass/master' 2019-06-14 18:41:27 +02:00
makefu
df8e811695
external: add 0x4a6f 2019-06-13 20:28:32 +02:00
lassulus
ac07497652 syncthing: add more options, remove uneeded id 2019-05-29 15:18:28 +02:00
lassulus
64539ffaa4 l prism.r: add codi.lassul.us 2019-05-29 15:02:30 +02:00
lassulus
c8784043f1 schasch.r: add syncthing.id 2019-05-29 15:01:49 +02:00
lassulus
f846ad7bea kruck.r: add video.kruck.r alias 2019-05-29 15:01:10 +02:00
lassulus
680d5b4cff Merge remote-tracking branch 'ni/master' 2019-05-29 09:07:03 +02:00
makefu
952aeb6c14
Merge remote-tracking branch 'lass/master' 2019-05-28 09:12:57 +02:00
magenbluten
be12b8a413 mb sunshine.r: disable ci 2019-05-21 20:23:09 +02:00
magenbluten
09552a6945 Merge remote-tracking branch 'origin/master' 2019-05-21 19:52:44 +02:00
magenbluten
c74d86cf6a mb: add new machines 2019-05-21 19:43:40 +02:00
tv
eb9c9b80ca github-known-hosts: add new hosts 2019-05-21 10:39:18 +02:00