Commit Graph

2579 Commits

Author SHA1 Message Date
tv
1c6fafdaa0
krebs exim-smarthost: RIP slash16 2020-01-05 22:16:08 +01:00
lassulus
e2a43e1e30 nixpkgs-unstable: e89b215 -> 3140fa8 2019-12-14 12:47:00 +01:00
lassulus
4baf38fb30 nixpkgs: 4ad6f14 -> 45ea609 2019-12-14 12:46:01 +01:00
makefu
b01ce7bdd9
move filebitch.r from makefu to krebs namespace 2019-12-12 23:29:19 +01:00
lassulus
c743c79639 Merge remote-tracking branch 'gum/master' 2019-12-10 19:35:05 +01:00
makefu
46da29b95b
pkgs.tinc_graphs: bump to 3.11 2019-12-10 15:56:20 +01:00
lassulus
58031cd50f realwallpaper: use working cloudmap 2019-12-08 23:13:04 +01:00
lassulus
bfa577817e Merge remote-tracking branch 'ni/master' 2019-12-02 14:56:04 +01:00
tv
53fd88bcef iana-etc module: allow adding new services
This fixes a bug which only allowed modifying existing services.
2019-12-02 01:11:37 +01:00
lassulus
5ad00a189b update-nixpkgs-unstable: fix commit msg 2019-12-01 16:26:04 +01:00
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
tv
7920ebebf0 Merge remote-tracking branch 'prism/master' 2019-11-29 16:37:14 +01:00
lassulus
5f1a526486 Merge branch 'master' of http://cgit.gum.r/stockholm 2019-11-29 14:49:30 +01:00
lassulus
b025e28b42 ci: redownload all repos 2019-11-29 14:11:18 +01:00
tv
16a023af18 Merge remote-tracking branch 'prism/master' 2019-11-27 09:53:41 +01:00
tv
dc75a54cfb krebs exim-smarthost: RIP slash16 2019-11-27 09:52:53 +01:00
makefu
71d782a50a
shack: streamline ssh-key deployment onto puyak and wolf 2019-11-25 13:26:32 +01:00
makefu
d48d88dab3
ma shack/prometheus: import alerting-rules from mayflower
see: https://github.com/mayflower/nixexprs/blob/master/modules/monitoring/alert-rules.nix
2019-11-25 09:48:58 +01:00
lassulus
0d404b0c1e newsbot-js: fix build on 19.09 2019-11-24 18:48:13 +01:00
lassulus
5fa963b6bc delete mb 2019-11-24 18:17:31 +01:00
lassulus
1144633bd0 nixpkgs: 07e6648 -> 4ad6f14 2019-11-24 10:21:25 +01:00
lassulus
63d2b0eb88 nixpkgs-unstable: c196652 -> e89b215 2019-11-24 10:14:07 +01:00
lassulus
6a10263006 nixpkgs-unstable: 7827d3f -> c196652 2019-11-17 12:01:31 +01:00
lassulus
99c985c77f nixpkgs: cb2cdab -> 07e6648 2019-11-17 11:57:54 +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
d89080f8fa nixpkgs: c5aabb0 -> cb2cdab 2019-11-14 21:06:49 +01:00
lassulus
5e9729d980 Merge remote-tracking branch 'ni/master' 2019-11-12 19:38:53 +01:00
lassulus
68668f3066 Merge remote-tracking branch 'gum/master' 2019-11-12 19:38:18 +01:00
tv
eaefd713c2 Merge remote-tracking branch 'prism/master' 2019-11-12 19:18:31 +01:00
tv
46cdc3ed42 exim: remove because upstream has caught up 2019-11-12 18:52:08 +01:00
makefu
16e1495490
shack/glados: remove version, google -> google_translate 2019-11-07 09:47:29 +01:00
makefu
42694196ee
shack/glados: fix regression, disable influx publisher, disable archiving 2019-11-07 00:25:42 +01:00
makefu
d40ee24dd5
shack/node-light: bump to latest hash 2019-11-07 00:25:01 +01:00
lassulus
c41e974b28 nixpkgs-unstable: 471869c -> 7827d3f 2019-11-06 08:56:20 +01:00
lassulus
1f6e39ee35 nixpkgs: c75de8b -> c5aabb0 2019-11-05 22:13:43 +01:00
lassulus
4b5e3cbc61 nixpkgs-unstable: 4cd2cb4 -> 471869c 2019-11-02 15:05:01 +01:00
makefu
3dc3e21e52
Merge remote-tracking branch 'lass/master' 2019-10-31 15:40:35 +01:00
makefu
d3b0e07fbb
wolf.r: disable swap 2019-10-31 15:19:04 +01:00
makefu
a52e2d7916
shack/*: fix regression with mkYarnPackage and pypi2nix generated files 2019-10-31 15:17:18 +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
lassulus
4bb3f551ab nixpkgs: 7952807 -> c75de8b 2019-10-29 19:33:55 +01:00
makefu
f566e34335
rtorrent module: set listen.owner in phpfpm 2019-10-28 11:00:11 +01:00
makefu
3e5040747c
shack/muellshack: mkYarnPackage is not vendored anymore, using pkgs.yarn2nix-moretea.mkYarnPackage 2019-10-28 07:38:07 +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
e5ffd26362 Merge remote-tracking branch 'ni/master' 2019-10-16 11:40:22 +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
f786002cb3
shack/muell_mail: use callPackage 2019-10-15 14:35:56 +02:00
makefu
7535bc7457
shack/prometheus: use alertmanagers instead of alertmanagerURL 2019-10-15 14:08:00 +02:00
makefu
0c7b43e760
rtorrent module: switch from poolConfigs to pools for phpfpm 2019-10-15 13:59:11 +02:00
makefu
9598c99301
shack/muell_mail: mkYarnPackage comes from yarn2nix now 2019-10-15 09:05:37 +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
2a40b6c342 cholerab: don't use IFD 2019-10-14 13:12:30 +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
4d01390837
nixpkgs: 88bbb3c -> 7952807 2019-10-14 11:36:49 +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
makefu
aa3a15283a
glados/wasser: water for 20 seconds instead of 10 2019-10-13 02:31:48 +02:00
makefu
bce0555f05
move shack prometheus from wolf to puyak 2019-10-13 02:30:57 +02:00
lassulus
c8e29c89bc bepasty-server: fix proxied host header spoofing 2019-10-10 14:48:45 +02:00
lassulus
d2f9783483 remove deprecated bitlbee-discord 2019-10-10 10:54:37 +02:00
lassulus
41a92b7715 newsbot-js: use nodejs 12 2019-10-10 10:48:17 +02:00
lassulus
9ae5cd22a6 email-header: make future compatible 2019-10-09 23:27:33 +02:00
lassulus
5e798c623d go-shortener: use nodejs-12 2019-10-09 19:52:32 +02:00
lassulus
06d19698a4 nixpkgs 19.03 -> 19.09 2019-10-09 19:17:16 +02:00
lassulus
37af55d4d4 nixpkgs: 021d733 -> 88bbb3c 2019-10-09 19:14:41 +02:00
Luis Hebendanz
8c067f260b external qubasa.r: rotate tinc key 2019-10-03 23:51:20 +02:00
tv
eb0d4361a2 krebs exim-smarthost: update eloop addresses 2019-10-02 11:48:16 +02:00
makefu
9d22855d12
shack/*: RestartSec=15; Restart=always 2019-09-26 21:46:14 +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
lassulus
53c6b483ba nixpkgs: 8a30e24 -> 021d733 2019-09-24 22:01:13 +02:00
makefu
1f4ae89faf
ma shiori: init, add to gum 2019-09-24 18:41:36 +02:00
makefu
78687ea2a8
Merge remote-tracking branch 'lass/master' 2019-09-24 17:08:52 +02:00
lassulus
9612fe5a88 update-channel.sh -> update-nixpkgs.sh 2019-09-22 12:47:02 +02:00
lassulus
0a7989d0f0 add nixpkgs-unstable 2019-09-22 12:46:27 +02:00
lassulus
522ccb28ca haskell blessings: add future compatibility 2019-09-22 11:42:14 +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
makefu
4bb7a52e98
shack/glados: update automations 2019-09-19 21:31:21 +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
20e38840fe nixpkgs: 541d9cc -> 8a30e24 2019-09-11 11:53:28 +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
ed97000b20 Merge remote-tracking branch 'gum/master' 2019-09-06 15:37:58 +02:00
lassulus
c2773285eb Merge remote-tracking branch 'ni/master' 2019-09-06 15:33:04 +02:00
makefu
8901bab8ad
Merge remote-tracking branch 'tv/master' 2019-09-06 15:11:25 +02:00
tv
e388d02623 exim: init at 4.92.2 because security 2019-09-06 15:07:05 +02:00
makefu
fce2c4275c
shack/glados: init shackopen and auto watering 2019-09-06 01:08:32 +02:00
lassulus
5304a296d5 nixpkgs: e021485 -> 541d9cc 2019-09-04 14:00:46 +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
makefu
39b1e08ad1
stats/shack-client: ignore docker interfaces 2019-09-02 15:45:59 +02:00
makefu
6d7fe1f115
shack/prometheus/server: lower retention time due to space limitation 2019-09-02 15:31:30 +02:00
makefu
e4c836b9c4
shack/glados: init home-assistant config 2019-09-02 13:57:06 +02:00
makefu
86592a7233
shack/influx: enable collectd receiver 2019-09-02 13:56:34 +02:00
makefu
18badcd7c6
puyak.r,wolf.r: configure monitoring for shack infra 2019-09-02 13:56:03 +02:00
lassulus
d93ed46e08 nixpkgs: 4f2b76e -> e021485 2019-08-27 11:08:50 +02:00
tv
aac6c242e8 nix-prefetch-github: init 2019-08-14 13:41:46 +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
lassulus
0726c033b4 hotdog.r: disable repo-sync 2019-08-08 17:34:24 +02:00
lassulus
d3d9f58bad nixpkgs: 754763f -> 4f2b76e 2019-08-03 13:19:59 +02:00
tv
7c522820bd Merge remote-tracking branch 'prism/master' 2019-08-02 17:04:39 +02:00
makefu
3189052d4d
krebs: cleanup default.nix 2019-07-25 22:13:14 +02:00
makefu
91833c560a
shack/prometheus: remove legacy config 2019-07-20 00:10:16 +02:00
makefu
c929afa9f3
wolf.r: grafana to seperate config 2019-07-20 00:09:47 +02:00
makefu
1eeccb54a2
wolf.r: graphite.shack redirect to graphite:8080 2019-07-19 19:34:08 +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
makefu
a450669027
shack/powerraw: send stats to influx as well 2019-07-17 13:55:33 +02:00
makefu
8e0c6fc8c5
shack/mqtt: update permissions 2019-07-17 10:55:36 +02:00
makefu
828d2fd14a
nixpkgs: d77e3bd -> 973a270 2019-07-17 10:50:27 +02:00
makefu
6822bf0ecf
Merge branch 'master' of ssh.git.shackspace.de:rz/stockholm 2019-07-17 10:43:58 +02:00
makefu
73a5143866
wolf.r: enable powerraw 2019-07-17 10:43:27 +02:00
makefu
35837fd8d6
shack/powerraw: init 2019-07-17 10:43:12 +02:00
makefu
c38f02c4d7
shack/s3-power: update revision 2019-07-17 00:53:56 +02:00
ulrich
da4ecbeccd wolf.r: remove openhab-ip 2019-07-17 00:46:15 +02:00
makefu
31944ce77d
wolf.r: also use openhab ip address 2019-07-16 19:48:47 +02:00
makefu
64c0ea7143
shack/s3-power: use one-shot version 2019-07-16 19:47:49 +02:00
makefu
570af0025a
shack/muellshack,node-light: fix paths 2019-07-16 18:57:09 +02:00
makefu
cd1ab46c3b
0tests: add shack/s3-power.json 2019-07-16 09:11:41 +02:00
makefu
4325cce945
wolf.r: enable s3-power 2019-07-16 09:04:18 +02:00
lassulus
ea68d0fe56 blessings/email-header: add 19.09 compat 2019-07-15 18:28:17 +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
b13a28d867 bier bal: prefix nicks with the_ 2019-07-15 18:22:35 +02:00
makefu
e767afa039
shack/muell_mail,s3-power: update commits 2019-07-15 09:58:20 +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
makefu
13773d684c
wolf.r: configure muell_mail 2019-07-12 17:22:03 +02:00
makefu
80ed71e9b8
shack/muell_mail: init 2019-07-12 17:21:29 +02:00
makefu
cf81f41a90
wolf.r: deploy node-light 2019-07-11 18:12:09 +02:00
makefu
31960101a7
shack/node-light: init 2019-07-11 18:11:50 +02:00
makefu
4dad3683f9
shack/muellshack: make storage.json writeable 2019-07-11 18:11:22 +02:00
lassulus
13d8d9f7d3 Revert "l: rip xerxes"
This reverts commit 4e04b2ac99.
2019-07-11 16:09:14 +02:00
makefu
bfff5c1a92
wolf.r: enable muellshack 2019-07-11 09:37:46 +02:00
makefu
9f27ddabac
shack/gitlab-runner: docker.restartIfChanged = false 2019-07-11 09:37:23 +02:00
makefu
bb0bd75d78
shack/muellshack: init 2019-07-11 09:35:36 +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
e5d7d6eee2
wolf.r: enable remote deployment 2019-07-08 08:04:50 +02:00
makefu
0a8475344a
krebs/krops.nix: add target 2019-07-08 01:10:56 +02:00
makefu
7ca133e90b
shack/gitlab-runner: do not restart service on change 2019-07-08 01:04:59 +02:00
makefu
053a74ebbf
puyak.r: enable gitlab-runner 2019-07-07 23:15:55 +02:00
makefu
19e25f5856
shack/gitlab-ci: enable graceful shutdown 2019-07-07 21:18:32 +02:00
lassulus
9b38d314ca nixpkgs: d77e3bd -> 754763f 2019-07-06 22:34:28 +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
makefu
32a808f9eb
0tests: add shack/unifi-prometheus-pw 2019-06-20 22:46:58 +02:00
makefu
8225afec5b
wolf.r: init shack/prometheus config 2019-06-20 22:25:46 +02:00
lassulus
61d5ce157f
nixpkgs: f01ed7b -> d77e3bd 2019-06-19 23:18:14 +02:00
lassulus
0897d8619a
nixpkgs: 1601f55 -> f01ed7b 2019-06-19 23:18:14 +02:00
makefu
f880fb21ca
ma extra-gui: no more rambox 2019-06-19 23:18:10 +02:00
lassulus
5eaa8844e3
external: add wilde.r (kmein) 2019-06-19 23:18:10 +02:00
lassulus
f7134008f1
nixpkgs: e2883c3 -> 1601f55 2019-06-19 23:18:10 +02:00
lassulus
335d15d4ec
external: add rilke.w 2019-06-19 23:18:09 +02:00
lassulus
ad7800ecce nixpkgs: f01ed7b -> d77e3bd 2019-06-19 15:22:37 +02:00
lassulus
3dd3da513c nixpkgs: 1601f55 -> f01ed7b 2019-06-19 11:36:55 +02:00
makefu
9564a24c32
config collectd-base: send logs to wolf 2019-06-17 07:52:55 +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
3fa17455ef nixpkgs: e2883c3 -> 1601f55 2019-06-15 12:20:18 +02:00
lassulus
14954b9632 Merge remote-tracking branch 'gum/master' 2019-06-15 02:09:37 +02:00