Commit Graph

1308 Commits

Author SHA1 Message Date
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
tv
a666abeaab github-hosts-sync: make user name/mail overridable 2019-05-17 14:02:22 +02:00
tv
c7cfc7d6a3 github-hosts-sync: update default URL 2019-05-17 13:43:13 +02:00
tv
acb3f95fa6 github-hosts-sync: 1.0.0 -> 2.0.0 2019-05-17 13:31:33 +02:00
makefu
f541eae020
external/hosts: add horisa
host of ulrich which weirdly is in the krebs/retiolum repo, but not in
our hosts
2019-05-15 16:07:12 +02:00
lassulus
222160fc3a allow multiple hostKeys 2019-04-30 19:12:00 +02:00
lassulus
915e4b8437 Merge remote-tracking branch 'ni/master' 2019-04-28 14:18:00 +02:00
lassulus
710609af31 mb p1nk: fix tinc pubkey 2019-04-28 13:56:01 +02:00
lassulus
3dc61a8f2d mb: add p1nk.r 2019-04-26 20:11:30 +02:00
lassulus
7653f7d9f3 mb orange: add more aliases 2019-04-26 20:10:02 +02:00
lassulus
d5c580daa1 init mb 2019-04-26 20:09:55 +02:00
tv
d825d2db87 Merge remote-tracking branch 'prism/master' 2019-04-19 16:39:05 +02:00
tv
5fbe320b91 krebs.shadow: init 2019-04-19 16:32:00 +02:00
tv
b002e799b4 krebs.permown: fix typo in PrivateTmp 2019-04-19 13:58:38 +02:00
lassulus
6c719f03c1 Merge remote-tracking branch 'ni/master' 2019-04-18 20:28:06 +02:00
tv
c082c8d62b krebs.permown: use named pipe
This commit fixes following issues:
1. reexecution causes stray inotifywait processes
2. errors in the while part renderes the service defunct
2019-04-18 11:43:00 +02:00
lassulus
cd6c5e1311 Merge remote-tracking branch 'ni/master' 2019-04-18 11:13:31 +02:00
tv
1bbd53c459 krebs.permown: admit symlinks 2019-04-18 11:00:56 +02:00
tv
64d6955e5a Revert "krebs.permown: [] -> {}"
This reverts commit 87937a5394.

