Commit Graph

756 Commits

Author SHA1 Message Date
makefu
4f28d9a306
Merge remote-tracking branch 'prism/master' 2016-06-02 11:17:18 +02:00
lassulus
7bd85d7bbb k 5: disable buildbot override 2016-06-01 00:14:48 +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
a240a60b52 Merge remote-tracking branch 'cd/master' into HEAD 2016-05-25 11:14:32 +02:00
tv
2b71d7f728 writeNixFromCabal: deprecate 2016-05-25 00:28:09 +02:00
tv
0d8a0ed71d writeHaskellBin: init 2016-05-25 00:08:34 +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
ebe4cb290c
Merge remote-tracking branch 'cd/master' 2016-05-24 22:42:34 +02:00
tv
2ccafac558 writeEximConfig: disable validation 2016-05-24 22:36:04 +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
83fd472251 buildbot sqlalclchemy_migrate_0_7: disable check 2016-05-20 00:01:28 +02:00
lassulus
f46b3153c0 symlinkJoin: compat 2016-05-19 23:55:29 +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
c9602f5d1a k 5 forticlientsslvpn: add comments 2016-05-02 17:39:34 +02:00
makefu
6a9a738f30 k 5 repo-sync: 0.2.5 -> 0.2.6 2016-05-02 17:38:55 +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
tv
87dabec64d krebs types.group: init 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
4e99bb9d12 krebs types.addr4: check type harder 2016-04-08 04:38:10 +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
tv
e1a287c78b Merge remote-tracking branch 'gum/master' 2016-04-07 20:29:33 +02:00
tv
033bf438bd addr4: str -> mkOptionType 2016-04-07 20:29: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
tv
bcb395fa76 exim: 4.86.2 -> 4.87 2016-04-07 11:16:57 +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
20afe7b9ae krebs types += tinc-pubkey 2016-03-16 02:04:22 +01:00
tv
9d16ea6145 krebs types += pgp-pubkey, user.pgp.pubkey 2016-03-16 02:03:17 +01:00
tv
444d85ea86 krebs types += ssh-{priv,pub}key 2016-03-16 02:02:20 +01:00
tv
e6657cd46a krebs lib += getAttrDef 2016-03-16 01:52:34 +01:00
tv
fb82aa8f34 krebs types.host.ssh.pubkeys: trace only own missing keys 2016-03-16 01:19:27 +01:00
tv
1ff38bf6c6 krebs lib += optionalTrace 2016-03-16 01:17:07 +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