Commit Graph

1632 Commits

Author SHA1 Message Date
lassulus
c5b1857384 Merge remote-tracking branch 'ni/master' 2017-04-30 18:31:11 +02:00
tv
ca2c22601f much: 1.0.0 -> 1.1.0 2017-04-30 15:47:27 +02:00
makefu
d756d5bcfb
k 3 m: gum add ghook.krebsco.de 2017-04-28 12:44:29 +02:00
tv
5cee2f8c89 xu: add cgit alias 2017-04-27 19:33:44 +02:00
makefu
bcf11edfd6
Merge remote-tracking branch 'lass/master' 2017-04-25 11:05:58 +02:00
lassulus
8e9337e9eb weechat: init at 1.7.1 2017-04-25 11:04:42 +02:00
makefu
4144cff1a1
k 3 m: bump x to 4 cores 2017-04-24 23:21:07 +02:00
lassulus
3e3405bf4a k 3 hidden-ssh: wait for irc port 2017-04-24 12:54:02 +02:00
lassulus
ab7a5a507e move untilport: l/5 -> k/5 2017-04-24 11:43:48 +02:00
lassulus
9da804418f k 5 realwallpaper: b8408cf -> e056328 2017-04-23 11:46:19 +02:00
tv
decb6064ec Revert "irc-announce: fix cat2 on live systems"
This reverts commit 6187206a02.