Thanks for reviewing...
2019-04-18 10:19:10 +02:00
lassulus
3adcf3a74c syncthing: listOf -> attrsOf 2019-04-18 10:14:18 +02:00
tv
87937a5394 krebs.permown: [] -> {} 2019-04-18 09:53:31 +02:00
tv
bc200e5155 krebs.permown: mkdirs on activation 2019-04-18 01:23:55 +02:00
tv
520c9ef692 krebs.permown: listOf -> attrsOf 2019-04-18 01:23:12 +02:00
makefu
1314eb9284
Merge remote-tracking branch 'tv/master' 2019-04-17 21:48:20 +02:00
tv
84ad0b0a93 krebs.permown: init
Derived from lass/3modules/ensure-permissions.nix
2019-04-17 21:05:23 +02:00
lassulus
d61f9654f2 l daedalus.r: add ublock origin 2019-04-17 17:38:57 +02:00
lassulus
c4af929d39 l shodan.r: add syncthing.id 2019-04-17 17:38:15 +02:00
lassulus
40f83f1140 external: add ada.r 2019-04-17 17:37:28 +02:00
tv
20fa5109af Merge remote-tracking branch 'prism/master' 2019-04-17 17:17:25 +02:00
lassulus
8058af6c74 realwallpaper: reduce log noise 2019-04-17 14:16:53 +02:00
lassulus
13388e1d9c Merge remote-tracking branch 'ni/master' 2019-04-14 14:15:08 +02:00
tv
d0883b3d3e lass: move p from lassul.us to krebsco.de 2019-04-13 22:05:48 +02:00
lassulus
7083200810 Merge remote-tracking branch 'ni/master' 2019-04-13 21:54:23 +02:00
lassulus
4ac7399b75 bepasty-server: use python2 again 2019-04-13 21:54:15 +02:00
tv
a224e77dfb lass paste: add p.krebsco.de 2019-04-13 21:51:58 +02:00
lassulus
7f9b2c6f45 ci: create gcroot only if result exists 2019-04-13 15:39:40 +02:00
tv
0430fbbbfe Merge remote-tracking branch 'prism/master' 2019-04-13 14:07:30 +02:00
tv
39fba33bed krebs.setuid: propagate env by default 2019-04-13 13:44:49 +02:00
lassulus
6c28491768 bepasty: use python3 2019-04-13 11:30:43 +02:00
lassulus
3fee51f737 syncthing: fix permissions of keys 2019-04-09 16:54:06 +02:00
lassulus
44a48a8d3a l: add green.r 2019-04-07 19:36:05 +02:00
lassulus
212e7f4b98 syncthing: add id option 2019-04-07 18:21:18 +02:00
lassulus
e56e7fbe71 l phone.w: rotate all keys 2019-04-07 18:19:05 +02:00
lassulus
a8c958821d l skynet.r: add wiregrill 2019-04-07 18:10:02 +02:00
lassulus
1c014eb05c l prism.r: add syncthing.id 2019-04-07 18:09:32 +02:00
lassulus
67ca249e33 syncthing: increase rescanInterval to track upstream 2019-03-23 16:04:50 +01:00
lassulus
86150b31f2 syncthing: wait for service startup 2019-03-23 16:04:22 +01:00
lassulus
0bb9321d1b syncthing folders: add watch & ignorePerms options 2019-03-23 16:04:01 +01:00
lassulus
84d0489583 l phone: add syncthing.id 2019-03-23 16:03:20 +01:00
lassulus
c3a1847b98 l blue: add syncthing.id 2019-03-23 16:02:07 +01:00
lassulus
e1f33f0b58 l littleT: add wiregrill & syncthing 2019-03-23 14:18:03 +01:00
lassulus
90ab9c288e l: add syncthing ids for mors, icarus & skynet 2019-03-22 08:01:03 +01:00
lassulus
67d3a55df5 k: add syncthing module 2019-03-22 07:57:34 +01:00
makefu
57850480ee
power-action module: no need for stockholm/lib
this makes the module available to be reused by others without the need
for having stockholm in the search path
2019-03-19 19:49:24 +01:00
lassulus
550faa1f64 Merge remote-tracking branch 'enklave/master' 2019-03-12 11:19:16 +01:00
lassulus
a56a2ef008 Merge remote-tracking branch 'ni/master' 2019-03-12 11:18:05 +01:00
lassulus
c4ebcc43d2 Merge remote-tracking branch 'gum/master' 2019-03-12 11:16:45 +01:00
tv
4b7673a6a7 external: add palo-pepe.pubkey 2019-03-01 11:25:44 +01:00
makefu
ec2dffd71e
ma: add base name to aliases when overriding 2019-02-27 23:58:28 +01:00
makefu
f786e5a22f
ma: make extensive use of defaults for inventory 2019-02-27 23:27:39 +01:00
Jan Heidbrink
6c8d073710 external: add toastbrot.r 2019-02-26 23:11:49 +01:00
makefu
e437c7d17b
Merge remote-tracking branch 'lass/master' 2019-02-26 08:58:51 +01:00
makefu
6da32a5952
ma: cleanup hosts
move pubkeys to separate files in folder
RIP drop latte pigstarter wry shoney heidi lariat soundflower falk bridge horisa tahoe tcac-0-1
2019-02-26 08:58:40 +01:00
lassulus
3a2d5affbb external: actually import palo.nix 2019-02-08 09:43:33 +01:00
tv
cdb548ac30 krebs-hosts-*: don't add lines without alias 2019-02-08 05:19:48 +01:00
tv
659cbed237 krebs-hosts_combined: init 2019-02-08 05:19:48 +01:00
tv
bc4984c7fa retiolum-hosts: RIP 2019-02-08 05:19:48 +01:00
tv
6830a9b32a krebs-hosts-*: generate from krebs.hosts 2019-02-08 05:19:48 +01:00
lassulus
932d11ed93 external: add catullus.r 2019-02-05 20:14:55 +01:00
lassulus
e2ae92445c external: add palo.nix 2019-02-02 09:13:53 +01:00
lassulus
936bf9f7b2 remove kruck.r, add pepe.r 2019-02-01 21:15:27 +01:00
lassulus
79cad8349b bier bal: fix regex 2019-01-29 21:39:16 +01:00
jeschli
924c8fb748 Merge branch 'master' of prism.r:stockholm 2019-01-29 19:17:43 +01:00
tv
74dbc7c8b2 Reaktor: 0.6.2 -> 0.7.0 2019-01-27 20:15:40 +01:00
tv
52ef20148e reaktor2 service: user -> username + proper type 2019-01-27 20:06:06 +01:00
lassulus
88a281c020 Reaktor sed-plugin: use mirc colorcodes 2019-01-27 19:28:54 +01:00
tv
6965a1df8e reaktor2 service: add useTLS option 2019-01-27 18:33:22 +01:00
lassulus
6271cfaed4 reaktor2: add user option 2019-01-27 13:42:05 +01:00
lassulus
61a6467906 Merge remote-tracking branch 'ni/master' 2019-01-22 19:35:19 +01:00
tv
ef6d1453c3 krebs: import reaktor2 service 2019-01-22 19:35:03 +01:00
lassulus
bc2aedb2d0 Mic92: change mail address 2019-01-21 16:25:51 +01:00