Commit Graph

1814 Commits

Author SHA1 Message Date
makefu
cf68213c44
Merge remote-tracking branch 'nin/master' 2017-02-09 23:18:54 +01:00
nin
b381a8b547 k 3 nin: add cgit alias for onondaga 2017-02-09 23:06:49 +01:00
makefu
8cefb46636
Merge remote-tracking branch 'tv/master' 2017-02-09 16:45:29 +01:00
lassulus
54e16f7a9e move kapacitor to k 3 2017-02-09 10:06:20 +01:00
lassulus
cb044e37e6 l 1: add iso 2017-02-09 10:06:20 +01:00
makefu
268e43841d
k 3 makefu: introduce -bob, add logging to wry,gum 2017-02-08 18:37:15 +01:00
makefu
bd90a14732
m central-logging: init 2017-02-05 22:34:16 +01:00
makefu
8eb9faea91
Apply stashed changes
sorry
2017-02-04 14:35:29 +01:00
lassulus
3bfcf88629 k 3 {l,m}: move paste.r to prism 2017-01-31 16:49:53 +01:00
lassulus
302fcaa2f8 k 3 l: remove obsolte domsen_nas pubkey 2017-01-30 22:51:48 +01:00
lassulus
5edbdb287d k 3 fetchWallpaper: add maxTime option 2017-01-26 23:59:26 +01:00
lassulus
13e5a3d41a l 3 fetchWallpaper: set wallpaper everytime 2017-01-21 23:50:02 +01:00
lassulus
cc928ccbc6 move indent to lib 2017-01-21 23:26:48 +01:00
lassulus
0ff2496de4 k 3 Reaktor: allow multiple Reaktor configurations 2017-01-21 21:55:59 +01:00
lassulus
985fcbbd50 Merge remote-tracking branch 'prism/newest' 2017-01-19 23:39:02 +01:00
nin
20cb28918b k 3 n: add onondaga 2017-01-19 23:15:43 +01:00
lassulus
c4bd028470 Merge remote-tracking branch 'ni/master' 2017-01-16 16:31:07 +01:00
tv
08fd9d3ae3 github: update URL to IP addresses 2017-01-16 05:27:29 +01:00
nin
c7d4d61498 k 3 n: set owner to nin 2017-01-15 20:07:39 +01:00
nin
44a5157845 k 3 n: set owner to nin 2017-01-15 19:40:20 +01:00
nin
89e859a2cf nin: init 2017-01-12 22:25:34 +01:00
nin
270f385c72 nin: init 2017-01-12 22:21:21 +01:00
lassulus
131de9bbd1 Merge remote-tracking branch 'gum/master' 2017-01-10 14:54:34 +01:00
makefu
b1b24e4759
k 3 rtorrent: always restart
on-failure does not seem to be enough to save it from crashing
2017-01-09 15:57:32 +01:00
makefu
c22c74b05d
k 3 m: gum add subdomains 2017-01-09 15:56:44 +01:00
tv
9779351be9 krebs.git: add authorizedKeys only for users found in rules 2017-01-07 13:28:23 +01:00
tv
3607bd0832 cd: hart eingeCACt 2017-01-04 11:50:37 +01:00
tv
deb6764522 shared: don't define test aliases 2016-12-28 09:33:30 +01:00
tv
c263e65001 shared: test ip4 addr 10.243.111.111 -> 10.243.73.57 2016-12-28 09:32:40 +01:00
lassulus
c37b42b702 k 3 realwallpaper: daymap only available via https 2016-12-26 13:16:40 +01:00
lassulus
a030e180bb k 3 l: make icarus secure 2016-12-26 13:15:34 +01:00
makefu
47ade5b208
Merge remote-tracking branch 'lass/master' 2016-12-25 00:33:39 +01:00
makefu
3682e60aee
k 3 bepasty-server: finish krebs.nginx -> servers.nginx 2016-12-25 00:21:54 +01:00
makefu
d3765adcaf
k 3 tinc_graphs: krebs.nginx -> services.nginx 2016-12-24 23:38:39 +01:00
makefu
3f68cef4b6
k 3 bepasty-server: krebs.nginx -> services.nginx 2016-12-24 23:38:19 +01:00
makefu
78c50fe495
Merge remote-tracking branch 'tv/master' 2016-12-24 15:39:37 +01:00
tv
4955ba48c1 cgit service: use services.nginx.virtualHosts 2016-12-23 09:07:23 +01:00
lassulus
7a7c832310 k 3 l: add cgit.mors.r 2016-12-22 23:52:51 +01:00
lassulus
f75d761db6 k 3 l: add icarus 2016-12-22 23:52:37 +01:00
tv
72f465f719 krebs.backup: shellcheck disable=SC2174 2016-12-22 20:53:04 +01:00
makefu
dace21d163
k 3 rtorrent: krebs.nginx -> services.nginx
this will break compatibility with krebs.nginx for rutorrent and rtorrent-web
2016-12-22 15:38:56 +01:00
makefu
afbe4f22c3
m 3 server-config: init 2016-12-22 14:15:17 +01:00
tv
e62dca9408 zu: define gg23 2016-12-03 03:32:44 +01:00
lassulus
61c38e4c2d k 3: remove Mic92 from eloop-ml 2016-12-01 16:57:50 +01:00
lassulus
ca1d6b3588 l 3 iptables: set defaults correctly 2016-11-28 13:06:00 +01:00
lassulus
2070da74ab k 3 iptables: add v4 and v6 options per rule 2016-11-26 19:10:02 +01:00
lassulus
eb7d024064 k 3 iptables: remove obsolete asserts & style 2016-11-26 19:09:34 +01:00
lassulus
8014aa6594 Merge remote-tracking branch 'ni/master' 2016-11-25 00:19:17 +01:00
lassulus
d279999a9c k 3 nginx: add ssl.acmeEnable option 2016-11-24 23:57:29 +01:00
tv
51fcdfac0a cd: bring back mx23 2016-11-24 23:30:33 +01:00
tv
8f946dd2fc tv binary-cache: replace wu by xu and use hosts.binary-cache.pubkey 2016-11-24 23:07:48 +01:00
makefu
09018f17c3
Merge remote-tracking branch 'tv/master' 2016-11-15 11:20:34 +01:00
tv
31dcab94b0 exim-smarthost: add anmeldung@eloop.org 2016-11-12 14:37:07 +01:00
makefu
4d7f0e6c5b
Merge remote-tracking branch 'prism/lassulus' 2016-11-11 13:44:55 +01:00
tv
0e13a4e237 Merge remote-tracking branch 'prism/master' 2016-11-11 08:49:37 +01:00
tv
ae73660522 krebs: no extraHosts w/o aliases #2 2016-11-11 01:50:59 +01:00
makefu
6c092cd20c
buildbot: 0.8.4 -> 0.9.0rc2 2016-11-11 01:34:18 +01:00
tv
f458fd8be9 cd: drop stuff now done by ni 2016-11-10 23:50:34 +01:00
lassulus
40befd5a36 Merge remote-tracking branch 'ni/master' 2016-11-10 23:18:17 +01:00
tv
2adac450ac ni aliases += cgit.ni.i 2016-11-10 23:17:36 +01:00
tv
8ba54ab453 pkgs.*.src.url: s/cd/ni/g 2016-11-10 23:15:33 +01:00
lassulus
06d8bf1476 Merge remote-tracking branch 'cd/master' 2016-11-10 23:04:44 +01:00
tv
941fb77ae5 krebs.tinc.retiolum: update connectTo default 2016-11-10 23:00:04 +01:00
lassulus
58ad30011d Merge remote-tracking branch 'cd/master' 2016-11-10 22:51:36 +01:00
tv
916487575a krebs/3/${username}: drop lib 2016-11-10 22:28:00 +01:00
tv
15121c8ae1 ni: init 2016-11-10 22:22:23 +01:00
lassulus
8512c0400f Merge remote-tracking branch 'cd/master' 2016-10-27 22:39:01 +02:00
tv
3abb88edf4 add krebs.tinc.*.hostsArchive 2016-10-27 22:04:21 +02:00
lassulus
38a6281fbd pkgs.go -> pkgs.go-shortener 2016-10-27 14:47:46 +02:00
lassulus
01f313bf9e k 3 exim-smarthost: indent dkim config 2016-10-27 13:31:12 +02:00
tv
08c7671fc5 krebs.git: add cgit-clear-cache 2016-10-24 00:43:14 +02:00
lassulus
2ecba9acd5 l: import <stockholm/lib> 2016-10-22 17:50:57 +02:00
lassulus
0fdd081b28 k 3 l: add sokratess user 2016-10-22 17:50:57 +02:00
tv
b15eda79df ire: RIP 2016-10-22 00:50:58 +02:00
tv
f47bab7f71 drop config.krebs.lib 2016-10-20 20:54:38 +02:00
tv
4a6fbbbe50 krebs.lib: use <stockholm/lib> 2016-10-20 20:27:03 +02:00
lassulus
10016e4c00 Merge remote-tracking branch 'gum/master' 2016-10-19 15:06:37 +02:00
makefu
564d5bc37d
k 3 rtorrent: revert .bin 2016-10-19 14:55:27 +02:00
lassulus
7aa9fb7eff Merge remote-tracking branch 'gum/master' 2016-10-19 12:37:05 +02:00
makefu
7ebecdc99c
k 3 m: init sdev, use ssh secrets 2016-10-19 12:33:56 +02:00
makefu
591b8793e3
k 3 rtorrent: with 16.09 tmux provides explicit .bin output 2016-10-19 12:33:15 +02:00
lassulus
cbd83bb95f Merge remote-tracking branch 'cd/master' 2016-10-16 12:58:46 +02:00
tv
7c91a19549 lib: don't define defaults that require config 2016-10-13 22:11:31 +02:00
lassulus
08c98a00ed Revert "k 3 buildbot: remove override (upstream fix)"
This reverts commit 252bac92e8.
because buildbot is broken again
2016-10-13 21:20:33 +02:00
lassulus
76a2187972 remove comments from php config, phpfpm error 2016-10-12 12:14:57 +02:00
makefu
71b41a206e
k 3 repo-sync: add more explicit documentation 2016-09-07 15:52:37 +02:00
lassulus
1596df6441 k 3 rtorrent: fix tmux binary path 2016-08-24 23:07:05 +02:00
makefu
11797ea564
m 3 rtorrent -> k 3 rtorrent 2016-08-24 17:51:22 +02:00
lassulus
662222f8c4 Merge remote-tracking branch 'gum/master' 2016-08-24 08:49:16 +02:00
lassulus
de9a953896 k 3 l: update mors ssh key 2016-08-22 19:14:46 +02:00
makefu
f75a11a2da
k 3 m: move tracker.makefu.r to gum 2016-08-22 18:41:07 +02:00
makefu
054475b623
Merge remote-tracking branch 'prism/master' 2016-08-21 12:12:13 +02:00
makefu
ccf521e4a4
m : init drop 2016-08-21 01:24:50 +02:00
tv
c31c4e48b0 krebs internet-aliases: use explicit addresses 2016-08-09 20:00:02 +02:00
lassulus
252bac92e8 k 3 buildbot: remove override (upstream fix) 2016-08-05 17:53:16 +02:00
lassulus
35f0b5a223 k 3 power-action: fix description 2016-08-02 14:59:58 +02:00
lassulus
def975ffb2 k 3 power-action: don't create configured user 2016-08-02 14:59:31 +02:00
makefu
8ef63b024d
k 3 retiolum: fix documentation text 2016-07-28 13:24:36 +02:00
makefu
b156915805
makefu: pornocauster -> x 2016-07-28 13:18:54 +02:00
makefu
8c465870fc
retiolum: support nets.<net>.tinc.port 2016-07-28 13:18:51 +02:00
makefu
041eeaa4c9
Merge remote-tracking branch 'prism/master' 2016-07-27 10:58:39 +02:00
lassulus
b139155bee l 3 power-action -> k 3 power-action 2016-07-26 22:27:52 +02:00
makefu
b308c77e7a
k 3 m: siem.ip4.prefix 2016-07-26 15:18:59 +02:00
makefu
2f45394b52
k 3 retiolum: add customizable tinc-up 2016-07-26 14:02:04 +02:00
makefu
cd5ecd173b
k 3 makefu: add tinc pubkeys to siem network 2016-07-26 14:01:03 +02:00
makefu
ceb5200f03
k 3 makefu: add nixos.unstable CNAME to github 2016-07-25 18:53:42 +02:00
lassulus
f978c5312e Merge remote-tracking branch 'cd/master' 2016-07-23 19:21:23 +02:00
lassulus
3d8318d625 k 3 exim-smarthost: add ssl options 2016-07-23 19:16:41 +02:00
lassulus
917bdf236f k 3 exim-smarthost: add authenticators option 2016-07-23 19:16:22 +02:00
tv
ccb34ca338 mv: reinit 2016-07-23 13:35:06 +02:00
tv
45c62ec4d3 Merge remote-tracking branch 'prism/master' 2016-07-22 13:22:13 +02:00
tv
8b58e6e6e2 nginx: use host name and aliases as default server-names 2016-07-22 13:06:41 +02:00
makefu
864e711114
k 3 nginx: add ssl.force_encryption 2016-07-21 21:03:36 +02:00
makefu
0c40af375f
/ : s/krebs\.retiolum/krebs.tinc.retiolum/g 2016-07-20 17:20:47 +02:00
makefu
13a5662feb
k 3 retiolum: krebs.retiolum is now officially obsolete 2016-07-20 16:55:22 +02:00
makefu
c5d7e14e90
k 3 exim-retiolum: assert to krebs.tinc.retiolum.enable again 2016-07-20 16:51:25 +02:00
makefu
d04b0b4ebe
k 3 retiolum: prepare fallback to krebs.retiolum 2016-07-20 16:50:32 +02:00
makefu
4e0eb7d9c0
k 3 retiolum: formatting 2016-07-20 14:38:59 +02:00
makefu
2d4b0dc227
k 3 retiolum: remove lib. for imp part 2016-07-20 14:24:58 +02:00
makefu
d35fc9f6d2
k 3 retiolum: explicitly build users, secrets and services 2016-07-20 14:15:47 +02:00
makefu
24db6439c4
retiolum: config which is working but not functioning (see TODO in retiolum.nix) 2016-07-20 10:06:04 +02:00
makefu
a6a0cddeaa
k 3 m: filepimp,omo expose lan net 2016-07-18 15:35:36 +02:00
makefu
01ee8749ac
k 3 retiolum-bootstrap: use secrets path as default, not /root/secrets 2016-07-18 15:13:22 +02:00
makefu
33c96a89c5
Merge 'cd/master' 2016-07-18 12:15:10 +02:00
tv
e2157dade8 alnus: init 2016-07-17 22:19:00 +02:00
tv
0bc55750cf krebs.build.profile :: str => absolute-path 2016-07-17 00:53:21 +02:00
tv
d861643919 krebs.build: simplify structure 2016-07-17 00:53:21 +02:00
tv
514daf3d46 replace krebs.build.populate by populate 2016-07-17 00:53:21 +02:00
makefu
393f5cb5c7
k 3 m: init honeydrive 2016-07-11 20:44:16 +02:00
lassulus
18ff162945 Merge remote-tracking branch 'gum/master' 2016-07-07 23:33:49 +02:00
tv
f7d966043d Merge remote-tracking branch 'prism/master' 2016-07-07 23:05:06 +02:00
tv
f18ababed5 Merge remote-tracking branch 'prism/lassulus' 2016-07-07 23:02:41 +02:00
tv
0c72da81cc zu: init 2016-07-07 22:31:50 +02:00
lassulus
4cd09fa26b k 3 buildbot: use last working nixpkgs 2016-07-07 21:32:21 +02:00
lassulus
2db6515213 use buildbot from 15.09 2016-07-04 00:14:50 +02:00
tv
8822005f00 net.addrs: readOnly = false 2016-07-03 20:34:51 +02:00
tv
7aedefa476 {mk,rm}dir: RIP 2016-07-03 20:32:16 +02:00
tv
cc6b1f6ad1 caxi: init 2016-07-03 20:22:45 +02:00
tv
75b2c8e6c9 prism: AKA cgit.prism.r 2016-07-01 01:07:20 +02:00
tv
2408e27fb1 ju: init 2016-06-30 22:41:44 +02:00
tv
d81b068113 Merge remote-tracking branch 'prism/master' 2016-06-30 16:31:05 +02:00
tv
1542f9bbee miefda: stash 2016-06-30 16:26:13 +02:00
tv
385b0345a6 mv: stash 2016-06-30 01:43:33 +02:00
lassulus
1012224e67 little bit of code cleanup 2016-06-28 17:41:15 +02:00
makefu
f2a13d6281
k 3 m: add siem network, add ossim stub 2016-06-27 12:57:08 +02:00
lassulus
13f7ef405b k 3 repo-sync: use the privateKeyFile 2016-06-26 18:20:56 +02:00
lassulus
16b639e50a k 3 repo-sync: add unitConfig option 2016-06-26 17:53:11 +02:00
lassulus
fe07d46310 k 3 l: add user mors-repo-sync 2016-06-26 17:51:52 +02:00
lassulus
ba0a7978ba k 3 repo-sync: set REPONAME
This is needed to allow multiple repo fetching at the same time
2016-06-24 16:04:04 +02:00
lassulus
2de4843bae k 3 l: add prism-repo-sync pubkey 2016-06-24 15:27:23 +02:00
lassulus
edcc01d8e3 k 3 repo-sync: refactor, allow multiple repos 2016-06-24 15:24:42 +02:00
lassulus
93567fa818 Merge remote-tracking branch 'cd/master' 2016-06-23 23:18:06 +02:00
tv
74f778c6e1 tv.pgp.pubkeys.default = readFile ./pgp/CBF89B0B.asc 2016-06-23 23:14:23 +02:00
makefu
271a59b1d6
Merge remote-tracking branch 'prism/master' 2016-06-23 17:04:07 +02:00
makefu
5894ecc942
add siem internal network 2016-06-23 16:45:44 +02:00
makefu
a7310f526d
krebs 3 tinc_graphs: allow network different from retiolum 2016-06-23 16:45:06 +02:00
lassulus
27522d311c k 3 l: add domsen-nas 2016-06-16 22:09:05 +02:00
lassulus
1e957a1255 k 3 l: RIP fastpoke 2016-06-16 22:07:29 +02:00
tv
88a486f26a ju: init 2016-06-14 16:25:49 +02:00
lassulus
d5cfc4bf19 Merge remote-tracking branch 'wolf/master' 2016-06-14 09:54:02 +02:00
makefu
eb710a17e2
Merge remote-tracking branch 'cd/master' 2016-06-14 01:36:15 +02:00
makefu
8656e83d4c
k 3 ma: update shoney ip after failed deploy :3 2016-06-14 01:34:08 +02:00
lassulus
23385c2984 Merge remote-tracking branch 'cd/master' 2016-06-13 13:50:52 +02:00
lassulus
b244441223 Merge remote-tracking branch 'gum/master' 2016-06-13 12:54:15 +02:00
tv
a16f438314 sprinkle with some write{B,D}ash 2016-06-13 02:10:02 +02:00
lassulus
4e001014c9 Merge remote-tracking branch 'cd/master' 2016-06-12 21:37:27 +02:00
makefu
b9c0c46b4d
m shoney: init 2016-06-12 19:48:15 +02:00
makefu
ed1d336fc8
Merge remote-tracking branch 'cd/master' 2016-06-12 17:49:59 +02:00
lassulus
0d20b15ae3 k 3 l: add cache.prism.r as alias 2016-06-11 00:27:44 +02:00
makefu
7fe3cdd804
k 3 m: fix filepimp pubkey 2016-06-09 22:55:28 +02:00
tv
b419d6cd36 krebs.git.user.home: /var/lib/git -> pkgs.empty 2016-06-07 23:38:33 +02:00
tv
a431e036e3 krebs.git: move assert to etcDir's type 2016-06-07 23:34:16 +02:00
tv
567800c98e krebs.git.cgit.settings.virtual-root: init 2016-06-07 23:23:06 +02:00
tv
c8b0a57549 krebs.git.cgit: add server name for cgit.*.r 2016-06-07 23:08:55 +02:00
tv
922389ef20 krebs.git.cgit.fcgiwrap: make user configurable 2016-06-07 23:02:37 +02:00
tv
a3644a38a5 krebs.git: make user configurable 2016-06-07 22:49:26 +02:00
tv
c655e1246d krebs.git: s/ensureList/toList/ 2016-06-07 22:41:40 +02:00
tv
4a34b27c1c krebs.git.cgit: make cache-root configurable
... along with all the other stuff :)
2016-06-07 22:38:38 +02:00
tv
b5bdd9aed4 krebs.git.cgit :: { bool => submodule { enable :: bool } } 2016-06-07 03:11:26 +02:00
tv
dda2887e2c Merge remote-tracking branch 'cloudkrebs/master' 2016-06-06 17:17:07 +02:00
lassulus
baa20586b8 Merge remote-tracking branch 'cd/master' 2016-06-05 00:38:00 +02:00
tv
c1c645b545 krebs.setuid: add option "envp" 2016-06-05 00:31:36 +02:00
makefu
ff38a9bf0b
k 3 ma: fix addrs4 for tpsw 2016-06-02 14:41:38 +02:00
makefu
4f28d9a306
Merge remote-tracking branch 'prism/master' 2016-06-02 11:17:18 +02:00
lassulus
806e592d3e k 3 nginx: unique server-names to silence nginx 2016-06-01 00:07:14 +02:00
lassulus
cc938e61f8 k 3 iptables: allow DNAT rules 2016-05-29 00:32:55 +02:00
lassulus
48502fb07e k 3 l: add fritz pubkey 2016-05-24 23:19:43 +02:00
lassulus
ce0cef9806 Merge remote-tracking branch 'cd/master' 2016-05-24 22:49:52 +02:00
makefu
c1971f5aa0
Merge remote-tracking branch 'cloudkrebs/master' 2016-05-24 22:27:21 +02:00
makefu
9cba0ffefa
merge cd/master 2016-05-24 22:12:38 +02:00
tv
c44e649455 krebs.exim-retiolum: disable TLS 2016-05-24 20:59:05 +02:00
lassulus
facb65bd22 Merge remote-tracking branch 'cd/master' 2016-05-21 13:57:45 +02:00
lassulus
41e93449bb k 3 l: add shodan keys 2016-05-21 13:46:41 +02:00
lassulus
7c8bd6c551 k 3 l: move pubkeys to seperate files 2016-05-21 13:45:48 +02:00
tv
97c2e4bbd9 krebs.exim: validate config file syntax 2016-05-21 11:19:35 +02:00
tv
ace70674aa {mv,tv}.mail: retiolum -> r 2016-05-21 11:19:35 +02:00
tv
1e9199f939 krebs internet-aliases: *@eloop.org -> eloop2016@krebsco.de 2016-05-21 09:28:50 +02:00
tv
ca48a77050 exim-smarthost: allow per-domain defaults in internet-aliases 2016-05-21 09:27:55 +02:00
lassulus
fc867f652f Merge remote-tracking branch 'cd/master' 2016-05-20 00:18:00 +02:00
lassulus
88e53970c1 k 3 per-user: use new symlinkJoin interface 2016-05-19 21:16:45 +02:00
lassulus
127507ccc7 k 3 l: add shodan 2016-05-19 21:11:16 +02:00
tv
ee0c30cbe5 exim-smarthost: update ciko's mail 2016-05-19 15:43:06 +02:00
tv
c40ff531b4 exim-smarthost: cfp@eloop.org -> eloop2016 ML 2016-05-19 15:18:26 +02:00
tv
289231f197 exim-smarthost: add eloop2016 ML 2016-05-19 15:05:16 +02:00
lassulus
abf23d1305 k 3 l: update echelon ip 2016-05-17 11:46:09 +02:00
makefu
cee893f371 k 3 makefu: add tpsw, owned by ciko 2016-05-16 23:08:20 +02:00
lassulus
e7528ccc2f Merge remote-tracking branch 'gum/master' 2016-05-09 11:27:06 +02:00
lassulus
fb87c76112 Merge remote-tracking branch 'cd/master' 2016-05-09 11:26:04 +02:00
lassulus
ba5ea161f2 k 3 l: update echelon ip 2016-05-09 11:14:34 +02:00
makefu
56ca7859fa k 3 m: fix filebitch key 2016-05-07 00:21:56 +02:00
makefu
e4251e63ac k 3 fetchWallpaper: move only if exists 2016-05-02 17:36:16 +02:00
tv
9b0edc2ee8 krebs.build.populate: set SSL_CERT_FILE 2016-04-28 22:24:44 +02:00
lassulus
94fa4005d6 Merge remote-tracking branch 'cd/master' 2016-04-27 12:47:13 +02:00
tv
4abd59f59d krebs.exim-{retiolum,smarthost}: use krebs.exim 2016-04-27 01:54:58 +02:00
tv
96301634b9 services.exim -> krebs.exim 2016-04-27 01:52:52 +02:00
tv
f9d42f3a81 import NixOS' services.exim 2016-04-27 01:45:47 +02:00
lassulus
558eede973 k 3 fetchWallpaper: use writeDash 2016-04-27 01:31:26 +02:00
lassulus
6762a8790c Merge remote-tracking branch 'cd/master' 2016-04-20 16:05:38 +02:00
tv
54947849ff tv: "fix" PGP key 2016-04-20 16:03:02 +02:00
lassulus
2f99d1f4b7 k 3 l: update pgp key 2016-04-19 16:56:44 +02:00
lassulus
c7a6e74b3d Merge remote-tracking branch 'cd/master' 2016-04-18 15:10:43 +02:00
tv
41ff57c6d6 krebs.backup: use globally configured ssh ports 2016-04-17 11:23:35 +02:00
tv
f5f7abce0d krebs: programs.ssh.extraConfig += Host ... Port ... 2016-04-17 10:23:01 +02:00
tv
377b0dff1c krebs.backup: don't create plan.dst.path implicitly 2016-04-17 06:00:48 +02:00
tv
70c27e21b1 krebs.backup: rm stale TODO
Done in 13df24f8f0
2016-04-17 05:26:02 +02:00
tv
6ec3d922a4 krebs.backup network-ssh-port -> pkgs.get-ssh-port 2016-04-17 05:24:33 +02:00
tv
affb69250d krebs.backup network-ssh-port: fail if cannot find port 2016-04-17 04:13:32 +02:00
tv
453384b60b krebs.backup: inject dst_path into dst shell 2016-04-17 03:51:55 +02:00
tv
904d037bd7 krebs.backup: allow injecting variables into dst shell 2016-04-17 03:50:49 +02:00
tv
e4422212d4 krebs.on-failure: send journal since start of failed plan 2016-04-17 02:04:52 +02:00
makefu
f043929668 k 3 retiolum: use more precise description for connectTo 2016-04-17 02:04:33 +02:00
makefu
26e43d47a7 k 3 retiolum: add description to configure Address= 2016-04-17 00:05:42 +02:00
lassulus
edbf4050ef Merge remote-tracking branch 'cd/master' 2016-04-13 16:52:36 +02:00
lassulus
54ec57b511 k 3 l: change ssh port to 45621 2016-04-13 16:32:55 +02:00
tv
2b0c6616b6 doppelbock -> cd 2016-04-12 17:13:33 +02:00
lassulus
7023d41410 k 3 iptables: allow REDIRECT target 2016-04-12 15:09:08 +02:00
tv
a0d08d4793 exim-smarthost: don't tls_advertise_hosts 2016-04-12 14:26:37 +02:00
tv
e74f4ddf81 krebs types.addr6: str -> IPv6 address* 2016-04-08 04:41:30 +02:00
tv
0dc2a751a9 krebs.retiolum: use krebs.secret 2016-04-08 04:11:00 +02:00
tv
7b7e8b11b5 retiolum netname: hostname -> enum 2016-04-08 03:59:26 +02:00
tv
46e818ebbc retiolum: don't hardcode routing prefixes 2016-04-08 03:53:34 +02:00
tv
827f179080 doppelbock: init 2016-04-07 21:43:22 +02:00
tv
7fb1a3e775 krebs.nginx: don't abuse extraConfig 2016-04-07 20:48:07 +02:00
makefu
66b7a76a26 Merge branch 'master' of gum.krebsco.de:stockholm 2016-04-07 19:54:23 +02:00
makefu
43ea1e5ab3 k 3 makefu: add senderechner 2016-04-07 19:54:17 +02:00
makefu
caf6ce1291 Merge remote-tracking branch 'cd/master' 2016-04-03 21:57:09 +02:00
tv
e1cd9fa013 tv: import mu 2016-03-31 03:58:51 +02:00
makefu
a8c7618699 Merge remote-tracking branch 'prism/master' 2016-03-20 00:03:52 +01:00
makefu
90ef4d08a1 k 3 ma: update to real tinc pubkey 2016-03-19 23:55:43 +01:00
lassulus
fda0262111 Merge remote-tracking branch 'cd/master' 2016-03-19 22:12:11 +01:00
lassulus
3883a9fce7 k 3 l: add fastpoke pubkey 2016-03-19 21:59:32 +01:00
tv
3bead2641e {nukular,darth}: fix addrs6 2016-03-17 12:03:15 +01:00
lassulus
4143f1d6ec k 3 l: add lass.pgp.pubkeys.default 2016-03-16 09:20:05 +01:00
lassulus
9e9bc01fc9 Merge remote-tracking branch 'gum/master' 2016-03-16 09:16:41 +01:00
makefu
61e312dff1 k 3 ma: expose pgp pubkeys 2016-03-16 08:35:06 +01:00
makefu
90150375a8 Merge remote-tracking branch 'cd/master' 2016-03-16 08:26:27 +01:00
makefu
57476fb24a Merge branch 'master' of gum:stockholm 2016-03-16 08:25:50 +01:00
makefu
be5a136464 k 3 ma: add default and brain 2016-03-16 08:25:26 +01:00
tv
9d16ea6145 krebs types += pgp-pubkey, user.pgp.pubkey 2016-03-16 02:03:17 +01:00
tv
91844576fd krebs.users.tv.pgp.pubkey: 2CAEE3B5 2016-03-16 00:49:32 +01:00
tv
2452d21173 Merge remote-tracking branch 'gum/master' 2016-03-16 00:13:58 +01:00
makefu
03a72ef958 add new retiolum short form to default hostnames 2016-03-15 23:56:05 +01:00
makefu
4ac537366c Merge branch 'master' of gum.krebsco.de:stockholm 2016-03-15 23:55:30 +01:00
makefu
fa67e6ff08 k 3 nginx: add default404 option
the default behavior is not changed but if the default does not apply
to your use-case you now can change it
2016-03-15 23:54:53 +01:00
tv
13df24f8f0 krebs.backup: use krebs.on-failure 2016-03-15 15:59:05 +01:00
tv
e3f0ca7137 krebs.on-failure: init 2016-03-15 15:58:45 +01:00
lassulus
cbe70e8c39 l 3 newsbot-js -> k 3 newsbot-js 2016-03-15 14:37:46 +01:00
lassulus
72939a2d6f Merge remote-tracking branch 'gum/master' 2016-03-15 14:14:29 +01:00
lassulus
db3dd77f6d Merge remote-tracking branch 'cd/master' 2016-03-15 14:14:18 +01:00
lassulus
6d84a00fa6 k 3 l: add .r alias to echelon 2016-03-15 13:22:56 +01:00
makefu
2e317bfe74 ma 2: use tinc-pre per default 2016-03-15 13:20:14 +01:00
makefu
abf899f521 k 3 makefu: add hosts near to my heart <3 2016-03-11 02:11:39 +01:00
makefu
1db28fe74d k 3 retiolum: pigstarter -> [ prism cd ] 2016-03-11 01:33:23 +01:00
makefu
c61496e77e Merge branch 'master' of gum.krebsco.de:stockholm 2016-03-10 10:16:11 +01:00
makefu
dcf8e3fb32 Merge remote-tracking branch 'cd/master' 2016-03-10 08:03:41 +01:00
makefu
ef97cc848f ma 1 omo: replace crypt2 2016-03-08 18:35:32 +01:00
makefu
533c3c07b7 add darth 2016-03-06 20:56:32 +01:00
makefu
2fd7d1b1ab Merge remote-tracking branch 'cd/master' 2016-03-06 20:56:02 +01:00
lassulus
0115e0ee85 Merge remote-tracking branch 'cd/master' 2016-03-05 23:50:50 +01:00
tv
64f2e2075d krebs.exim-smarthost to-lsearch: append \n to each entry 2016-03-05 20:33:19 +01:00
tv
421f346257 krebs.exim-smarthost.dkim: support multiple domains 2016-03-05 20:33:19 +01:00
tv
08146e4834 krebs.exim-smarthost: add DKIM support to remote_smtp 2016-03-05 19:53:54 +01:00
tv
fdebe33d41 krebs.nginx: don't include (redundant) mime.types 2016-03-05 12:58:10 +01:00
tv
54129c440e krebs os-release: init 2016-03-05 12:40:20 +01:00
tv
89f731a898 krebs.exim-*: add empty keep_environment 2016-03-05 11:46:30 +01:00
tv
ffa1a1e456 s/makeSearchPath "bin"/makeBinPath/g 2016-03-03 19:45:46 +01:00
lassulus
1ba917c333 k 3 nginx: add ssl options 2016-03-03 00:25:11 +01:00
lassulus
ef8ed48b1c Merge remote-tracking branch 'gum/master' 2016-03-02 20:51:37 +01:00
makefu
db72d5911f Merge remote-tracking branch 'cd/master' 2016-02-28 02:26:44 +01:00
makefu
9af9b562b5 k 3 default: add via to gum, fix wry pubkey 2016-02-28 02:24:52 +01:00
makefu
217c4840d8 k 3 bepasty: create build environment for recursive package inclusion 2016-02-28 01:11:21 +01:00
lassulus
024de57e7b Merge remote-tracking branch 'cd/master' 2016-02-27 17:28:46 +01:00
tv
8c859335a8 krebs.nginx: s/optionSet/submodule/ 2016-02-27 17:23:59 +01:00
tv
9db6d9db71 krebs.hosts.{gum,ire}.nets.retiolum.via = internet 2016-02-27 15:48:58 +01:00
tv
94154606cb tv wu-binary-cache: init 2016-02-27 15:23:21 +01:00
tv
2ea539c80f krebs.setuid.*.mode: use mergeOneOption 2016-02-27 13:10:59 +01:00
lassulus
cfe5687ca3 k 3 lass: add .r alias to all host for exim 2016-02-22 01:13:26 +01:00
tv
a73eaae18c krebs.exim*: admit *.r 2016-02-21 22:08:30 +01:00
tv
de5de37a12 krebs.dns.providers: attrsOf unspecified -> attrsOf str 2016-02-21 21:52:05 +01:00
tv
67e5fddc0b krebs.users.krebs: init 2016-02-21 07:39:24 +01:00
tv
e3ddf995e9 krebs types.secret-file: owner-name -> owner :: user 2016-02-21 07:18:13 +01:00
tv
05be525be6 krebs.types.user: add uid :: int 2016-02-21 06:56:57 +01:00
tv
b5fbca3a36 krebs.secret: init 2016-02-21 05:27:37 +01:00
tv
1226a20038 krebs.build.populate fetch_git: checkout with force 2016-02-20 02:02:08 +01:00
tv
a607671662 krebs.build.populate: allow overriding ssh 2016-02-20 02:02:08 +01:00
tv
47ef169276 krebs.hosts.*: set owner 2016-02-20 02:02:07 +01:00
tv
cb258d3990 Merge remote-tracking branch 'gum/master' 2016-02-19 14:30:39 +01:00
tv
bca88ce7c6 krebs.urlwatch: add hooksFile and per-url filter 2016-02-18 16:45:18 +01:00
tv
1de8d5c44d krebs.backup: talk about local and remote rsync 2016-02-18 02:49:00 +01:00
tv
8c264139b2 krebs.build: use $F5 to prefix verbose commands 2016-02-18 01:15:58 +01:00
tv
2d79335e34 tv.mail: wu -> nomic 2016-02-17 17:07:16 +01:00
makefu
ae3a6110c6 k 3 makefu/wolf: fix typo 2016-02-17 10:51:26 +01:00
tv
064d0111a0 krebs.build: refactor a bit 2016-02-16 06:59:00 +01:00
tv
43ed24ed66 Merge remote-tracking branch 'gum/master' 2016-02-15 18:52:05 +01:00
tv
ea910d7d99 buildbot: s/lib\.shell/shell/g 2016-02-15 18:46:19 +01:00
makefu
a94a4c4206 s 1 wolf: use config.krebs.lib 2016-02-15 17:43:30 +01:00
makefu
3ceff0ec29 Merge remote-tracking branch 'cd/master' 2016-02-15 17:07:48 +01:00
tv
b7a92f6388 *: make eval.config.krebs.build.host.name work everywhere 2016-02-15 16:34:50 +01:00
tv
8f520b19b6 don't try to mimic nixpkgs 2016-02-15 16:34:50 +01:00
makefu
0457cd1bb9 k 3 repo-sync: init module, add git dependency 2016-02-15 14:01:24 +01:00
tv
673853e092 RIP specialArgs.lib 2016-02-14 16:43:44 +01:00
tv
9f16d7ea71 krebs.lib: init 2016-02-14 16:20:10 +01:00
tv
e890eb244a krebs.setuid: init 2016-02-14 13:26:37 +01:00
tv
0e35bc5c19 wbob: fix addrs 2016-02-13 19:43:02 +01:00
tv
d38853027e krebs.nginx: default locations = [] 2016-02-13 16:07:01 +01:00
tv
411aec6bf9 deploy,install,populate: admit target SSH port 2016-02-13 16:03:40 +01:00
tv
2b6a54c31c Merge remote-tracking branch 'gum/master' 2016-02-11 23:59:07 +01:00
tv
8c87356aee krebs.retiolum.hosts*: bump description 2016-02-11 23:50:52 +01:00
makefu
5e8b9fd3d7 k 3 tinc_graphs: use new tinc-hosts 2016-02-11 23:23:50 +01:00
makefu
524a009c1e Merge remote-tracking branch 'cd/master' 2016-02-11 23:18:00 +01:00
tv
6cbe21aac7 krebs.retiolum: make hostsPackage configurable 2016-02-11 23:16:08 +01:00
makefu
014cbb7598 Merge remote-tracking branch 'cd/master' 2016-02-11 21:31:15 +01:00
makefu
a649befbfa k 3 fetchWallpaper: scrap predicate, use unitConfig 2016-02-11 11:04:19 +01:00
tv
8b130a6628 krebs.nixpkgs.allowUnfreePredicate: init 2016-02-10 19:06:32 +01:00
tv
e6ea4875d4 krebs.backup: admit plan.startAt 2016-02-08 12:15:00 +01:00
tv
8e93530796 Merge remote-tracking branch 'cloudkrebs/master' 2016-02-08 03:35:29 +01:00
tv
7a9f130c12 krebs: rm types.host.dc 2016-02-08 03:21:01 +01:00
tv
d98578e3e1 rm krebs.build.target 2016-02-08 01:07:03 +01:00
tv
14afbfef12 krebs.backup: use aliases instead of addrs4 2016-02-08 00:31:26 +01:00
tv
8a1ddc5e9b krebs.backup.plans.*.enable.default = true 2016-02-07 23:48:34 +01:00
tv
071194c394 krebs.backup: DRY up push and pull 2016-02-07 22:20:38 +01:00
tv
d01c6f9dbc krebs.backup: don't append .{pull,push} to service name 2016-02-07 16:09:46 +01:00
tv
00525dc0ef krebs.backup.plans.*.startAt: null disables timer 2016-02-07 16:08:07 +01:00
tv
4c40eba816 krebs: add localhost to knownHosts 2016-02-07 15:58:49 +01:00
tv
f1ebd4e4e1 krebs knownHosts: add-port everywhere 2016-02-07 06:43:26 +01:00
tv
b746dd0936 krebs.backup: ensure link dest exists 2016-02-07 06:24:04 +01:00
tv
076f93bc02 mu: 10.243.20.01 -> 10.243.20.1 2016-02-07 06:24:04 +01:00
tv
02ad327081 krebs.backup writeDash* -> pkgs 2016-02-07 06:24:04 +01:00
tv
949f466cf7 tv: s/_/-/g in usernames 2016-02-07 06:24:04 +01:00
tv
f68c977a20 tv: define config.krebs.hosts.*.nets.gg23.ssh.port 2016-02-07 06:24:04 +01:00
tv
01dbc54c32 krebs.backup: determine fastest address 2016-02-07 06:24:04 +01:00
tv
29746aec06 krebs.{backup.plans,hosts,users}.*.name: add default value 2016-02-06 18:54:01 +01:00
lassulus
fe586d704e Merge remote-tracking branch 'cd/master' 2016-02-06 18:45:38 +01:00
tv
c784d271c5 tv: adopt mu 2016-02-06 18:38:51 +01:00
tv
9742953ee9 tv: add cgit.*.r aliases 2016-02-06 16:53:35 +01:00
tv
fbf92edb0e Merge remote-tracking branch 'gum/master' 2016-02-06 16:24:47 +01:00
tv
b16bfb9c99 tv: add .i and .r TLDs 2016-02-06 16:22:13 +01:00
tv
c4655c3baa krebs.dns.providers: add i and r 2016-02-06 16:22:13 +01:00
tv
171df3acbe tv: adopt kaepsele 2016-02-06 16:15:25 +01:00
tv
a1f7f5e510 krebs: DRY up shorts of the networking.extraHosts generator 2016-02-06 15:57:43 +01:00
tv
df89fb7e91 krebs.retiolum: don't generate extraHosts 2016-02-06 15:43:24 +01:00
tv
23c7c10f5a krebs.retiolum.hosts: change type to attrsOf host 2016-02-06 15:11:30 +01:00
makefu
e402c8ce1d k 3 git.nix: flesh out rules description 2016-02-04 13:07:47 +01:00
tv
d739448ab9 krebs.build.populate: cleanup (less) harder 2016-02-04 12:46:09 +01:00
makefu
e89f43de94 Merge 'cd/master' - update krebs.build.source 2016-02-04 11:16:17 +01:00
tv
b857a48632 krebs.build.populate: init and drop support for v1 2016-02-04 05:40:26 +01:00
makefu
f7d979b21f s 1 wolf: provide cgit mirror 2016-02-04 02:48:28 +01:00
tv
e2a922dd7d Merge remote-tracking branch 'gum/master' 2016-02-04 01:31:21 +01:00
tv
cdb590be50 krebs.git.rules: specify type 2016-02-03 13:36:54 +01:00
tv
68655d1ddf krebs.git: remove trailing spaces 2016-02-03 11:32:58 +01:00
lassulus
0cd9c450f0 k 3 l: add ssh host key for dishfire 2016-02-01 16:18:17 +01:00
lassulus
55b99a6c05 l: add helios as new system 2016-02-01 15:55:41 +01:00
lassulus
8b5523b7f4 k 3 l: declare pubkeys inline 2016-02-01 15:44:01 +01:00
lassulus
873d00042b k 3 l: remove dead hosts 2016-02-01 15:41:18 +01:00
lassulus
b7e2a64c32 Merge remote-tracking branch 'gum/master' 2016-02-01 15:19:04 +01:00
lassulus
72dc2dd7fa Merge remote-tracking branch 'cd/master' 2016-02-01 15:17:16 +01:00
tv
c3c4aac670 make deploy2: deploy using nixos-rebuild switch 2016-02-01 03:32:30 +01:00
makefu
440e78fc99 makefu: init wbob 2016-01-19 20:49:36 +01:00
tv
98be119acd krebs.urlwatch: bump compatibility to urlwatch-2
configFile is the default configuration urlwatch generates.
2016-01-17 21:49:18 +01:00
tv
2ae2bdc586 Merge remote-tracking branch 'gum/master' 2016-01-14 16:39:34 +01:00
lassulus
3f4cec9196 Merge remote-tracking branch 'cd/master' 2016-01-10 12:21:01 +01:00
tv
8647055f0c krebs.backup: add TODOs 2016-01-05 23:09:05 +01:00
tv
b44615eebe tv backup: wu:/home → xu:/bku/wu-home @ 05:00 2016-01-05 22:52:35 +01:00
tv
e09559bb78 krebs.backup.plans.*.{snapshots,startAt} += default 2016-01-05 21:47:55 +01:00
lassulus
0ed16606b2 Merge remote-tracking branch 'bobby/master' 2015-12-30 18:20:35 +01:00
miefda
eba696c5d2 miefda: init with bobby 2015-12-30 18:15:11 +01:00
lassulus
9b890750e2 Merge remote-tracking branch 'gum/master' 2015-12-30 17:16:05 +01:00
lassulus
f16742895c l: add new host dishfire 2015-12-30 17:14:31 +01:00
makefu
c625c7d422 Merge remote-tracking branch 'cd/master' 2015-12-30 14:58:20 +01:00
tv
b9c4a5e4a0 exim-retiolum: move assert to proper location 2015-12-30 14:54:04 +01:00
makefu
c962e8549e k 3 Reaktor: add channels Option 2015-12-30 11:29:28 +01:00
makefu
a8cb9d41bd s 1 test-all-krebs-modules: init 2015-12-30 02:45:47 +01:00
makefu
d574c0ef78 m 3 buildbot/master: add secrets 2015-12-30 01:38:33 +01:00
makefu
9abd00f6af k 3 makefu: add ssh pubkeys to hosts 2015-12-29 21:20:11 +01:00
makefu
72d821d96c Merge remote-tracking branch 'cd/master' 2015-12-28 21:00:27 +01:00
tv
5a9ccbef0a {tv 2 => krebs 3} backup 2015-12-28 19:43:31 +01:00
makefu
7bed1761bd m 3 Reaktor: now supports plugin infra see m/1/pornocauster 2015-12-26 11:41:44 +01:00
makefu
8f98ae9842 m 3 buildbot/master: use genid 2015-12-26 10:54:02 +01:00
makefu
ed4db71add Merge remote-tracking branch 'cd/master' 2015-12-26 10:51:18 +01:00
makefu
cef2be532b m 3 Reaktor: add workdir/state_dir 2015-12-26 10:44:56 +01:00
tv
763f0db52a {pkgs => lib}.genid 2015-12-26 05:58:37 +01:00
makefu
3adf78473d k 3 buildbot.master: refactor
see buildbot-standalone.nix in shared/2configs for the current buildbot config
2015-12-24 00:02:59 +01:00
makefu
6b7506dc67 k 3 buildbot: add rsync as explicit dep
do not be pure yet
2015-12-23 17:13:16 +01:00
makefu
1ef9af2c9a k 3 buildbot/master: send sigterm before sigkill for cleanup 2015-12-23 16:20:27 +01:00
makefu
9a38671871 k 3 buildbot: fix merge fuckup 2015-12-23 16:06:41 +01:00
makefu
b8ac3e2b8d Merge branch 'master' of gum.krebsco.de:stockholm 2015-12-23 11:20:42 +01:00
makefu
14ddb767eb k 5 mv krebs-ci test/infest-cac-centos7 2015-12-23 11:18:00 +01:00
makefu
dc8e270d2a m 3 buildbot: add new slow factory to complete integration test 2015-12-23 00:37:40 +01:00
makefu
f59080e76f m 3 buildbot: add new slow factory to complete integration test 2015-12-23 00:20:37 +01:00
makefu
56e8346faa k 5 krebs-ci: remove obsolete trap rm 2015-12-22 20:53:11 +01:00
makefu
bf1b6482ce mv makefu->krebs 3 buildbot 2015-12-22 19:36:22 +01:00
makefu
f7da5211f3 m 1 omo: init 2015-12-16 12:06:44 +01:00
makefu
b5eafa4c03 k 3 makefu: gum provides cgit.gum 2015-12-15 12:44:41 +01:00
makefu
9bc0c474ac m 2 Reaktor: add full profile 2015-12-14 17:12:51 +01:00
makefu
8114470587 Merge branch 'master' of gum:stockholm 2015-12-14 17:04:32 +01:00
makefu
781573b9dd k Zpubkeys: makefu* -> 3modules 2015-12-14 17:04:16 +01:00
makefu
83924b9b6c m 1 vbob:init 2015-12-14 14:33:06 +01:00
makefu
27ca97b78f k 3 retiolum: add extraConfig 2015-12-14 14:18:08 +01:00
makefu
1c17881aed k 3 fetchWallpaper: change predicate handling
a failed predicate does not result in a failed system service
it will just not download the remote
2015-12-13 13:50:39 +01:00
lassulus
25c1a1c5ee k 3 fetchWallpaper: default stateDir in /var 2015-12-12 19:37:52 +01:00
lassulus
1b9a044b44 l 3 fetchWallpaper -> k 3 fetchWallpaper 2015-12-12 19:37:13 +01:00
makefu
65cc52e01e Merge branch 'master' of pnp:stockholm
Conflicts:
	makefu/1systems/gum.nix