Lol, no.  Yes, /dev/stderr isn't POSIX (only fd 2 is and gawk has that
path hardcoded to the fd and thus it works), but the error is somewhere
else and "fixing" it like this doesn't help anyone.
2017-04-19 10:23:58 +02:00
tv
66849259ee Merge remote-tracking branches 'gum/master' and 'prism/master' 2017-04-19 10:22:14 +02:00
lassulus
d05b989095 k 3 realwallpaper: graphs.r -> graph.r 2017-04-19 10:20:34 +02:00
makefu
de22f21195
s 2 buildbot: configure nginx for buildbot 2017-04-19 10:06:36 +02:00
makefu
0ea25143c9
Merge remote-tracking branch 'lass/master' 2017-04-19 10:02:57 +02:00
tv
c577d6b997 krebs.nginx: RIP 2017-04-18 21:14:56 +02:00
tv
57b4a87962 retiolum-bootstrap: krebs.nginx -> services.nginx 2017-04-18 21:14:56 +02:00
makefu
87acf579a9 k 5 tinc_graphs: bump to 0.3.10 2017-04-18 21:14:54 +02:00
tv
5924b83665 krebs.nginx: RIP 2017-04-17 16:51:48 +02:00
tv
4424a4b159 retiolum-bootstrap: krebs.nginx -> services.nginx 2017-04-17 16:20:19 +02:00
lassulus
b6a4df7e39 Merge remote-tracking branch 'gum/master' 2017-04-16 23:35:54 +02:00
lassulus
6187206a02 irc-announce: fix cat2 on live systems 2017-04-16 23:32:05 +02:00
lassulus
8f89bb5d3d k 3 hidden-ssh: start after network-online.target 2017-04-16 23:31:46 +02:00
makefu
270157937b
k 5 tinc_graphs: bump to 0.3.10 2017-04-15 18:55:15 +02:00
lassulus
cc68f1feac Merge remote-tracking branch 'gum/master' 2017-04-15 18:20:05 +02:00
makefu
4feb0e8e91
k 3 hidden-ssh: init 2017-04-15 18:04:19 +02:00
makefu
c45cd788d2
m: graphs -> graph 2017-04-15 17:58:20 +02:00
lassulus
a80cbaa6e9 realwallpaper: introduce marker_file 2017-04-15 17:14:34 +02:00
tv
7c159da2ee htgen: 1.2.1 -> 1.2.2 2017-04-13 16:25:17 +02:00
tv
108ede97f1 htgen: 1.2 -> 1.2.1 2017-04-13 15:33:49 +02:00
tv
a78603a6e9 htgen: 1.1 -> 1.2 2017-04-13 15:18:47 +02:00
makefu
549c89dd99
k 5 krebspaste: output with +inline 2017-04-13 14:03:36 +02:00
tv
bcbf11a57c Merge remote-tracking branch 'prism/lassulus' 2017-04-13 11:15:05 +02:00
tv
7baf4a4090 tv: normalize all ip6.addr 2017-04-13 03:13:00 +02:00
tv
b03b57e167 krebs.search-domain: retiolum -> r 2017-04-13 02:57:11 +02:00
lassulus
6ea130bf38 k 3 l: add build.prism.r alias 2017-04-12 21:04:58 +02:00
tv
f7897e0b4c mv: drop .retiolum 2017-04-12 11:31:32 +02:00
tv
17aef69d05 krebs.urlwatch: .retiolum -> .r 2017-04-12 11:28:10 +02:00
tv
8f9bd903a6 shared: .retiolum -> .r 2017-04-12 11:27:22 +02:00
tv
6f5fbbe6e0 krebs.exim-* relay_to_domains: drop .retiolum from default 2017-04-12 11:26:29 +02:00
tv
5edc4ba929 krebs.git.cgit: drop support for .retiolum 2017-04-12 11:24:38 +02:00
tv
d3f57ffcfb tv: drop .retiolum 2017-04-12 11:23:39 +02:00
tv
ea1de2f27f Merge remote-tracking branches 'prism/master' and 'gum/master' 2017-04-12 11:21:47 +02:00
makefu
6a9563856b
m: .retiolum -> .r
update search domain, also .internet -> .i
2017-04-12 11:17:38 +02:00
makefu
5378630fce
k 3 m: mv pgp keys
auto-complete correctly ;)
2017-04-12 11:15:02 +02:00
lassulus
9b44941911 lass: .retiolum -> .r 2017-04-12 11:00:36 +02:00
lassulus
1f317b8a1a Merge remote-tracking branch 'gum/master' 2017-04-11 21:50:29 +02:00
lassulus
9438c86291 k 5 kpaste: init 2017-04-11 21:41:06 +02:00
lassulus
cb2d35a205 k 3 l: new prism alias: p.r 2017-04-11 21:40:13 +02:00
makefu
9224e9c4c8
m: gum takes over euer,wiki,graphs from wry 2017-04-11 21:38:27 +02:00
lassulus
23bbf68204 Merge remote-tracking branch 'prism/newest' 2017-04-02 11:36:33 +02:00
makefu
c7cfb0a5ab
Merge remote-tracking branch 'tv/master' 2017-03-31 18:27:25 +02:00
makefu
fac92f5b28
k 3 m: disable v6 address for gum 2017-03-31 14:22:42 +02:00
tv
a059f2fc99 Revert "exim: init at 4.88"
This reverts commit df7e24c93d.

