Commit Graph

2917 Commits

Author SHA1 Message Date
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
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
df9b3fa1be
shack/gitlab-runner: remove trailing whitespace 2019-06-14 23:58:24 +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
lassulus
4e7af580d8 krops: get correct secrets 2019-06-13 23:35:55 +02:00
makefu
592d157eba
wolf secrets: add shackspace-gitlab-ci 2019-06-13 20:43:32 +02:00
makefu
df8e811695
external: add 0x4a6f 2019-06-13 20:28:32 +02:00
makefu
27f3c2cd53
wolf.r: add netbox docker-compose 2019-06-13 20:17:45 +02:00
makefu
30a90e48b9
wolf.r: add documentation for imports 2019-06-12 20:53:02 +02:00
makefu
4caeb3d3f8
wolf.r: add declarative gitlab-runner 2019-06-12 09:56:07 +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
816dba3a15 Merge remote-tracking branch 'enklave/master' 2019-05-29 09:07:47 +02:00
lassulus
680d5b4cff Merge remote-tracking branch 'ni/master' 2019-05-29 09:07:03 +02:00
makefu
08ddffd781
nixpkgs: 705986f -> e2883c3 2019-05-28 09:33:37 +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
jeschli
ef05aadec9 Merge remote-tracking branch 'prism/master' 2019-05-21 19:12:50 +02:00
tv
eb9c9b80ca github-known-hosts: add new hosts 2019-05-21 10:39:18 +02:00
lassulus
31df4e128b nixpkgs: 04954e3 -> 705986f 2019-05-20 11:42:36 +02:00
tv
a666abeaab github-hosts-sync: make user name/mail overridable 2019-05-17 14:02:22 +02:00
tv
2950b893b0 github-hosts-sync: add nettools 2019-05-17 13:53:55 +02:00
tv
e91f56a409 krebs: add dummy github-hosts-sync.ssh.id_ed25519 2019-05-17 13:48:48 +02:00
tv
c7cfc7d6a3 github-hosts-sync: update default URL 2019-05-17 13:43:13 +02:00
tv
866e94b4fa hotdog.r: enable github-hosts-sync 2019-05-17 13:36:13 +02:00
tv
acb3f95fa6 github-hosts-sync: 1.0.0 -> 2.0.0 2019-05-17 13:31:33 +02:00
tv
4630d10b31 github-hosts-sync: import 1.0.0 from painload 2019-05-17 12:51:29 +02:00
tv
1ceae8b0e3 Merge remote-tracking branch 'gum/master' 2019-05-15 16:10:14 +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
makefu
66ade66c5d
pkgs.prison-break: drop from krebs namespace 2019-05-14 20:34:20 +02:00
jeschli
e869a8a82a Merge branch 'master' of prism.r:stockholm 2019-05-14 19:02:02 +02:00
makefu
135dc5297a
ma pkgs.prison-break: move back to own namespace, use nur.repos.makefu.prison-break for krebs 2019-05-14 09:18:26 +02:00
makefu
b65e9c0762
pkgs.prison-break: 1.0.1 -> 1.2.0 2019-05-11 11:34:15 +02:00
makefu
8f87254a2a
puyak.r: allow access from raute and ulrich 2019-05-10 21:03:36 +02:00
makefu
45f2d6af58
Merge remote-tracking branch 'lass/master' 2019-05-10 21:02:33 +02:00
makefu
795ba0b57f
ma pkgs.prison-break: bump to 1.0.1 2019-05-08 13:56:33 +02:00
lassulus
9da52b378d Merge remote-tracking branch 'gum/master' 2019-05-05 10:40:24 +02:00
lassulus
595574d433 Merge remote-tracking branch 'ni/master' 2019-05-05 10:28:52 +02:00
lassulus
397fad2366 nixpkgs: cf3e277 -> 04954e3 2019-05-05 10:27:57 +02:00
tv
df6007c2eb treewide: nixpkgsVersion -> version 2019-04-30 21:50:07 +02:00
tv
c7d02cb595 ssh-audit: init at 1.7.0 2019-04-30 20:25:53 +02:00
jeschli
97b78b45a8 Merge branch 'master' of prism.r:stockholm 2019-04-30 19:19:55 +02:00
lassulus
222160fc3a allow multiple hostKeys 2019-04-30 19:12:00 +02:00
jeschli
e45b3492b3 Merge branch 'master' of prism.r:stockholm 2019-04-28 15:05:34 +02:00
lassulus
18b98333d4 irc-announce: add _ to nick, for filtering 2019-04-28 15:01:50 +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
2f8a55268c Merge branch 'mb' 2019-04-28 13:46:00 +02:00
lassulus
c483c69ba1 nixpkgs: 8ea36d7 -> cf3e277 2019-04-27 12:11:25 +02:00
makefu
2685464a60
Merge branch 'master' of prism:stockholm 2019-04-26 20:35:52 +02:00
makefu
95f6a06c5a
prison-break: move to krebs 2019-04-26 20:31:21 +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
jeschli
35fdfbe5cc Merge branch 'master' of prism.r:stockholm 2019-04-23 20:15:10 +02:00
lassulus
cd825d9934 reaktor2: add user 2019-04-23 20:12:58 +02:00
lassulus
a65e68e51c nixpkgs: 5c52b25 -> 8ea36d7 2019-04-23 20:12:53 +02:00
tv
46172b7f01 flameshot-once: make timeout configurable 2019-04-23 13:22:50 +02:00
tv
d7ca88168c flameshot-once: fix _file in profile module 2019-04-23 13:17:01 +02:00
tv
3e5ec99203 flameshot-once: 1.1.0 -> 1.2.0 2019-04-23 13:15:57 +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
tv
ffd36f5554 Merge remote-tracking branch 'gum/master' 2019-04-17 22:04:03 +02:00
tv
e051fecf9c qrscan: init 2019-04-17 21:49:43 +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
tv
3214a47d45 krebspaste: print public URL 2019-04-13 22:01:13 +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
46c06dd997 nixpkgs: 67bc63f -> 5c52b25 2019-04-11 15:17:54 +02:00
jeschli
a4be985644 Merge branch 'master' of prism.r:stockholm 2019-04-09 20:12:06 +02:00
lassulus
3fee51f737 syncthing: fix permissions of keys 2019-04-09 16:54:06 +02:00
lassulus
ade34e2ccd hotdog.r: don't set NIX_REMOTE 2019-04-08 20:59:10 +02:00
lassulus
7d7be871d8 nixpkgs: 2229509 -> 67bc63f 2019-04-08 17:34:12 +02:00
lassulus
9eb7244146 email-header: add 19.03 compatibility 2019-04-08 17:20:26 +02:00
lassulus
a1cf824e2f blessings: add 19.03 compatibility 2019-04-08 17:20:26 +02:00
lassulus
64c8c06f02 18.09 -> 19.03 2019-04-08 17:20:26 +02:00
lassulus
7e1b197dab Merge remote-tracking branch 'ni/master' 2019-04-08 17:16:29 +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
2b748822b1 nixpkgs: 8abca4b -> 2229509 2019-04-07 17:59:22 +02:00
jeschli
f8b88080d5 :Merge branch 'master' of prism.r:stockholm 2019-04-02 19:38:35 +02:00
tv
d40f20b711 q-power_supply: init from tv's q 2019-03-29 18:15:52 +01: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
lassulus
44540e0814 nixpkgs: 4c0be40 -> 8abca4b 2019-03-07 21:50:19 +01:00
lassulus
244c773212 nixpkgs: 9bd45dd -> 4c0be40 2019-03-04 00:49:16 +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
tv
c6b863a403 Reaktor: 0.7.0 -> 0.7.1 2019-02-17 18:19:13 +01:00
tv
6f6e18d22f Revert "brscan4: init at 0.4.4-4"
This reverts commit 1993cbc421.
2019-02-16 18:49:26 +01:00
tv
3a262f1c24 symlinkJoin: remove compatibility
This reverts commit f46b3153c0.
2019-02-16 18:15:13 +01:00
tv
4e81d40e30 flameshot-once: default filenamePattern w/o .png 2019-02-16 17:47:12 +01:00
lassulus
5845742ae0 nixpkgs: 168cbb3 -> 9bd45dd 2019-02-16 15:28:30 +01:00
lassulus
5605d675da nixpkgs: b01a89d -> 168cbb3 2019-02-12 14:55:19 +01:00
tv
e29debea42 flameshot-once: 1.0.1 -> 1.1.0 2019-02-09 13:43:27 +01:00
tv
f949639497 flameshot-once: make filenamePattern configurable 2019-02-09 13:43:27 +01:00
tv
1b526ec1a5 flameshot-once: add config 2019-02-09 13:43:27 +01:00
tv
7f40ff9b5c flameshot-once: use qt5.qtbase 2019-02-09 13:43:27 +01:00
lassulus
5d4ca64478 nixpkgs: 97e0d53 -> b01a89d 2019-02-08 17:05:47 +01:00
lassulus
3a2d5affbb external: actually import palo.nix 2019-02-08 09:43:33 +01:00
tv
76fd127a7f flameshot-once: 1.0.0 -> 1.0.1 2019-02-08 05:19:48 +01:00
tv
24d008d92d flameshot-once: init at 1.0.0 2019-02-08 05:19:48 +01:00
tv
d3f9c8efcc blessings: 2.1.0 -> 2.2.0 2019-02-08 05:19:48 +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
lassulus
937c1bc02c Merge remote-tracking branch 'ni/master' 2019-01-29 20:53:38 +01:00
tv
773db3ae47 reaktor2: 0.2.1 -> 0.2.2 2019-01-29 20:51:11 +01:00
jeschli
1f6ba2a01d xmonad-stockholm: arguments in one line 2019-01-29 19:59:59 +01:00
jeschli
924c8fb748 Merge branch 'master' of prism.r:stockholm 2019-01-29 19:17:43 +01:00
lassulus
fd5615a298 krops: bootstrap nixpkgs 2019-01-28 23:16:48 +01:00
makefu
7bc36518d1
Merge remote-tracking branch 'lass/master' 2019-01-28 08:32:05 +01:00
makefu
0ead7ae0a7
k shack/ympd: add next and prev buttons at top 2019-01-28 08:29:19 +01:00
tv
06b23af29d reaktor2 task: define env in hook 2019-01-27 20:32:04 +01:00
tv
f608351da1 reaktor2: 0.2.0 -> 0.2.1 2019-01-27 20:27:16 +01:00
tv
74dbc7c8b2 Reaktor: 0.6.2 -> 0.7.0 2019-01-27 20:15:40 +01:00
tv
b4f24ff76a krebs nscd-fix: normalize style 2019-01-27 20:09:11 +01:00
tv
52ef20148e reaktor2 service: user -> username + proper type 2019-01-27 20:06:06 +01:00
lassulus
fa1e5d5b7f l reaktor-plugins: use correct header 2019-01-27 19:33:43 +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
5926a71859 reaktor2 task: use single hook for more efficency 2019-01-27 16:55:47 +01:00
lassulus
35a2ace1ae Merge remote-tracking branch 'ni/master' 2019-01-27 16:36:40 +01:00
lassulus
92caf2dada reaktor2 bier: allow 'bier bal' as command 2019-01-27 14:32:33 +01:00
lassulus
fd4876da16 reaktor2: pretty print bier balance 2019-01-27 14:27:54 +01:00
lassulus
052cef71fd reaktor: ledger balance -> bier balance 2019-01-27 13:50:31 +01:00
lassulus
b28706964e hotdog.r: Reaktor -> reaktor2 2019-01-27 13:42:05 +01:00
lassulus
6271cfaed4 reaktor2: add user option 2019-01-27 13:42:05 +01:00
lassulus
aa070d5db7 hotdog.r: import nscd-fix 2019-01-27 03:33:30 +01:00
tv
ab18e5a468 reaktor2: 0.1.7 -> 0.2.0 2019-01-27 03:29:00 +01:00
lassulus
a7af3289a9 pkgs: add reaktor2-plugins 2019-01-27 03:27:29 +01:00
lassulus
2263863845 add nscd-fix 2019-01-27 03:18:03 +01:00
lassulus
6f2dd04604 Merge remote-tracking branch 'ni/master' 2019-01-27 02:51:14 +01:00
tv
775d7a789d reaktor2: 0.1.6 -> 0.1.7 2019-01-26 21:28:35 +01:00
tv
27bd27f150 reaktor2: 0.1.5 -> 0.1.6 2019-01-26 20:41:45 +01:00
lassulus
d0a55575fa Merge remote-tracking branch 'ni/master' 2019-01-25 19:41:00 +01:00
tv
b3c65141b8 reaktor2: 0.1.4 -> 0.1.5 2019-01-25 14:54:31 +01:00
tv
7c160fd1fa blessings: 1.3.0 -> 2.1.0 2019-01-25 14:32:11 +01:00
lassulus
1f6b43acbd Merge remote-tracking branch 'ni/master' 2019-01-24 22:58:09 +01:00
tv
2e5ed5d1bb reaktor2: 0.1.2 -> 0.1.3 2019-01-24 21:16:44 +01:00
tv
f60d286746 reaktor2: 0.1.1 -> 0.1.2 2019-01-24 17:26:12 +01:00
lassulus
0cc3dd577d Merge remote-tracking branch 'ni/master' 2019-01-23 16:55:51 +01:00
tv
00c529b9d5 Reaktor random-emoji: curl -S 2019-01-23 14:08:51 +01:00
tv
282e4049b6 Reaktor scripts: chmod +x 2019-01-23 14:02:05 +01:00
tv
31a987903f reaktor2: 0.1.0 -> 0.1.1 2019-01-23 13:52:00 +01:00
tv
659eb2e6c5 reaktor2: 0.0.0 -> 0.1.0 2019-01-23 01:00:58 +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
30bfcf1a10 reaktor-krebs: join #nixos-de 2019-01-22 16:23:08 +01:00
lassulus
bc2aedb2d0 Mic92: change mail address 2019-01-21 16:25:51 +01:00
lassulus
9033d807f9 external: add idontcare.r 2019-01-21 16:25:27 +01:00
lassulus
144e2c5571 Merge remote-tracking branch 'ni/master' 2019-01-21 16:24:43 +01:00
lassulus
bc61d4df90 Merge remote-tracking branch 'gum/master' 2019-01-21 16:24:29 +01:00
tv
fabef36385 reaktor2 service: init 2019-01-21 12:28:30 +01:00
tv
153d27e6c8 reaktor2: init at 0.0.0 2019-01-21 12:28:30 +01:00
tv
f129810317 krebs hosts: extraHost -> hosts 2019-01-21 11:51:15 +01:00
tv
af0463b234 krebs: move hosts to dedeicated file 2019-01-21 11:04:37 +01:00
tv
799f132d58 krebs: move retiolum-hosts to dedicated file 2019-01-21 10:54:01 +01:00
tv
da79d23ebb krebs: move dns stuff to dedicated file 2019-01-21 10:33:23 +01:00
tv
9082adf687 krebs: move exim aliases to dedicated file 2019-01-21 10:22:18 +01:00
tv
9f2a646566 krebs: move github known hosts to dedicated file 2019-01-21 10:09:46 +01:00
tv
c4be6cf076 blessings: 1.2.0 -> 1.3.0 2019-01-18 13:58:42 +01:00
lassulus
1decf0bf37 nixpkgs: 0396345 -> 97e0d53 2019-01-18 12:43:00 +01:00
tv
6cef97deb3 Merge remote-tracking branch 'prism/master' 2019-01-16 11:20:14 +01:00
lassulus
879b6d319a Merge remote-tracking branch 'ni/master' 2019-01-16 11:17:20 +01:00
tv
2d2ab95f07 krebs tinc: Broadcast = no 2019-01-16 11:10:34 +01:00
makefu
dd22da5e6b
external: new ip for eve 2019-01-11 22:50:40 +01:00
lassulus
a1d9c22bbd Reaktor plugins: merge task with todo, make task like todo 2019-01-10 20:17:51 +01:00
tv
6e5a61b676 per-user module: enable only if configured 2019-01-05 20:16:17 +01:00
makefu
704f2854f0
Merge remote-tracking branch 'lass/master' 2019-01-03 23:27:05 +01:00
makefu
6044ffe3a5
external: use unused ip for matchbox 2019-01-03 23:01:16 +01:00
makefu
4715e28304
Merge remote-tracking branch 'lass/master' 2019-01-03 22:55:53 +01:00
lassulus
7176d12ff8 external matchbox: use free ipv4 2019-01-03 22:28:44 +01:00
lassulus
05f9389e4f krops: use nixpkgs derivation for ci 2019-01-03 21:32:29 +01:00
lassulus
6db1a249e6 nixpkgs: b9fa31c -> 0396345 2019-01-03 17:24:50 +01:00
lassulus
de6ca6e60b external: add matchbox 2019-01-02 21:48:07 +01:00
makefu
e71561caaf
ma cake.r: add Mic92 ssh key to authorized keys 2018-12-31 10:15:22 +01:00
jeschli
06b6454af7 Merge branch 'master' of prism.r:stockholm 2018-12-28 14:48:30 +01:00
lassulus
fb254e6094 external: remove miaoski wrong subnet 2018-12-26 23:48:54 +01:00
lassulus
7a4ec8bdb5 external: add kmein pubkey 2018-12-26 16:28:46 +01:00
lassulus
48847ca815 external: add miaoski 2018-12-25 14:38:29 +01:00
lassulus
8b4beb8138 l daedalus.w: fix alias 2018-12-25 14:38:00 +01:00
lassulus
371e223665 external: set wiregrill ip6 2018-12-25 14:21:45 +01:00
lassulus
cabb397b83 nixpkgs: 7e88992 -> b9fa31c 2018-12-24 16:34:34 +01:00
lassulus
4c60ad0e08 l daedalus: fix typo in ipv6 2018-12-24 16:32:19 +01:00
lassulus
2e4266297a l wiregrill: remove obsolete ipv4 2018-12-24 15:48:35 +01:00
lassulus
50d91aa83f nixpkgs: 5d4a1a3 -> 7e88992 2018-12-19 20:54:01 +01:00
makefu
337761712a
external: move tpsw from makefu, add justraute 2018-12-19 14:41:56 +01:00
makefu
30654e46c6
external: sort 2018-12-19 14:33:07 +01:00
makefu
d0a02bf54d
external: move users from makefu namespace to external 2018-12-19 14:25:03 +01:00
lassulus
adcb9ff179 Merge remote-tracking branch 'ni/master' 2018-12-18 22:12:08 +01:00
lassulus
b199a386d3 external: add qubasa 2018-12-18 21:57:08 +01:00
tv
0b57526d4f tv: configure the wiregrill 2018-12-18 21:40:52 +01:00
tv
f7e0cdbc14 lass prism: set wiregrill subnets explicitly 2018-12-18 21:17:41 +01:00
jeschli
8605ac91ae Merge branch 'master' of prism.r:stockholm 2018-12-16 20:28:28 +01:00
lassulus
24330950fe wirelum -> wiregrill 2018-12-16 16:11:02 +01:00
lassulus
4e04b2ac99 l: rip xerxes 2018-12-15 23:02:22 +01:00
lassulus
f0fc2013d7 l: update shodan wirelum key 2018-12-15 23:01:55 +01:00
lassulus
9e6dbd6df4 l: set short ipv6 addresses for all hosts 2018-12-15 21:10:05 +01:00
makefu
97aaf34c33
Merge remote-tracking branch 'lass/master' into HEAD 2018-12-12 17:53:38 +01:00
tv
e55b540928 krebs hosts: add owner to testHosts, too ^_^' 2018-12-11 23:11:40 +01:00
tv
313712ebc2 hosts.*.net.retiolum.ip6.addr: use genipv6 2018-12-11 22:06:35 +01:00
makefu
2e18ee84f0
ma: sort hostnames for euer, add netdata.euer.krebsco.de 2018-12-10 00:09:03 +01:00
lassulus
30772247c0 l: add morpheus.r 2018-12-09 17:12:34 +01:00
lassulus
c739f81e5b l: add wirelum to prism, mors, shodan, icarus, yellow 2018-12-09 17:02:50 +01:00
lassulus
a289812df1 l: add phone.w 2018-12-09 17:01:51 +01:00
lassulus
60f1e40445 dns.providers: add wirelum (w) 2018-12-09 16:52:45 +01:00
lassulus
43be8e6bb3 git: set correct owner on /tmp/cgit 2018-12-06 20:07:22 +01:00
lassulus
7fab6f2dfe l hosts: remove deprecated gg23 net 2018-12-05 16:50:39 +01:00
makefu
a4556a17f6
Merge remote-tracking branch 'lass/master' into HEAD 2018-12-05 16:41:38 +01:00
lassulus
c2d2e0e01d move external hosts from lass to external 2018-12-05 16:17:28 +01:00
lassulus
3dd503e08f remove unused domsen-nas host 2018-12-05 16:05:47 +01:00
lassulus
d6fba75f21 l: remove deprecated iso host 2018-12-05 15:51:46 +01:00
lassulus
29998a8a35 snews: prefix with _ 2018-12-05 09:01:56 +01:00
lassulus
a8aa26bab1 l: adopt scardanelli & homeros (kmein) 2018-12-04 21:32:02 +01:00
jeschli
5030b74cc5 Merge branch 'master' of prism.r:stockholm 2018-12-04 19:27:27 +01:00
lassulus
d30118879d Merge remote-tracking branch 'ni/master' 2018-12-04 08:08:43 +01:00
makefu
42e64be388
cache.nsupdate.info: bump index 2018-12-03 22:06:23 +01:00
lassulus
4d36900c6f Reaktor: add user only if active 2018-12-03 17:39:34 +01:00
tv
63798eb150 cabal-read: init 2018-12-03 09:51:38 +01:00
lassulus
692271b2b9 tinc_graphs: use genid_uint31 2018-12-03 09:46:19 +01:00
lassulus
dec7956b53 fetchWallpaper: use genid_uint31 2018-12-03 09:46:09 +01:00
lassulus
176883b37d bepasty-server: use genid_uint31 2018-12-03 09:45:56 +01:00
makefu
5782a4de2e
cache.nixos.org: provide index.html 2018-12-03 09:20:14 +01:00
lassulus
0d7433f8ea l: remove more fritz 2018-12-03 05:01:22 +01:00
lassulus
d1c7ec94eb Merge remote-tracking branch 'ni/master' 2018-12-03 04:59:27 +01:00
tv
24b07c3284 urlwatch service: use genid_uint31
Refs https://github.com/systemd/systemd/issues/11026
2018-12-02 20:19:19 +01:00
tv
eb32d03802 github-hosts-sync service: use genid_uint31
Refs https://github.com/systemd/systemd/issues/11026
2018-12-02 20:16:16 +01:00
makefu
b8db729338
Merge remote-tracking branch 'lass/master' 2018-11-30 23:19:32 +01:00
makefu
91e05287a7
k binary-cache: use https://cache.krebsco.de 2018-11-30 23:15:36 +01:00
makefu
a2b8571c5e
ma: fix ssh key of ulrich 2018-11-30 23:02:21 +01:00
lassulus
f6b5bbc305 Merge remote-tracking branch 'ni/master' 2018-11-30 20:42:01 +01:00
tv
5f0b1b8035 lib: add mapNixDir{,1} 2018-11-30 09:47:26 +01:00
lassulus
cd3b73955e l: RIP cabal.r 2018-11-30 04:40:59 +01:00
lassulus
293a82ad3b maintain realwallpaper in stockholm 2018-11-30 04:36:37 +01:00
lassulus
740f8c8ccf l: move download stuff to yellow.r 2018-11-30 04:35:00 +01:00
tv
53359a60f5 xmonad-stockholm: 1.2.0 -> 1.3.0 2018-11-29 21:56:52 +01:00
lassulus
95f6255f58 * krops: merge krebs-nixpkgs into krebs-source 2018-11-28 22:18:54 +01:00
lassulus
a69175a719 Merge remote-tracking branch 'ni/master' into ci 2018-11-28 18:55:08 +01:00
lassulus
f69a078f90 krops: reformat secrets (style) 2018-11-28 12:36:18 +01:00
lassulus
61f1aba8bc * krops: get nixpkgs from store for ci 2018-11-28 12:36:18 +01:00
lassulus
856c4777d1 ci: js -> json, output to stderr 2018-11-28 12:36:17 +01:00
lassulus
00ff16d540 ci get_steps: explicit pkg references 2018-11-27 20:38:59 +01:00
tv
dae35c44c7 krebs: integrate 5pkgs as overlay 2018-11-27 11:54:25 +01:00
lassulus
0b6c07ad72 buildbot: don't fuckup permissions 2018-11-27 04:19:07 +01:00
lassulus
593b2baf03 fetchWallpaper: remove broken maxTime 2018-11-27 00:58:57 +01:00
lassulus
09ee7ca4d8 ci: add gcroot for build-scripts 2018-11-27 00:58:07 +01:00
lassulus
c35bc044db ci: abort if an error occurs in get_steps 2018-11-27 00:55:59 +01:00
lassulus
6fe8e37aa6 Merge remote-tracking branch 'gum/master' 2018-11-26 00:00:21 +01:00
makefu
4fedcb8147
ma gum.r: fix pubkey
which accidentally got overwritten ...
2018-11-25 23:45:27 +01:00
lassulus
91e4f7fd92 nixpkgs: bf7930d -> 5d4a1a3 2018-11-25 18:20:40 +01:00
makefu
a6f4d27da6
ma: gum.r also resolves to torrent.gum.r 2018-11-22 09:38:33 +01:00
lassulus
105a0b6515 cachecache: enable only if enabled 2018-11-21 04:10:07 +01:00
makefu
c4484dee1a
puyak.r: disable cache again 2018-11-21 00:06:05 +01:00
makefu
b073ee1fd4
puyak.r: add cache.nsupdate.info 2018-11-21 00:03:49 +01:00
tv
f2ca6be6a7 Merge remote-tracking branch 'gum/master' 2018-11-14 09:24:59 +01:00
tv
ddfddbe756 ci: register GC roots 2018-11-13 22:04:49 +01:00
tv
8f6dc4a131 ejabberd: replaced by upstream 2018-11-13 21:19:48 +01:00
makefu
e3efeb6dd5
Merge remote-tracking branch 'lassul.us/master' 2018-11-10 22:05:40 +01:00
makefu
0c235a88a8
ma: disable some host ci 2018-11-10 21:11:23 +01:00
lassulus
f2dd2793cd l dns-stuff: sort 2018-11-10 20:29:39 +01:00
lassulus
ee8196c20f Merge remote-tracking branch 'ni/master' 2018-11-10 20:19:20 +01:00
lassulus
cd720e1a9e l: add cache.krebsco.de & cache.lassul.us 2018-11-10 20:18:41 +01:00
tv
dfb9c23760 krebs: add youtube@eloop.org 2018-11-10 20:06:31 +01:00
lassulus
05b288604e Merge remote-tracking branch 'ni/master' 2018-11-10 19:43:15 +01:00
lassulus
eff97662c0 Merge remote-tracking branch 'nextgum/master' 2018-11-10 19:42:46 +01:00
makefu
125f9d7fd9
airdcpp module: after local-fs.target 2018-11-10 19:27:17 +01:00
lassulus
6416e26376 realwallpaper: e056328 -> 847faeb 2018-11-10 18:47:34 +01:00
lassulus
70bffd8b90 hotdog.r: remove import of gitlab-runner-shackspace 2018-11-10 18:47:06 +01:00
jeschli
78b2892019 j xmonad-stockholm: commented develop src 2018-11-06 19:35:59 +01:00
jeschli
3e9bb37d6f Merge remote-tracking branch 'origin/master' 2018-11-06 19:33:00 +01:00
makefu
254e9e62b9
Merge remote-tracking branch 'lassul.us/master' 2018-11-05 18:20:42 +01:00
makefu
72cd32c0bc
ma nextgum.r becomes gum.r 2018-11-05 16:22:39 +01:00
lassulus
82a97181d6 nixpkgs: 06fb025 -> bf7930d 2018-11-05 11:30:48 +01:00
lassulus
100ca928ad nixpkgs: 06fb025 -> bf7930d 2018-11-05 10:33:28 +01:00
lassulus
fbbb800cbe nixpkgs: 81f5c26 -> 06fb025 2018-11-04 21:46:32 +01:00
lassulus
e39e8318b6 l: prism.r -> archprism.r, new prism.r 2018-11-04 18:32:14 +01:00
jeschli
8bfa2bbfc5 j reagenzglas: remove 2018-11-02 10:10:29 +01:00
tv
550f8fce25 krebs.tinc: add tincUpExtra 2018-10-30 22:47:57 +01:00
lassulus
f130c335de Merge remote-tracking branch 'ni/master' 2018-10-30 19:54:22 +01:00
lassulus
228d4acd7b l: adopt kruck.r (palo) 2018-10-30 19:26:02 +01:00
tv
212bc39249 Merge remote-tracking branch 'prism/master' 2018-10-27 15:02:39 +02:00
tv
2751c1c3ad git-preview: add GIT_PREVIEW_MERGE_STRATEGY 2018-10-23 19:26:37 +02:00
lassulus
1ed73d2d90 nixpkgs: 21293d2 -> 81f5c26 2018-10-18 17:45:25 +02:00
lassulus
031a832b5c l: add eve.r 2018-10-11 22:38:32 +02:00
lassulus
67dc106469 Revert "remove nin"
This reverts commit 62314e64c2.
2018-10-09 21:12:36 +02:00
lassulus
84e8732832 force test in krops.nix 2018-10-09 13:48:52 +02:00
lassulus
685dd36289 Reaktor: 0.6.1 -> 0.6.2 2018-10-09 13:41:06 +02:00
lassulus
a9997572cf update-channel.sh: follow 18.09 2018-10-08 23:47:23 +02:00
lassulus
23f82cdd0f nixpkgs: 862fb52 -> 21293d2 2018-10-08 23:46:15 +02:00
lassulus
62314e64c2 remove nin 2018-10-08 23:26:05 +02:00
lassulus
90b2cb7bd9 krops: import from submodules 2018-10-08 23:26:05 +02:00
lassulus
6b08d5aa46 remove nin 2018-10-07 21:23:23 +02:00
lassulus
4c73914d12 krops: import from submodules 2018-10-07 17:08:01 +02:00
lassulus
d6ee59430d add charybdis module until it's fixed in 18.09 2018-10-07 15:09:15 +02:00
lassulus
999f9112ed repo-sync: remove deprecated isPy 2018-10-07 12:09:32 +02:00
lassulus
ee07881154 Merge remote-tracking branch 'ni/master' into 18.09 2018-10-07 11:41:44 +02:00
lassulus
4c2a785d22 buildbot: use dateutil 2018-10-07 11:41:25 +02:00
tv
5641a6ad03 tv: add 18.09 compatibility 2018-10-07 11:38:08 +02:00
tv
2fdb606947 hyphenation: RIP; nixpkgs is good enough 2018-10-06 22:06:38 +02:00
tv
a0cc393b03 email-header: 0.3.0 -> 0.4.1-tv1 2018-10-06 22:00:10 +02:00
tv
65dc542a2a blessings: 1.1.0 -> 1.2.0 2018-10-06 21:46:42 +02:00
lassulus
f9595d16f9 nixpkgs: d16a7ab -> 6a3f5bc (18.09) 2018-10-06 18:45:20 +02:00
lassulus
deac0b64c0 buildbot-stockholm: test krops 2018-09-29 23:19:02 +02:00
lassulus
b9380d6aba Merge remote-tracking branch 'enklave/master' 2018-09-29 19:07:07 +02:00
lassulus
d04fa53511 Merge remote-tracking branch 'gum/master' 2018-09-29 19:06:15 +02:00
lassulus
b024b2e1ee Merge remote-tracking branch 'ni/master' 2018-09-29 19:02:59 +02:00
tv
b29452cfc3 krebs.git.cgit: support per-repo readmes 2018-09-28 16:18:47 +02:00
lassulus
56f80ba7a8 Reaktor: 0.6.0 -> 0.6.1 2018-09-26 17:27:30 +02:00