2015-12-04 10:16:09 +01:00
makefu
597f9e8597 k 3 tinc_graphs: add timeout 2015-12-03 20:39:29 +01:00
makefu
c7bb244bdf m 1 gum: provides mattermost via docker container 2015-11-27 23:10:44 +01:00
lassulus
f531e7e625 Merge remote-tracking branch 'pnp/master' 2015-11-21 14:25:02 +01:00
lassulus
a020268317 Merge remote-tracking branch 'cd/master' 2015-11-21 14:24:46 +01:00
tv
817a78c711 krebs: add cgit.stro.retiolum 2015-11-18 01:20:17 +01:00
lassulus
718c672e7c Merge remote-tracking branch 'cd/master' 2015-11-17 23:22:02 +01:00
makefu
84743dcd4a Merge remote-tracking branch 'cd/master' 2015-11-17 23:14:28 +01:00
makefu
0f54a195b7 acng: also add nar files to cache 2015-11-17 23:11:29 +01:00
makefu
a3e074094b k 3 apt-cacher-ng: add CAfile 2015-11-17 23:03:21 +01:00
makefu
b8dea556e9 k 3 shared: shack ip was already in use 2015-11-17 22:26:11 +01:00
makefu
5aed0a395b shared wolf: static ip, fix todo 2015-11-17 22:15:07 +01:00
tv
dba0db28d9 mv: init 2015-11-17 19:04:32 +01:00
makefu
5a450ad787 apt-cacher-ng is imported by krebs modules 2015-11-17 13:49:29 +01:00
makefu
4c26fb9383 k 3 apt-cacher-ng: fix whitespace 2015-11-17 13:29:56 +01:00
makefu
48c9789141 apt-cacher-ng: init package and module
once apt-cacher-ng arrives in nixos stable it will be removed from stockholm
2015-11-17 12:16:51 +01:00
makefu
dcf55255e6 Merge branch 'master' of pnp:stockholm 2015-11-15 20:18:35 +01:00
lassulus
d0a573c4c5 k 3 l: bump echelon internet addr 2015-11-14 17:54:08 +01:00
lassulus
a204949071 move testhosts to shared from lass 2015-11-13 13:05:19 +01:00
makefu
383d875023 tinc_graphs: always restart 2015-11-13 12:24:43 +01:00
lassulus
58eab5df69 l 3 go -> k 3 go 2015-11-13 01:18:30 +01:00
tv
bbcdef021a Merge remote-tracking branches 'mors/master' and 'pnp/master' 2015-11-07 10:38:27 +01:00
tv
8ad05d0f40 Merge remote-tracking branch 'cd/master' 2015-11-07 09:48:06 +01:00
tv
d590cf26cd xu: bump ssh key 2015-11-07 09:45:43 +01:00
tv
1d8be110e1 nomic: bump ssh key 2015-11-07 09:43:05 +01:00
makefu
9a0e67cf65 Merge remote-tracking branch 'cd/master' 2015-11-06 22:38:44 +01:00
makefu
736e1426d5 Merge branch 'master' of pnp:stockholm 2015-11-06 22:23:46 +01:00
tv
4d93a8215f krebs.build.source.dir.host defaults to current.host 2015-11-06 22:20:26 +01:00
tv
a0c068d6ec {tv => krebs} per-user 2015-11-06 21:37:58 +01:00
tv
f58d024f48 tv: add users.tv_{wu,nomic}.pubkey 2015-11-06 19:45:50 +01:00
makefu
e8ad43c082 k 4 makefu: add filepimp 2015-11-06 10:59:40 +01:00
makefu
2e785e6be5 k 3 makefu: wry handles blog and wiki 2015-11-05 12:31:54 +01:00
makefu
625cfe81a0 Merge remote-tracking branch 'cd/master' 2015-11-05 11:10:14 +01:00
tv
9b985720ea nomic: fix ssh.{priv,pub}key 2015-11-02 13:51:03 +01:00
lassulus
f171c53dd8 k 3 l: use rsa keys in prism 2015-11-01 19:52:49 +01:00
lassulus
10779f3cb9 Merge remote-tracking branch 'pnp/master' 2015-10-31 00:14:35 +01:00
lassulus
8dd8ddb27d lass: add prism host 2015-10-30 16:05:51 +01:00
lassulus
2ba85cff33 k 3 l: echelon has 2 cores 2015-10-29 15:12:46 +01:00
makefu
84ebd8c021 m 1 wry: serve euer wiki 2015-10-28 22:06:17 +01:00
makefu
c6ca11062a m 1 gum: prepare stockholm 2015-10-28 15:06:41 +01:00
makefu
526adba3c8 k 3 urlwatch: add verbose flag 2015-10-26 00:17:48 +01:00
makefu
6425831452 k 3 tinc_graphs: is now completely self-contained 2015-10-25 21:54:59 +01:00
lassulus
43b856994f Merge remote-tracking branch 'cd/master' 2015-10-25 21:27:26 +01:00
makefu
bb16a38df6 Merge remote-tracking branch 'cd/master' 2015-10-25 18:17:14 +01:00
makefu
cca25c7b66 wry: listen for graphs.retiolum 2015-10-25 18:06:46 +01:00
tv
8f15daf2ea init krebs.current 2015-10-25 14:15:21 +01:00
tv
daa8fe2aa8 init users.shared.wolf 2015-10-25 14:08:51 +01:00
tv
3dcc050cd9 Merge remote-tracking branches 'mors/master' and 'pnp/master' 2015-10-24 10:07:00 +02:00
makefu
a1d05482e5 Merge remote-tracking branch 'cloudkrebs/master' 2015-10-23 15:38:01 +02:00
makefu
709ebf6bbc krebs 3 zone-generation: for consistency, add newline at the end 2015-10-23 15:31:31 +02:00
makefu
5842130703 wrong MX entry resulted in inability to upload zone 2015-10-23 14:39:35 +02:00
lassulus
93dcfe5ad6 Merge remote-tracking branch 'cd/master' 2015-10-22 20:21:01 +02:00
tv
128e5feae9 Merge remote-tracking branch 'pnp/master' 2015-10-22 20:14:01 +02:00
makefu
f092e6acb4 krebs 3 zones: remove empty lines 2015-10-22 17:17:04 +02:00
makefu
be39c6d849 krebs 3 bepasty-server: styling 2015-10-22 16:14:37 +02:00
makefu
9bb3069f69 krebs 3 tinc_graphs: mv from makefu 3 tinc_graphs 2015-10-22 15:33:05 +02:00
makefu
9be59a0400 krebs 3 modules: bepasty-server is a krebs module 2015-10-22 15:26:54 +02:00
lassulus
692a59423a Merge remote-tracking branch 'pnp/master' 2015-10-21 19:06:48 +02:00
makefu
6eb195b0bc wry: is the new provider for paste.krebsco.de 2015-10-21 18:49:20 +02:00
makefu
dc1bb40c45 krebs 3 nginx: extraConfig is type string 2015-10-21 18:44:51 +02:00
lassulus
864f39634b Merge remote-tracking branch 'cd/master' 2015-10-21 13:52:20 +02:00
lassulus
14f08e2a1c k 3 l: add cores to testsystems 2015-10-21 13:51:10 +02:00
tv
b55f07e57a mkdir: 104.233.84.215 -> 104.167.114.142 2015-10-21 13:48:53 +02:00
lassulus
a19cf6d4a3 Merge remote-tracking branch 'cd/master' 2015-10-21 13:40:23 +02:00
tv
0863983b7d wu: add alias cgit.wu.retiolum 2015-10-21 13:16:04 +02:00
tv
3ce57c3de3 stockholm: provide krebs lib 2015-10-21 01:53:07 +02:00
lassulus
309102967e l: add test systems 2015-10-21 01:52:47 +02:00
tv
226ea391ca stockholm: provide krebs lib 2015-10-21 00:11:12 +02:00
lassulus
114bbe669a Merge remote-tracking branch 'pnp/master' 2015-10-20 23:47:39 +02:00
lassulus
f6187b3796 Merge remote-tracking branch 'cd/master' 2015-10-20 23:47:29 +02:00
makefu
0bc015bf3c krebs 3 retiolum-bootstra: use nginx listen list
consolidate nginx servers into 1, provide a means to override the listen
addresses.
2015-10-20 20:00:05 +02:00
makefu
e0eed572ec Merge remote-tracking branch 'cd/master' 2015-10-20 19:17:25 +02:00
tv
b2fd7be3ff nginx service: allow multiple listen entries 2015-10-20 18:53:11 +02:00
makefu
ded0821d9b m 1,2 : wry serves as iodine entry point 2015-10-19 23:46:10 +02:00
makefu
8d3ebfc096 krebs 3 retiolum-bootstrap: fix assert todo 2015-10-19 21:57:05 +02:00
makefu
858034cc61 m 1 wry: host is the new provider for tinc.krebsco.de 2015-10-19 21:51:20 +02:00
makefu
754ea55ab8 krebs 3 retiolum-bootstrap: init module 2015-10-19 21:50:25 +02:00
tv
dc52c4b988 nginx service: replace port by listen 2015-10-19 20:42:18 +02:00
tv
222ca361e3 nginx service: add port option and extraConfig 2015-10-19 20:36:09 +02:00
lassulus
ffef87c5df l: specify krebs.hosts.*.nets.gg23 2015-10-18 17:50:54 +02:00
tv
8af96d3245 tv: specify krebs.hosts.*.nets.gg23 2015-10-18 16:14:07 +02:00
tv
d50d582560 add krebs.dns.providers.gg23 2015-10-18 16:12:14 +02:00
tv
c9a3d1a3d9 tv extraZones: set TTL to 60 2015-10-17 21:42:03 +02:00
tv
5c5b421b20 Merge remote-tracking branch 'pnp/master' 2015-10-17 21:33:23 +02:00
tv
9f4f51b1c7 cd,ire: add extraZones 2015-10-17 21:32:59 +02:00
makefu
5d0e4243bf krebs 3 makefu: remove retard entries for pigstarter 2015-10-17 21:21:13 +02:00
tv
9efe536e45 cd: claim cgit.cd.krebsco.de 2015-10-17 18:31:27 +02:00
makefu
f83b3770dd krebs 2 Reaktor: Delay Restart of Reaktor - avoid fast restart loops 2015-10-17 11:17:54 +02:00
tv
335ea5a4c1 Merge remote-tracking branch 'mors/master' 2015-10-14 19:24:36 +02:00
lassulus
69098a4847 use go as url-shortener for newsbot-js 2015-10-14 19:22:44 +02:00
tv
96f4248b65 Merge remote-tracking branch 'cloudkrebs/master' 2015-10-09 14:48:58 +02:00
tv
694c79a5bc github-hosts-sync service: fix directory creation 2015-10-09 14:32:45 +02:00
tv
51e4b62de2 krebs.github-host-sync.ssh-identity-file: fix type 2015-10-09 14:11:38 +02:00
tv
87fa7792e3 disband github-known_hosts harder 2015-10-09 13:34:25 +02:00
lassulus
938b6fe278 Merge remote-tracking branch 'nomic/master' 2015-10-09 13:27:02 +02:00
tv
f1cc52aeaf known_hosts: GitHub is 192.30.252.0/22 2015-10-09 13:18:21 +02:00
tv
9ae6d1611e add github.com and its addrs4 to known_hosts 2015-10-09 12:06:00 +02:00
makefu
2460a6c226 krebs 3 realwallpaper: actually start realwallpaper as timer 2015-10-07 15:20:12 +02:00
lassulus
eabf194460 krebs 3 lass: add ssh pubkeys 2015-10-05 16:33:41 +02:00
lassulus
cf28831057 move realwallpaper to krebs 3 2015-10-05 14:49:36 +02:00
tv
059037f5ec register krebsco.de internet aliases 2015-10-05 03:29:04 +02:00
tv
214bd7a3b2 register retiolum "internet" aliases 2015-10-05 03:09:01 +02:00
tv
a626c2a070 postmaster@krebsco.de -> spam-ml 2015-10-05 03:09:01 +02:00
tv
8167fe985a define spam-ml in krebs/3modules 2015-10-05 03:09:01 +02:00
tv
04c0f3935b Merge remote-tracking branch 'pnp/master' 2015-10-04 22:28:27 +02:00
tv
41df3589f6 rmdir: bump ipaddr 2015-10-04 20:55:30 +02:00
makefu
1140a16ba6 configure graphs for wry 2015-10-04 19:46:34 +02:00
lassulus
829b8303ce krebs 3 lass: bump echelon ip (again) 2015-10-04 15:16:14 +02:00
lassulus
f9e36ec9e2 krebs 3 lass: bump echelon ip 2015-10-04 14:14:35 +02:00
lassulus
161c81e54e krebs 3 lass: bump echelon ip 2015-10-04 13:32:50 +02:00
lassulus
1e410cd232 Merge branch 'makefu' 2015-10-01 22:45:17 +02:00
lassulus
1078d1a8a3 move iptables.nix to krebs 2015-10-01 22:10:21 +02:00
tv
d5d3c9f8b3 krebs modules: finalize default.nix split 2015-10-01 18:56:41 +02:00
makefu
49c00cf74f Merge remote-tracking branch 'cd/master' 2015-10-01 18:49:34 +02:00
makefu
4d5bfae7b2 fix wry ip 2015-10-01 18:48:49 +02:00
tv
4af4fa89e5 Merge remote-tracking branch 'uriel/master' 2015-10-01 17:26:26 +02:00
tv
cd61f94ba0 Merge remote-tracking branch 'pnp/master' 2015-10-01 17:16:57 +02:00
tv
2432695678 krebs lib.types: deprecate host.infest.{addr,port} 2015-10-01 14:59:58 +02:00
lassulus
842bcf117a Merge branch 'makefu' 2015-10-01 14:48:57 +02:00
lassulus
4bacf702b0 Merge branch 'tv' 2015-10-01 14:48:51 +02:00
tv
2ef889b1c4 mkdir: 104.233.84.{174 -> 215} 2015-10-01 14:26:50 +02:00
tv
bfe0723728 move config scripts to krebs 2015-10-01 02:19:13 +02:00
makefu
e1ec3ff1ef Merge remote-tracking branch 'cd/master' 2015-09-30 19:45:24 +02:00
lassulus
ceb8226bc4 krebs: new key for echelon 2015-09-30 15:19:31 +02:00
lassulus
0f2f56097b krebs 3: add fastpoke 2015-09-30 11:56:13 +02:00
lassulus
ad5ef39476 Merge branch 'tv' 2015-09-28 18:43:56 +02:00
makefu
d9f4d621bc Reaktor: add extraEnviron for setting Channel 2015-09-27 21:50:40 +02:00
makefu
170191034e add description for sources.dir.*.host 2015-09-27 19:32:27 +02:00
makefu
dec3f4a211 fix wry 2015-09-27 17:27:11 +02:00
tv
9ff5db3fd6 tv: cd, rmdir: add ssh.pubkey 2015-09-27 16:56:14 +02:00
tv
4946561e0a krebs.build.scripts.init: don't try to use privkey
^_^
2015-09-27 16:55:17 +02:00
tv
0e069d964e add krebs.build.scripts.init 2015-09-27 16:37:20 +02:00
tv
48e28c49e0 krebs tv-imp: bump mkdir's addrs4 2015-09-27 16:17:11 +02:00
tv
18cfca4fe8 krebs: set host key for hosts with ssh.privkey 2015-09-27 16:15:53 +02:00
makefu
400dab8254 Merge remote-tracking branch 'cd/master' into before-merge 2015-09-27 15:27:00 +02:00
tv
5a0d8f45c1 krebs tv-imp: add ire 2015-09-27 15:26:04 +02:00
tv
dc5299a071 krebs: add hosts with ssh.pubkey to known hosts 2015-09-27 15:24:41 +02:00
makefu
394408c9b7 3modules: add wry 2015-09-27 15:24:27 +02:00
tv
53f93de02f krebs: no extraHosts for hosts w/o aliases 2015-09-27 15:19:59 +02:00
tv
2d1985e420 infest: don't init contents of the NixOS channel 2015-09-27 15:18:54 +02:00
tv
c9ccf22b15 krebs.build: merge deploy and infest 2015-09-27 00:37:20 +02:00
lassulus
1c6d6918d7 krebs 3: update echelon ip 2015-09-19 23:40:25 +02:00
lassulus
c20e49bd20 krebs 3: update echelon ip 2015-09-18 03:07:13 +02:00
lassulus
ab946ab7c1 add "make infest" 2015-09-18 03:04:39 +02:00
lassulus
e83f8f3baa Merge branch 'makefu' 2015-09-13 16:39:02 +02:00
makefu
2281516e57 retiolum.nix: fix pidfile name 2015-09-09 15:15:22 +02:00
lassulus
95d3ccbc3d Merge branch 'tv' 2015-09-05 12:18:02 +02:00
lassulus
f54a0a9ea7 Merge branch 'makefu' 2015-09-05 12:17:59 +02:00
lassulus
f3c1727659 lass: add echelon 2015-09-05 12:15:31 +02:00
lassulus
9dcea815c6 krebs 3: make rsync work on retarted systems 2015-09-05 12:12:21 +02:00
makefu
6099a42734 Reaktor extraconfig is extensible 2015-09-04 23:01:41 +02:00
makefu
d12e86c481 Reaktor: debug enable/disable 2015-09-04 22:56:15 +02:00
makefu
8012e60b77 krebs/3modules/Reaktor: fix auto startup 2015-09-04 12:37:12 +02:00
tv
b82fd9ba29 krebs tv hosts: add xu 2015-09-04 01:29:32 +02:00
makefu
444dfa388b krebs:add euer.krebsco.de to pigstarter cnames 2015-08-31 21:10:00 +02:00
makefu
3e581053f4 add extraConfig and overrideConfig
this allows of preserving the original config while adding bonus features
2015-08-31 19:55:38 +02:00
makefu
0f50750e25 Reaktor: initial commit at 0.3.5 2015-08-31 14:22:21 +02:00
makefu
2eb8bcf9d1 Merge remote-tracking branch 'cd/master' 2015-08-31 10:47:29 +02:00
tv
5591b1dd12 Z* -> */Z* 2015-08-29 00:58:41 +02:00
tv
81eaf7a9e7 one pkgs to rule them all 2015-08-29 00:20:42 +02:00
tv
144fcda288 {tv,krebs}: import krebs pkgs with lib 2015-08-28 22:27:23 +02:00
tv
f63b27240e Merge remote-tracking branch 'pnp/master' 2015-08-28 21:59:19 +02:00
lassulus
814d685291 Merge branch 'makefu' 2015-08-28 17:37:13 +02:00
makefu
407985695d revert path from cacert to nss-cacert 2015-08-26 17:10:02 +02:00
makefu
4f968b3cc4 krebs/services/makefu: change mail-address 2015-08-25 16:57:57 +02:00
lassulus
65a2d75b14 Merge branch 'makefu' 2015-08-23 16:53:38 +02:00
lassulus
5a1a36e1f2 krebs 3: fix uriel's email 2015-08-20 15:57:36 +02:00
lassulus
0a634d3a99 krebs 3: make uriel secure 2015-08-19 17:54:11 +02:00
Felix Richter
1c3f7610c5 urlwatch: fix ca-bundle path 2015-08-17 23:21:51 +02:00
Felix Richter
d5ffbf54cb services: add new mail 2015-08-17 14:21:40 +02:00
Felix Richter
34d65d2c69 krebs/zones: # is not a comment in dns zones ... 2015-08-17 00:43:44 +02:00
Felix Richter
407c159225 add implementation of /etc/zones/ 2015-08-16 23:58:02 +02:00
tv
b8b2575d83 Merge remote-tracking branch 'mors/master' 2015-08-14 15:51:29 +02:00
tv
e8825282a6 {tv 2 => krebs 3} exim-smarthost 2015-08-14 15:48:17 +02:00
lassulus
f5fa77fb73 krebs 3: add lass's mails 2015-08-14 15:20:53 +02:00
tv
db4b55527d krebs/3: add cd extraZones 2015-08-13 22:31:40 +02:00
tv
69723fdefa Merge remote-tracking branch 'pnp/master' 2015-08-13 22:28:19 +02:00
makefu
d230db96d9 krebs: add extraZones 2015-08-13 20:28:21 +00:00
tv
95d9791e90 Merge remote-tracking branch 'pnp/master' 2015-08-13 17:45:49 +02:00
makefu
bdc58a02f9 krebs: add pigstarter,mail 2015-08-13 17:45:43 +02:00
tv
a33f90358d Merge remote-tracking branch 'pnp/master' 2015-08-13 17:09:56 +02:00
tv
9f92ba455c krebs.exim-retiolum: assert krebs.retiolum.enable 2015-08-13 12:08:36 +02:00
makefu
4366ffd6c5 Merge remote-tracking branch 'cd/master' 2015-08-13 12:06:07 +02:00
tv
6c2c01b5cb {tv 2 => krebs 3}/exim-retiolum 2015-08-13 12:03:27 +02:00
makefu
4d08db7462 Merge remote-tracking branch 'cd/master' 2015-08-13 12:02:38 +02:00
makefu
ab2d3f96be services: add pigstarter 2015-08-13 12:02:26 +02:00
tv
7c578b1cad {tv 2 => krebs 3}/exim-retiolum 2015-08-13 11:50:38 +02:00
makefu
0862e949f6 tsp: 2 cores 2015-08-12 16:58:21 +02:00
makefu
2499c472a0 fix ip of tsp (211 is already in use) 2015-08-05 16:55:10 +02:00
makefu
7d75cf113f fix mkdir /root/root@<host>/secret
previously /root/root@<host>/secret folder was created on the
destination host but /root/secret/ is required.

This commit fixes this behavior and creates the correct folder for
bootstrapping
2015-08-04 14:55:06 +02:00
makefu
00bc48d90f add host tsp (traveling salesman problem) 2015-08-02 23:12:38 +02:00
lassulus
1bf670270c Merge remote-tracking branch 'cd/master' into newmaster2 2015-07-28 23:23:26 +02:00
tv
06cb4d25ef */krebs -> krebs/* 2015-07-28 21:38:22 +02:00