^ lolwat
2017-03-31 11:56:16 +02:00
lassulus
3d46b5b9e6 Merge remote-tracking branch 'gum/master' 2017-03-26 01:41:26 +01:00
lassulus
0c0d9472a6 k 3 l: update shodan pubkey 2017-03-25 11:15:25 +01:00
makefu
1216112159
k 5 at-cacher-ng: bump to version 2 2017-03-24 13:01:58 +01:00
lassulus
8809797f10 k 3 htgen: add default option 2017-03-16 22:14:53 +01:00
lassulus
5718517f60 k 3 htgen: use htgen-1.1 2017-03-16 21:53:34 +01:00
lassulus
e599c372bf htgen: 1.0 -> 1.1 2017-03-16 21:53:05 +01:00
lassulus
552a3e8f28 k 3: add htgen 2017-03-16 20:56:28 +01:00
lassulus
90a3a19104 htgen: init 2017-03-16 20:56:08 +01:00
lassulus
79387ddfc3 krebpsate: set max lifetime to 1 month 2017-03-14 23:08:09 +01:00
lassulus
9a1da1342b krebspaste: .retiolum -> .r 2017-03-14 23:07:11 +01:00
lassulus
9f64932809 Merge remote-tracking branch 'ni/master' 2017-03-14 21:14:25 +01:00
tv
df2ee4e726 * iptables: fix ordering
refs nixpkgs fb46df8a9a4102e265f4b14af48a5df90d5b06c3
2017-03-14 21:02:08 +01:00
tv
7a293af6db ni,xu: define canonical name first for krebs.backup 2017-03-14 19:19:28 +01:00
lassulus
3be5ccd67f k 3 fetchWallpaper: don't use user services 2017-03-14 11:17:10 +01:00
lassulus
8464ebbf69 k 3 repo-sync: better types, add repo timer 2017-03-08 00:47:43 +01:00
lassulus
fa9a10ae84 Merge remote-tracking branch 'ni/master' 2017-03-07 22:27:10 +01:00
tv
218c58ef33 writers.link: mkdir when path is absolute 2017-03-07 22:26:07 +01:00
lassulus
c938c30187 Merge remote-tracking branch 'ni/master' 2017-03-07 21:51:59 +01:00
tv
0edb13f3fc concat: init 2017-03-07 21:48:25 +01:00
lassulus
8061bed274 Merge remote-tracking branch 'onondaga/master' 2017-03-07 19:44:03 +01:00
lassulus
5fe56a99b8 k 3 monit: allow path or str for alarms & test 2017-03-07 19:25:03 +01:00
tv
c05db24090 Revert "cd: hart eingeCACt"
This reverts commit 3607bd0832.
2017-03-07 15:32:31 +01:00
lassulus
abdfd8269f Merge remote-tracking branch 'ni/master' 2017-03-05 00:26:56 +01:00
tv
b690768e28 git-hooks.irc-announce: append .r to cgit_endpoint 2017-03-04 22:49:44 +01:00
tv
286fc7045b git-hooks.irc-announce: simplify file structure 2017-03-04 22:49:24 +01:00
lassulus
6344a9ff6a exim: add primary_host to local_domains 2017-03-04 22:24:05 +01:00
tv
e71534f237 krebs,tv: /var/setuid-wrappers -> /run/wrappers/bin 2017-03-04 02:16:44 +01:00
tv
c5830150d0 krebs.setuid: update for nixos-unstable 2017-03-04 02:16:44 +01:00
tv
ed3585bfcf krebs,tv: /var/setuid-wrappers -> /run/wrappers/bin 2017-03-02 19:57:52 +01:00
tv
863bb9f912 krebs.setuid: update for nixos-unstable 2017-03-02 19:43:10 +01:00
lassulus
f7db5dbe10 k 5: add zandronum-bin 3.0 2017-02-22 18:23:33 +01:00
lassulus
ada1147bb6 k 3 fetchWallpaper: remove obsolete targets 2017-02-21 14:29:49 +01:00
lassulus
a5cc674141 k 3 fetchWallpaper: remove deprecated after target 2017-02-16 19:40:25 +01:00
lassulus
6a3700da3c k 3 fetchWallpaper: use $HOME as default 2017-02-16 19:40:04 +01:00
lassulus
1afea851af k 3 fetchWallpaper: use user service 2017-02-16 00:04:08 +01:00
lassulus
024ea6d7f9 k 5 buildbot: update to 0.9.4 2017-02-13 16:44:21 +01:00
lassulus
045fe83273 l 3 monit: implement alarm interval 2017-02-13 14:33:47 +01:00
lassulus
632b194ad3 add krebs.monit 2017-02-13 14:31:26 +01:00
lassulus
c4d70a28b4 Merge remote-tracking branch 'prism/makefu' 2017-02-12 21:41:48 +01:00
lassulus
bf8a886c20 k 3 l: update lass@icarus ssh key 2017-02-12 21:29:34 +01:00
makefu
a3e7e4f2ba
k 3 {m,l}: mv paste.krebsco.de 2017-02-12 20:25:06 +01:00
makefu
444c3ee424
k 3 m: re-indent 2017-02-12 20:17:37 +01:00
lassulus
ac031e8822 Merge remote-tracking branch 'ni/master' 2017-02-10 09:32:58 +01:00
tv
b170e01ec8 writeJq: -n isn't the same as < /dev/null 2017-02-10 09:30:43 +01:00
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
tv
e78a8c0725 write{Jq,Python*}: use writeOut 2017-02-09 16:13:26 +01:00
tv
bf81d1b6b9 krebs builders -> krebs writers 2017-02-09 15:43:58 +01:00
tv
3e01299f90 krebs builders: use passAsFile in runCommands 2017-02-09 15:40:49 +01:00
tv
a4683911af krebs builders: turn file into module 2017-02-09 15:40:37 +01:00
tv
c34f8a33dc packageOverrides: allow using pkgs in addition to oldpkgs 2017-02-09 15:11:02 +01:00
lassulus
954477b867 k 5: fix proot signal 11 error with wrapper 2017-02-09 12:41:11 +01:00
makefu
4f34c772c2
Merge remote-tracking branch 'tv/master' 2017-02-09 10:08:17 +01:00
tv
4e7fdf429f proot: fix seccomp filters 2017-02-09 10:06:36 +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
tv
ed406bd979 proot: fix seccomp filters 2017-02-09 09:50:28 +01:00
makefu
268e43841d
k 3 makefu: introduce -bob, add logging to wry,gum 2017-02-08 18:37:15 +01:00
lassulus
381d24634e Merge remote-tracking branch 'prism/makefu' 2017-02-05 23:10:23 +01:00
makefu
bd90a14732
m central-logging: init 2017-02-05 22:34:16 +01:00
lassulus
7bcbb92979 k 5 Reaktor plugins: fix regex in url-title 2017-02-05 18:01:15 +01:00
lassulus
dd84ced186 k 5 newsbot-js: update packages.nix 2017-02-05 12:51:10 +01:00
lassulus
4dd88ea7d2 k 5 fortclientsslvpn: use gnome3.gtk 2017-02-05 12:23:14 +01:00
lassulus
f44d29940e l 5: remove obsolete kapacitor 2017-02-05 11:52:01 +01:00
lassulus
aedb8cf265 k 5: remove obsolete telegraf 2017-02-05 11:47:43 +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
42b3396858 k 5 Reaktor plugins url-title: timeout after 5s 2017-01-22 12:53:15 +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
94631f688c k 5 Reaktor plugins: add url-title 2017-01-21 22:05:02 +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
8884c4274d k 5 bepasty-client-cli: use recent git master 2017-01-11 23:07:15 +01:00
lassulus
131de9bbd1 Merge remote-tracking branch 'gum/master' 2017-01-10 14:54:34 +01:00
lassulus
2e72ce8367 Merge remote-tracking branch 'ni/master' 2017-01-09 17:14:51 +01:00
lassulus
91c4f86b31 k 5: add kapacitor
we add this here until 17.03 is released
2017-01-09 17:03:59 +01:00
lassulus
13aa779c44 k 5: add telegraf
we need it here until the new stable branch is released
2017-01-09 16:38:22 +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
19f8234cef infest/prepare: touch /mnt/var/src/.populate 2017-01-04 08:48:31 +01:00
tv
2b8f836339 infest/prepare: fix style inconsistencies 2017-01-04 08:36:29 +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
tv
4f87f3bf4a irc-announce: mktemp --tmpdir 2016-12-28 09:26:57 +01:00
tv
bf4e2bd961 Revert "k 5 irc-announce: cd to /tmp"
This reverts commit 3ecebca46f.
2016-12-28 09:13:53 +01:00
lassulus
3ecebca46f k 5 irc-announce: cd to /tmp 2016-12-27 22:58:56 +01:00
lassulus
3c5906dd62 k 5: move irc-announce to seperate package 2016-12-27 22:58:36 +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
lassulus
9224478adf Merge remote-tracking branch 'gum/master' 2016-12-25 12:13:49 +01:00
lassulus
8f16b738c7 Merge remote-tracking branch 'ni/master' 2016-12-25 12:13:43 +01:00
tv
df7e24c93d exim: init at 4.88 2016-12-25 11:23:13 +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
lassulus
acb2f0b042 Merge remote-tracking branch 'gum/master' 2016-12-23 18:38:37 +01:00
lassulus
b8975f6ed4 Merge remote-tracking branch 'ni/master' 2016-12-23 18:38:28 +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
makefu
933ba96201
Merge remote-tracking branch 'lass/master' 2016-12-21 12:34:57 +01:00
lassulus
deaef40bdf Merge remote-tracking branch 'ni/master' 2016-12-20 13:47:44 +01:00
makefu
c7f2a0d7d9
k 5 rutorrent: bump rev 2016-12-13 15:48:54 +01:00
tv
e62dca9408 zu: define gg23 2016-12-03 03:32:44 +01:00
lassulus
b6e6a99585 k 5 urlwatch: remove obsolete postFixup 2016-12-02 09:23:09 +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
9163512516 Merge remote-tracking branch 'ni/master' 2016-11-26 19:11:41 +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
tv
9bae4d80c8 dic: 1.0.0 -> 1.0.1 2016-11-25 23:58:28 +01:00
lassulus
8014aa6594 Merge remote-tracking branch 'ni/master' 2016-11-25 00:19:17 +01:00
tv
b3c6e9a2bd writeBash*: use shellcheck (for warnings only) 2016-11-25 00:17:57 +01:00
tv
d59facd88c writeOut: add support for text checking 2016-11-25 00:16:44 +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
ce34ab4268 github-hosts-sync: add nettools for painload-8df031f's use of hostname 2016-11-24 23:12:13 +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
tv
6c6d705629 painload: 8df031f -> c113487 2016-11-24 22:07:28 +01:00
tv
a81091baf1 blessings: 1.0.0 -> 1.1.0 2016-11-22 18:58:47 +01:00
makefu
3e13e2406d
k 5 buildbot: init irc_messages patch 2016-11-18 16:30:48 +01:00
tv
cb09a4c348 Reaktor sed-plugin: remove sed script injection
Thanks @waldi for providing a breaking example: s/.\/\/; w /tmp/i
2016-11-18 15:22:15 +01:00
tv
d430a1fa40 Revert "k 5 Reaktor: harden sed-plugin"
This reverts commit dbb25f7288.
2016-11-18 15:08:28 +01:00
makefu
0155fc32e1
k 5: override buildbot 2016-11-15 23:26:55 +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
bc1d6f9c59 dic: reinit at 1.0.0 2016-11-11 12:11:40 +01:00
tv
da9b466093 charybdis: RIP 2016-11-11 09:17:17 +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
tv
b5ddef3996 painload: init at 8df031f 2016-11-10 21:49:48 +01:00
makefu
dbb25f7288
k 5 Reaktor: harden sed-plugin 2016-11-08 16:48:58 +01:00
lassulus
9b0874ceee Merge remote-tracking branch 'cd/master' 2016-11-06 12:47:11 +01:00
tv
4f1625d5dc haskellPackages.hyphenation: init at 0.6 2016-11-03 15:26:11 +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
tv
059d7b2d05 populate: 1.1.1 -> 1.2.0 2016-10-23 23:32:20 +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
tv
9329c1e47d Merge remote-tracking branch 'prism/master' 2016-10-20 20:22:29 +02:00
tv
844d347ce7 lib: import bulk of krebs/4lib 2016-10-20 20:21:59 +02:00
lassulus
0f2a977831 remove haskellPackges.megaparsec 2016-10-20 09:48:42 +02:00
lassulus
bb2d4b10d3 m 5 newsbot-js: buildNodePackage via callPackage 2016-10-20 09:13:15 +02:00
makefu
789dbe2b26
m 5 go: buildNodePackage via callPackage 2016-10-20 08:49:22 +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
52f5027565 Merge remote-tracking branch 'cd/master' 2016-10-13 21:59:56 +02:00
tv
1a5f52234e krebs lib: move {eq,ne,mod} to lib 2016-10-13 21:51:27 +02:00
tv
b7cba02443 lib: don't define defaults that require config 2016-10-13 21:51:27 +02:00
tv
b4ec1fba50 lib: inline has-default-nix 2016-10-13 21:51:27 +02:00
tv
9cb65273b1 lib: remove addName* 2016-10-13 21:51:27 +02:00
tv
6c71792b6d krebs lib: with lib 2016-10-13 21:50:14 +02:00
lassulus
c419b951ef Merge remote-tracking branch 'cd/master' 2016-10-13 21:25:32 +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
tv
65165f422d Merge remote-tracking branch 'prism/master' 2016-10-13 20:33:45 +02:00
tv
38d26c551c exim: RIP 2016-10-13 19:46:11 +02:00
lassulus
76a2187972 remove comments from php config, phpfpm error 2016-10-12 12:14:57 +02:00
lassulus
798f90c0fd Merge remote-tracking branch 'prism/master' 2016-10-11 17:54:00 +02:00
tv
58c854c657 tv nixpkgs: 2568ee3 -> 45b2a6d 2016-10-08 09:30:51 +02:00
lassulus
fa5816431c Merge remote-tracking branch 'gum/master' 2016-10-06 07:45:31 +02:00
lassulus
928ac9f153 k 4 types: add default value for user.mail 2016-09-09 19:38:12 +02:00
makefu
71b41a206e
k 3 repo-sync: add more explicit documentation 2016-09-07 15:52:37 +02:00
makefu
541e21dcba
Merge remote-tracking branch 'prism/lassulus' 2016-09-07 14:58:31 +02:00
lassulus
1596df6441 k 3 rtorrent: fix tmux binary path 2016-08-24 23:07:05 +02:00
makefu
8f0f19c553
k 5 pwqgen: allow user-provided wordset 2016-08-24 22:05:02 +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
lassulus
d50198d880 Merge remote-tracking branch 'gum/master' 2016-08-21 13:16:56 +02:00
tv
66f5efe0f5 vncdotool: RIP (upstream dilapidated) 2016-08-21 13:10:16 +02:00
tv
315dde2dcf Merge remote-tracking branch 'prism/master' 2016-08-21 13:02:40 +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
524601b974 logf: don't call jq's gsub with empty regex :) 2016-08-11 21:01:51 +02:00
lassulus
1d9f7b4f2d k 5: add games-user-env 2016-08-10 18:24:46 +02:00
tv
c31c4e48b0 krebs internet-aliases: use explicit addresses 2016-08-09 20:00:02 +02:00
tv
3288d6848f Merge remote-tracking branch 'prism/master' 2016-08-07 09:54:10 +02:00
tv
3a760096f6 tarantool: init at 1.7.1-164-g0fd0239 2016-08-07 09:34:57 +02:00
lassulus
cbf66556af k 5 apt-cacher-ng: update 0.9.3 -> 0.9.3.2 2016-08-06 19:55:34 +02:00
lassulus
252bac92e8 k 3 buildbot: remove override (upstream fix) 2016-08-05 17:53:16 +02:00
lassulus
2d0824fb99 k 5 builders: add writePython{2,3} 2016-08-04 23:56:39 +02:00
tv
71a25b1875 logf: make urgency patterns configurable 2016-08-04 20:46:11 +02:00
tv
a264c571f3 logf: survive non-JSON input 2016-08-04 20:37:53 +02:00
tv
1bc62944e3 logf: add default color for undefined priority 2016-08-04 20:36:44 +02:00
tv
1e3dcaee3c logf: reduce redundant syntax 2016-08-04 20:06:08 +02:00
tv
e6aef09ad4 Merge remote-tracking branch 'gum/master' 2016-08-02 20:58:42 +02:00
tv
0928cc03a6 logf: init at 1.0.0 2016-08-02 20:39:26 +02:00
tv
1e3e6f7bbc writeJSON: init 2016-08-02 20:35:34 +02:00
tv
aa167d3e26 lib: import shell from krebs/4lib 2016-08-02 20:24:45 +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
de10a917de
k 4 types: tinc.extraConfig 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
18469388a6 k 5 exim: add pam support 2016-07-23 19:18:43 +02:00
lassulus
83090eb4a1 k 3: add genid_signed 2016-07-23 19:17:36 +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
835ddb0de0
m 1 vbob: document forticlientsslvpn mess 2016-07-18 18:57:36 +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
534850dc57 populate: 1.1.0 -> 1.1.1 2016-07-17 01:26:26 +02:00
tv
b8d9b1507e populate: add git to PATH 2016-07-17 01:12:30 +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
6f51a21125 populate: 1.0.0 -> 1.1.0 2016-07-17 00:53:21 +02:00
tv
514daf3d46 replace krebs.build.populate by populate 2016-07-17 00:53:21 +02:00
tv
49ad0a990d populate: init at 1.0.0 2016-07-16 21:44:04 +02:00
tv
26d716c781 urlwatch: 2.2 -> 2.5 2016-07-13 10:06:22 +02:00
makefu
393f5cb5c7
k 3 m: init honeydrive 2016-07-11 20:44:16 +02:00
tv
91ccc70745 Merge remote-tracking branch 'prism/master' 2016-07-09 13:11:05 +02:00
tv
dd9dbb3a89 urlwatch: 2.1 -> 2.2 2016-07-09 12:40:08 +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
lassulus
533b62bed6 Revert "buildbot: RIP"
This reverts commit c786da701a.
2016-07-03 20:57:21 +02:00
tv
3d0f7724cc writeJq: init 2016-07-03 20:46:48 +02:00
tv
7f0ea39a97 Merge remote-tracking branch 'prism/master' 2016-07-03 20:44:09 +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
814e823fcd secret-file: add defaults to all options 2016-07-03 19:45:29 +02:00
tv
57098e472a absolute-pathname: check stringLength > 0 2016-07-03 19:41:31 +02:00
lassulus
e4f4811fa7 Merge commit '2408e27fb198634c5e47885e5793ec2b96bcc3a5' 2016-07-01 14:49:28 +02:00
lassulus
3aeb97d9be k 5 go: set url to cgit.lassul.us 2016-07-01 12:04:16 +02:00
tv
75b2c8e6c9 prism: AKA cgit.prism.r 2016-07-01 01:07:20 +02:00
tv
1bacbe9309 go: echelon -> prism 2016-06-30 23:51:39 +02:00
tv
c786da701a buildbot: RIP 2016-06-30 22:44:27 +02:00
tv
2408e27fb1 ju: init 2016-06-30 22:41:44 +02:00
lassulus
b3fa9cbd7e Merge remote-tracking branch 'cd/master' 2016-06-30 21:51:09 +02:00
tv
7b46ccaba5 lib.getAttrs: init 2016-06-30 20:31:43 +02:00
tv
c6311d2187 writeOut: admit links 2016-06-30 19:11:08 +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
lassulus
d9e5800e93 k 5 go: set go server to prism 2016-06-30 09:16:39 +02:00
lassulus
7550c66311 Merge remote-tracking branch 'cd/master' 2016-06-30 09:16:10 +02:00
tv
d1853501f0 writeSed: init 2016-06-30 02:43:28 +02:00
tv
385b0345a6 mv: stash 2016-06-30 01:43:33 +02:00
tv
20a9f59061 get: 1.4.0 -> 1.4.1 2016-06-29 13:56:28 +02:00
lassulus
a8a3ac5640 k 5 Reaktor: fix build on newer nixpkgs 2016-06-28 17:54:33 +02:00
lassulus
1012224e67 little bit of code cleanup 2016-06-28 17:41:15 +02:00
lassulus
edcdd5f067 k 5: override buildbots sqlalchemy 2016-06-27 19:58:41 +02:00
makefu
f2a13d6281
k 3 m: add siem network, add ossim stub 2016-06-27 12:57:08 +02:00
lassulus
1fcc20aa49 k 5 git-hooks: add option for branches 2016-06-26 19:20:11 +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
2dd4dbbf6e scatter some sigils 2016-06-13 02:23:30 +02:00
tv
a16f438314 sprinkle with some write{B,D}ash 2016-06-13 02:10:02 +02:00
tv
fb226f3498 lib.genAttrs': init 2016-06-13 01:48:59 +02:00
tv
3846e08de8 types.{addr*,label,{host,file,{absolute-,}path}name}: use isString 2016-06-13 01:40:57 +02:00
tv
0cfce6d18d makeScriptWriter: init 2016-06-13 01:38:58 +02:00
tv
e769ff0838 lib.write{Files => Out}: admit file mode 2016-06-13 01:38:58 +02:00
tv
fcfe4b6461 types.file-mode: init 2016-06-13 01:38:58 +02:00
tv
2adb41310c lib.lpad: init 2016-06-13 01:23:44 +02:00
tv
3c61d227cf lib.guard: init 2016-06-13 01:16:21 +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
2f940d77f1
Merge remote-tracking branch 'cd/master' 2016-06-12 19:01:34 +02:00
tv
29442eda7c krebs {absolute,}-pathname: admit harder 2016-06-12 18:13:05 +02:00
makefu
ed1d336fc8
Merge remote-tracking branch 'cd/master' 2016-06-12 17:49:59 +02:00
tv
fb8be5838a writeFiles: init 2016-06-12 13:54:05 +02:00
tv
8353b1293e krebs {{absolute-,}path,user}name: mergeOneOption 2016-06-11 16:36:42 +02:00
tv
cda4c2d96b krebs types.filename: maximize strictness 2016-06-11 16:35:13 +02:00
tv
c80aee7a0b krebs types.filename: admit <underscore> 2016-06-11 16:27:47 +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
276bbe725f Merge remote-tracking branch 'gum/master' 2016-06-08 11:11:41 +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
5e91e789b6 krebs types.absolute-pathname: admit / 2016-06-07 23:22:12 +02:00
tv
78dfd1fee8 cgit: RIP 2016-06-07 23:10:27 +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
f90f8dc000 empty: init at 1.0.0 2016-06-07 22:51:35 +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
6fcc35afb0 krebs types.uint: init 2016-06-07 22:36:58 +02:00
tv
b5bdd9aed4 krebs.git.cgit :: { bool => submodule { enable :: bool } } 2016-06-07 03:11:26 +02:00
tv
39ebd5001e getAttrDef: RIP 2016-06-07 02:15:58 +02:00
makefu
49ac020be0
k 5 acng: 0.8.8 -> 0.9.3 2016-06-06 21:58:17 +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
tv
a0a2606f8d krebs pkgs.writeBash{,Bin}: init 2016-06-05 00:24:42 +02:00
tv
fc826f8f7a krebs pkgs.{writeHaskellBin => writeHaskell} 2016-06-04 19:48:43 +02:00
tv
ed56f41ddc krebs types.haskell.{con,mod}id: init 2016-06-04 19:06:50 +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
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
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
6d93cb6bf1 k 5 newsbot-js: bump rev 802b172 -> 09e0163 2016-03-15 14:28:13 +01:00
lassulus
5a3c98aec7 l 5 newsbot-js -> k 5 newsbot-js 2016-03-15 14:26:51 +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
1219465af9 Merge branch 'master' of gum:stockholm-bare 2016-03-11 08:52:58 +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
8629a9de8b infest-cac-centos7: target => system 2016-03-10 15:23:36 +01:00
makefu
c61496e77e Merge branch 'master' of gum.krebsco.de:stockholm 2016-03-10 10:16:11 +01:00
makefu
4ca96e8b04 k 5 test/infest-cac-centos7: remove hardcoded path 2016-03-10 10:09:10 +01:00
makefu
5d6cf7bf71 add proot dependency 2016-03-10 09:09:47 +01:00
makefu
dcf8e3fb32 Merge remote-tracking branch 'cd/master' 2016-03-10 08:03:41 +01:00
makefu
95dcf70cd6 k 5 infest-cac-centos7: 0.2.0 -> 0.2.6
so much stuff happened
2016-03-09 22:51:04 +01:00
makefu
05e4f0f7b5 k 4 infest/prepare: build nixos-install 2016-03-09 22:49:29 +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