Commit Graph

2911 Commits

Author SHA1 Message Date
makefu
9e6167a553
pkgs.alertmanager-bot-telegram: fix vendorSha256 2020-11-17 22:03:27 +01:00
makefu
b7944cf30a
puyak.r: disable newsbot for now
waiting for brockman
2020-11-17 21:56:13 +01:00
lassulus
b55c1126c2 Merge remote-tracking branch 'gum/20.09' into 20.09 2020-11-17 21:42:50 +01:00
makefu
064d51001d
shack/glados: disable dwd_pollen 2020-11-17 21:32:36 +01:00
lassulus
2edccf8b1b Merge branch 'master' into 20.09 2020-11-17 21:23:47 +01:00
tv
6a793ad5da much: 1.2.0 -> 1.3.0 2020-11-17 21:09:53 +01:00
makefu
0b3a9c9222
Merge remote-tracking branch 'lass/20.09' into 20.09 2020-11-17 20:16:27 +01:00
lassulus
d20202b604 Revert "tv: disable ci for all systems"
This reverts commit 2fce838d36.
2020-11-17 20:10:21 +01:00
makefu
0381b33f3b
Merge remote-tracking branch 'lass/20.09' into 20.09 2020-11-17 20:04:56 +01:00
makefu
3f202e6ed5
shack/mqtt_sub: use python3 instead of 3.5 2020-11-17 20:03:10 +01:00
lassulus
2041c1fb9e Merge remote-tracking branch 'gum/20.09' into 20.09 2020-11-17 20:01:18 +01:00
lassulus
2fce838d36 tv: disable ci for all systems 2020-11-17 19:09:55 +01:00
makefu
2990395492
tor/initrd: fix typo in secrets-path 2020-11-17 09:41:39 +01:00
makefu
5a7e35d2c3
Merge remote-tracking branch 'lass/20.09' into 20.09 2020-11-16 23:17:48 +01:00
makefu
53d23391b8
gitlab-runner-shackspace: replaced by shack/gitlab-runner 2020-11-16 23:09:30 +01:00
makefu
1183d84728
shack/gitlab-runner: use upstream gitlab module 2020-11-16 22:41:11 +01:00
makefu
a84ec5151b
tor/initrd: use hostKeys instead of hostECDSAKey 2020-11-16 22:25:22 +01:00
makefu
fcd6ae942d
ma secrets/initrd: add new openssh_host_ecdsa_key 2020-11-16 22:21:50 +01:00
lassulus
c1b9374cf8 nixpkgs: 896270d -> f41c0fc 2020-11-16 22:01:25 +01:00
lassulus
319ccc3ae9 Merge branch 'master' into 20.09 2020-11-16 22:00:36 +01:00
makefu
edf61887ab
Merge branch 'master' into 20.09 2020-11-16 21:39:22 +01:00
makefu
5e6f568895
puyak,wolf: add documentation for imports
update share
2020-11-16 21:22:02 +01:00
tv
90528c1408 Revert "htgen-imgur: 1.0.0 -> 1.1.0"
This reverts commit c8f8fdd05b.
2020-11-16 17:19:03 +01:00
lassulus
2408e07fd3 nixpkgs: 13d0c31 -> 896270d 2020-11-12 22:54:33 +01:00
lassulus
ba45bef7ae Merge branch 'master' into 20.09 2020-11-12 22:53:52 +01:00
tv
a85b25865a external zaatar: update retiolum key 2020-11-10 21:07:09 +01:00
rtjure
60cc3b8eee external: add nxrm.r 2020-11-09 10:11:17 +01:00
lassulus
72da38efa6 nixpkgs-unstable: 007126e -> 34ad166 2020-11-08 11:02:16 +01:00
Kierán Meinhardt
6b4cae9bb0 external: change zaatar.r (kmein) ip and key 2020-11-05 22:57:41 +01:00
makefu
430dad522c
krebs dummy-secrets: add initrd 2020-11-05 22:25:24 +01:00
makefu
9919cb2591
puyak.r: initrd bootstrapping via tor 2020-11-05 22:14:09 +01:00
Kierán Meinhardt
effa0c765c external: add manakish.r (kmein) 2020-11-05 20:41:20 +01:00
Kierán Meinhardt
559be7d026 external: fix zaatar 2020-11-05 20:41:20 +01:00
lassulus
34ac9e7143 filebitch.r: fix luks devices syntax 2020-11-05 17:06:51 +01:00
lassulus
f36fd9b46f jeschli: disable most hosts in ci 2020-11-05 16:38:42 +01:00
lassulus
27cf7317f2 alertmanager-bot-telegram: modSha -> vendorSha 2020-11-05 12:14:53 +01:00
lassulus
4bd6d7a13c nscd-fix: RIP 2020-11-05 12:05:41 +01:00
makefu
696f6a534a
puyak.r: cleanup imports 2020-11-04 23:01:50 +01:00
makefu
fd0a2c3c30
wolf.r: re-add shack ssh keys 2020-11-04 08:51:34 +01:00
makefu
4e08eb5dff
puyak.r,wolf.r: move all services from wolf to puyak 2020-11-03 22:59:13 +01:00
lassulus
975138fc17 reaktor2: disable stockholm issue cause lentil is broken 2020-11-03 20:56:36 +01:00
lassulus
88b343292b github-hosts-sync: fix deprecated user definition 2020-11-03 20:40:28 +01:00
lassulus
bd1c82c769 krebs: activate nscd again 2020-11-03 20:19:15 +01:00
lassulus
239ff32905 reaktor2: 0.3.0 -> 0.4.0 2020-11-03 19:33:01 +01:00
lassulus
dd6f97c008 Merge branch 'master' into 20.09 2020-11-03 18:54:32 +01:00
Kierán Meinhardt
b4f455b6ea external: add makanek.r (kmein) 2020-11-03 18:51:31 +01:00
Kierán Meinhardt
091c4ee542 external: change kmein email, scardanelli -> zaatar 2020-11-03 18:51:31 +01:00
rtjure
7d29d2258b external: add nxbg.r 2020-11-02 20:55:33 +01:00
lassulus
aede016cf2 reaktor2: move .nix to dir 2020-11-02 20:55:33 +01:00
lassulus
80d1d762d9 nixpkgs: 95d26c9 -> 13d0c31 2020-10-27 19:50:50 +01:00
lassulus
1e4658d0ae switch to 20.09 2020-10-27 19:32:27 +01:00
makefu
e8b6cc0587
Merge remote-tracking branch 'lass/master' 2020-10-23 21:02:02 +02:00
lassulus
242530680d nixpkgs-unstable: 24c9b05 -> 007126e 2020-10-23 18:39:47 +02:00
lassulus
134309ae8a nixpkgs: ff6fda6 -> 7c2a362 2020-10-23 18:37:35 +02:00
lassulus
fc298e07f8 reaktor2: port must be string 2020-10-23 12:21:03 +02:00
lassulus
e66f557b1f reaktor: use tls on freenode 2020-10-22 21:11:35 +02:00
de632c4319 add doctor 2020-10-19 21:21:12 +00:00
rtjure
c8869e9955 external: init rtjure.r 2020-10-19 21:56:09 +02:00
lassulus
5b29d7a435 Merge remote-tracking branch 'ni/master' 2020-10-18 19:25:11 +02:00
lassulus
ef76fd70fe nixpkgs-unstable: 84d74ae -> 24c9b05 2020-10-18 18:59:17 +02:00
lassulus
b9c28c035f nixpkgs: ff6fda6 -> ff6fda6 2020-10-18 18:53:54 +02:00
lassulus
0be43e6234 update-nixpkgs: use nixpkgs remote 2020-10-18 18:53:18 +02:00
lassulus
1b52104484 nixpkgs: b4db68f -> ff6fda6 2020-10-18 14:10:49 +02:00
Kierán Meinhardt
71dacb8fb2 external: namespace kmein hosts under kmein, catullus -> toum 2020-10-18 14:10:27 +02:00
lassulus
f34ec67278 l: rotate yubikey pubkey 2020-10-16 12:38:21 +02:00
tv
2d3130e870 tv * ssh.privkey.path: use krebs.secret.file 2020-10-14 13:02:09 +02:00
tv
7dfc0f431f krebs.secret: add directory and file options 2020-10-14 12:18:59 +02:00
lassulus
5a8aa6b843 nixpkgs-unstable: c59ea8b -> 84d74ae 2020-10-06 15:48:36 +02:00
lassulus
504cba92f8 nixpkgs: 4267405 -> b4db68f 2020-10-05 23:43:49 +02:00
makefu
9ad7c3114b
shack/glados: deactivate automation for watering 2020-09-28 10:18:12 +02:00
lassulus
7e7499d863 Merge remote-tracking branch 'gum/master' 2020-09-27 16:09:12 +02:00
lassulus
e2a8652790 realwallpaper: check firemap every 7 days 2020-09-27 15:14:51 +02:00
lassulus
9d7481303a flameshot-once: raise default timeout to fail less often 2020-09-27 15:14:32 +02:00
lassulus
4f5cc27626 newsbot-js: use go.r as default shortener 2020-09-27 15:14:10 +02:00
lassulus
0cd3e8771b l: use ipv4 addresses for wiregrill 2020-09-27 15:13:20 +02:00
makefu
49df24b5bb
wolf.r: manage light.shack web-interface in shackspace 2020-09-22 00:54:25 +02:00
makefu
9ddea79d05
shack/prometheus: set loglevel to info 2020-09-22 00:53:54 +02:00
makefu
a0c494db8b
shack/muell_mail: bump revision 2020-09-18 10:59:05 +02:00
makefu
a24fec6855
pkgs.alertmanager-bot-telegram: init 2020-09-16 22:37:08 +02:00
makefu
8ed22f337c
shack/glados: implement rollo triggers 2020-09-16 22:21:53 +02:00
makefu
c64fb07027
Merge remote-tracking branch 'lass/master' 2020-09-16 21:55:09 +02:00
lassulus
88a9183d1d Merge remote-tracking branch 'mic92/master' 2020-09-16 08:14:04 +02:00
e97cf417fc mic92: add rock publickey 2020-09-15 21:03:25 +00:00
ec33eacc22 add prometheus.r 2020-09-15 21:03:25 +00:00
e87f9e002b mic92: add v4/v6 aliases to etc hosts
this is convinient when you only want to speak a certain protocol
2020-09-15 21:03:25 +00:00
lassulus
0bf738e437 Merge remote-tracking branch 'ni/master' 2020-09-15 22:59:58 +02:00
tv
2299f49864 htgen: 1.2.7 -> 1.2.8 2020-09-15 22:57:16 +02:00
lassulus
e6a8d37846 reaktor2: nicks can have special characters 2020-09-15 22:52:34 +02:00
lassulus
dba1fefe7a Merge remote-tracking branch 'ni/master' 2020-09-15 22:02:49 +02:00
tv
cbbae87712 htgen: 1.2.6 -> 1.2.7 2020-09-15 21:55:55 +02:00
lassulus
378ff43a98 Merge remote-tracking branch 'ni/master' 2020-09-15 21:51:09 +02:00
tv
c7adff5ce3 htgen: 1.2.5 -> 1.2.6 2020-09-15 21:46:22 +02:00
lassulus
cbac4b1db8 Merge remote-tracking branch 'ni/master' 2020-09-15 21:33:42 +02:00
tv
da6703e7b9 htgen: 1.2.4 -> 1.2.5 2020-09-15 21:28:25 +02:00
lassulus
1a9d886148 Merge remote-tracking branch 'ni/master' 2020-09-15 21:15:43 +02:00
tv
c8f8fdd05b htgen-imgur: 1.0.0 -> 1.1.0
Use HTGEN_VERBOSE for printing debug information.
2020-09-15 21:02:01 +02:00
tv
cb17a36b44 htgen: 1.2.3 -> 1.2.4 2020-09-15 21:00:07 +02:00
lassulus
d8dbc950ab shack: add telegram_bot secret 2020-09-15 20:48:08 +02:00
lassulus
624deaddd0 Merge remote-tracking branch 'gum/master' into HEAD 2020-09-15 20:16:44 +02:00
lassulus
91b7a2a584 go: return go.r for shortened urls 2020-09-15 20:16:10 +02:00
makefu
1394ae1bd4
shack/prometheus: add custom shack template 2020-09-14 16:56:30 +02:00
makefu
88aee4087e
shack/prometheus: add urls to alerts 2020-09-14 15:45:37 +02:00
makefu
df4f3982b1
shack/prometheus: use correct alias for rules 2020-09-14 11:42:32 +02:00
makefu
57e6296ac4
puyak.r: enable alertmanager-bot 2020-09-14 11:13:03 +02:00
makefu
fc836fc0cb
shack/prometheus: strip down number of alerts to 3 2020-09-14 11:11:58 +02:00
makefu
156339f63a
shack/prometheus: alertmanager-bot on a different port now 2020-09-14 00:26:21 +02:00
makefu
eaf4ed0b24
shack/prometheus: activate alerting to telegram 2020-09-14 00:14:40 +02:00
makefu
306653db95
wolf.r: more relevant nginx data 2020-09-13 13:56:58 +02:00
makefu
440d1cc664
shack/glados: re-enable influxdb output 2020-09-09 00:32:10 +02:00
tv
f3aac671f8 Merge remote-tracking branch 'prism/master' 2020-09-08 22:19:15 +02:00
lassulus
32a5fd32c8 Merge remote-tracking branch 'ni/master' into HEAD 2020-09-08 22:04:21 +02:00
tv
6fbbf7e617 krebs.permown: add keepGoing option 2020-09-08 22:02:37 +02:00
lassulus
549598bfd9 nixpkgs-unstable: 8e2b14a -> c59ea8b 2020-09-07 19:59:49 +02:00
lassulus
ba66d5c4b0 nixpkgs: e23e054 -> 4267405 2020-09-07 19:54:04 +02:00
tv
a5d4acd92b tv au: init 2020-09-05 01:30:00 +02:00
tv
6b248db017 krebs.tinc: add support for ED25519 keys 2020-09-05 01:17:51 +02:00
makefu
726238d871
glados/wasser: giesszeit 10 -> 20 2020-09-01 23:25:17 +02:00
lassulus
d405f47fed Mic92 -> mic92 2020-08-21 13:50:46 +02:00
lassulus
3f1d128a16 Merge remote-tracking branch 'mic92/master' 2020-08-20 22:20:00 +02:00
e3fdcdbadf
mic92: lower-case user 2020-08-20 21:18:19 +01:00
lassulus
0b4329eb0a Merge remote-tracking branch 'ni/master' 2020-08-19 21:16:46 +02:00
lassulus
6538131f91 Merge remote-tracking branch 'gum/master' 2020-08-19 21:16:14 +02:00
56d529277f
eva: add public ip addresses 2020-08-19 19:46:17 +01:00
040ec5de03
mic92: update eva public key 2020-08-19 18:55:54 +01:00
tv
c61d99ccc6 tv: privatize gg23 2020-08-19 02:27:02 +02:00
tv
b0880d5736 krebs.dns: allow disabling search-domain 2020-08-16 11:34:29 +02:00
da272bc7c3
mic92: use subnet that does not include my server 2020-08-13 08:05:03 +01:00
e296d69e1a
mic92: allocate retiolum subnet for tinc 2020-08-13 08:01:03 +01:00
makefu
a7f67a851b
gitlab-ci: run only on tags
we have some rogue non-nix runners going around on gitlab-ci
therefore we now tag the runners
shacklan - inside the shack lan
nix - has nix installed
2020-08-12 23:10:48 +02:00
lassulus
03939b14e1 wiki: allow push to git 2020-08-12 22:52:37 +02:00
lassulus
514ba4d303 wiki: rename repo to wiki 2020-08-12 20:49:54 +02:00
makefu
0a6f63961d
Merge branch 'master' of ssh.git.shackspace.de:rz/stockholm 2020-08-12 20:45:06 +02:00
lassulus
19cc72be38 wiki: announce changes in #xxx, serve with cgit 2020-08-12 19:40:42 +02:00
tv
b63d24d58e krebs.secret: shell.escape file.service 2020-08-11 20:56:01 +02:00
makefu
4cb0ff12ba
Merge remote-tracking branch 'lass/master' 2020-08-11 12:12:13 +02:00
Neos
57e21968fc Changed Gießzeit to 10 seconds 2020-08-10 20:16:12 +02:00
lassulus
f556a302f6 buildot-stockholm: listen on build.r 2020-08-10 18:49:10 +02:00
lassulus
87d1e0eb86 hotdog: enable gollum as wiki.r service 2020-08-10 18:48:45 +02:00
3fd0a5d586
mic92: add eva 2020-08-09 21:15:50 +01:00
7ca8a45c9d
mic92: add harsha machine 2020-08-09 21:15:50 +01:00
lassulus
b71904c5b9 nixpkgs-unstable: 22a81aa -> 8e2b14a 2020-08-06 23:27:07 +02:00
lassulus
10f2d2b082 nixpkgs: 9ea61f7 -> e23e054 2020-08-06 23:26:43 +02:00
lassulus
e0e91cfd74 Merge remote-tracking branch 'ni/master' 2020-08-06 23:24:29 +02:00
lassulus
04d9ff2dcd Merge remote-tracking branch 'gum/master' 2020-08-06 23:22:35 +02:00
tv
ec91d1b83c krebs.secret: restart units on secret change 2020-08-05 11:16:45 +02:00
tv
b5b90b5984 types.secret-file: add service option 2020-08-05 11:01:30 +02:00
makefu
93606315b9
shack/share: downgrade samba security 2020-08-04 21:25:09 +02:00
makefu
3d8f07d4be
shack/glados: fix giesskanne 2020-07-28 23:59:32 +02:00
makefu
26668a97f5
shack/glados: add party-time 2020-07-28 23:59:13 +02:00
makefu
b353c6ac1c
shack/glados: schlechte_luft uses new sensors 2020-07-28 22:19:17 +02:00
lassulus
087fff54f1 nixpkgs: 6460602 -> 9ea61f7 2020-07-22 23:12:40 +02:00
lassulus
9a877083b0 Merge remote-tracking branch 'gum/master' 2020-07-22 22:51:26 +02:00
makefu
2d058d7be6
puyak: enable blackbox prometheus exporter, use it to ping internal and external hosts 2020-07-22 16:25:00 +02:00
makefu
4e42bac129
shack/glados: fix announcement temperature 2020-07-14 23:57:45 +02:00
tv
7534036668 Merge remote-tracking branches 'gum/master' and 'prism/master' 2020-07-14 19:31:19 +02:00
makefu
cf87c49f2c
Merge remote-tracking branch 'tv/master' 2020-07-13 11:43:34 +02:00
tv
edc62dfabc krebs.git.cgit.settings += source-filter 2020-07-13 10:51:06 +02:00
tv
6d769b73b4 krebs git: use " instead of '' 2020-07-13 09:46:19 +02:00
tv
e26705c2de git: support smart HTTP transport 2020-07-07 22:08:48 +02:00
d5c59a8303 mic92: add ipv6 addresses for my machines 2020-07-03 22:57:24 +02:00
makefu
48eacd11b5
rtorrent module: not use extraConfig 2020-07-02 08:28:45 +02:00
makefu
937db4ad82
wolf.r: save diskspace 2020-07-02 08:28:10 +02:00
lassulus
9f56260984 Merge remote-tracking branch 'gum/master' 2020-06-27 10:32:48 +02:00
makefu
237a56464d
Merge remote-tracking branch 'tv/master' 2020-06-26 13:12:45 +02:00
lassulus
e80ff853ad nixpkgs-unstable: 0f5ce2f -> 22a81aa 2020-06-25 21:20:32 +02:00
lassulus
fd3bc82078 nixpkgs: e2bb73c -> 6460602 2020-06-25 21:19:48 +02:00
lassulus
a2a33b2450 reaktor2: make : optional in pattern 2020-06-23 09:53:21 +02:00
makefu
d338a94756
Merge remote-tracking branch 'lass/master' 2020-06-17 09:10:43 +02:00
makefu
28e030be56
shack/glados: tweak hass config 2020-06-17 09:09:53 +02:00
makefu
dca15cd518
shack/glados: announce message for keyholder 2020-06-17 09:09:09 +02:00
makefu
99e2d0e115
krebs: fix obsoletion option 2020-06-17 09:08:34 +02:00
tv
4a31be59b8 fzfmenu: selectively override FZF_DEFAULT_OPTS 2020-06-16 21:42:35 +02:00
tv
f027eaacf2 fzfmenu: make --reverse configurable 2020-06-16 21:40:24 +02:00
tv
aa019f372e fzfmenu: make --print-query configurable 2020-06-16 21:40:20 +02:00
tv
3197b9a930 fzfmenu: support $FZFMENU_FZF_DEFAULT_OPTS 2020-06-16 21:20:36 +02:00
tv
773095812f fzfmenu: make default prompt configurable 2020-06-16 21:16:25 +02:00
tv
59aa9811f3 fzfmenu: DRY and don't create temporary file 2020-06-16 21:13:00 +02:00
tv
ac9d611884 fzfmenu: make -name and -title configurable 2020-06-16 20:27:59 +02:00
tv
15d1fb2627 Merge remote-tracking branch 'prism/master' 2020-06-16 20:03:01 +02:00
lassulus
bde301139d fzfmenu: move to krebs 2020-06-16 19:58:40 +02:00
makefu
d53f1e3933
puyak.r: fix deprecation 2020-06-15 11:08:31 +02:00
makefu
131b88925e
external/hase: fix hasegateway tinc pubkey 2020-06-14 19:48:57 +02:00
makefu
e2c349c988
shack/ssh-keys: add raute 2020-06-13 12:48:36 +02:00
makefu
16a6e03b39
external: add hase 2020-06-13 12:47:35 +02:00
tv
eb60b27e2b red: init at 0bfb499 2020-06-10 10:55:10 +02:00
tv
6b8843a2c1 dic: 1.1.0 -> 1.1.1 2020-06-08 23:10:56 +02:00
lassulus
47ea2f1d63 nixpkgs: 48723f4 -> e2bb73c 2020-06-08 20:27:25 +02:00
lassulus
15f39ef2e9 Merge remote-tracking branch 'ni/master' 2020-06-07 13:10:52 +02:00
lassulus
fe119203ea Merge remote-tracking branch 'gum/master' 2020-06-07 13:09:45 +02:00
lassulus
0f01f2899f l: readd morpheus.r 2020-06-07 13:09:08 +02:00
makefu
360e823a9a
pkgs.kpaste: replace internal host with https external host 2020-06-05 10:39:43 +02:00
makefu
bed170dd8a
pkgs.kpaste: paste either stdin or file from parameter 2020-06-05 10:31:17 +02:00
tv
09c9f8f7fb Merge remote-tracking branch 'prism/master' 2020-06-02 23:35:17 +02:00
tv
8b2a87d7e1 urlwatch: modernize user config 2020-06-02 22:48:44 +02:00
tv
0ae752cefe python-dnsstamps: init at 1.3.0 2020-05-29 12:40:51 +02:00
lassulus
211e2ca6b9 nixpkgs-unstable: b61999e -> 0f5ce2f 2020-05-25 16:10:27 +02:00
lassulus
372c3514a9 nixpkgs: f45ccd9 -> 48723f4 2020-05-25 16:08:51 +02:00
lassulus
bf77db8365 Merge remote-tracking branch 'ni/master' 2020-05-25 16:08:23 +02:00
lassulus
6c8210f93a Merge remote-tracking branch 'gum/master' 2020-05-25 16:07:42 +02:00
lassulus
d8386001a0 l: add MX entry for lassul.us 2020-05-25 16:04:28 +02:00