Commit Graph

1064 Commits

Author SHA1 Message Date
lassulus
714cdec79c Merge remote-tracking branch 'gum/master' 2017-07-18 17:43:39 +02:00
makefu
7fa327dde1
wbob.r: cores = 4 2017-07-16 23:29:03 +02:00
lassulus
5b3d5572a5 krebs lass: add wine-mors pubkey 2017-07-16 21:34:23 +02:00
lassulus
205f3d3adb krebs: remove duplicate mail setting 2017-07-16 12:12:45 +02:00
tv
58380c8284 merge shared into krebs 2017-07-14 00:21:02 +02:00
tv
7fdc46bb9d move source config from module system to 1systems/*/source.nix 2017-07-10 11:05:48 +02:00
makefu
5c26d65ae4
urlwatch: filter _module with kv
before this commit { url= ...; filter=... } didn't work because
the result contained _module
2017-07-02 23:08:09 +02:00
makefu
c36d644059
urlwatch: set dataDir to home of urlwatch user
otherwise /var/empty will be used which then will clash
with exim which tries to create Maildir in this folder
explicitly setting the home directory in users also
avoids the usage of execstartpre in favor of createHome
2017-07-02 21:10:29 +02:00
makefu
01a4ed89c7
gum.r: provide iodine endpoint
gum now runs io.krebsco.de (was configured before but not exposed
via the DNS zone file)
2017-07-02 12:41:14 +02:00
tv
62e50105ba krebs.build.source: stockholm default is <stockholm> 2017-06-27 23:48:05 +02:00
lassulus
c759f78312 k 3 setuid: activate only if cfg is not empty 2017-06-24 16:36:37 +02:00
tv
bae426857e krebs: update ciko's mail address 2017-06-18 18:55:07 +02:00
tv
faea33e1cb Merge remote-tracking branch 'prism/master' 2017-06-18 16:12:54 +02:00
tv
9f75e81c5f lib: add test and testString 2017-06-18 15:49:54 +02:00
makefu
2c54c12664
k 3 m: add ulrich 2017-06-18 14:47:07 +02:00
makefu
78ba83b1ee
k 3 tinc_graphs: graph.krebsco.de is the new default 2017-06-18 14:03:43 +02:00
makefu
a3a19729d0
k 3 m: adopt horisa 2017-06-13 21:19:33 +02:00
tv
811ceaa243 Merge remote-tracking branch 'prism/master' 2017-06-04 06:20:54 +02:00
tv
4f58b884dd krebsco.de MX: cd -> ni 2017-06-02 03:58:13 +02:00
lassulus
e50bc4f3eb Merge remote-tracking branch 'gum/master' 2017-06-01 12:49:36 +02:00
lassulus
73b073c3fe lass: RIP helios 2017-06-01 12:49:21 +02:00
makefu
bb4c3d978a
m: add hound to omo, wikisearch.krebsco.de 2017-06-01 10:12:43 +02:00
lassulus
a9f0332f9c k 3 l: define managed for every host 2017-05-19 00:25:27 +02:00
lassulus
0c2dc4ff66 tinc module: add option enableLegacy 2017-05-16 23:20:37 +02:00
lassulus
fe639f585e k3: retiolum.nix -> tinc.nix 2017-05-16 22:18:54 +02:00
tv
a89e7a5c75 krebs.tinc: expose confDir 2017-05-16 22:18:48 +02:00
lassulus
58a7a56eef Merge remote-tracking branch 'gum/master' 2017-05-12 19:30:07 +02:00
makefu
f65349a3bc
k 3 m: retab 2017-05-12 11:30:26 +02:00
lassulus
d95ff6942d l 3 l: .internet -> .i 2017-05-11 16:16:13 +02:00
lassulus
4f8dbc57c4 Merge remote-tracking branch 'ni/master' 2017-05-09 23:43:46 +02:00
tv
66f9170f52 retiolum-hosts: init 2017-05-09 23:42:18 +02:00
makefu
fb1fff243a
Merge remote-tracking branch 'lass/master' 2017-05-09 23:17:30 +02:00
tv
1b77fcae88 krebs.dns.providers: drop internet and retiolum 2017-05-09 23:15:32 +02:00
makefu
991687f742
m studio: init 2017-05-09 22:52:53 +02:00
lassulus
f83a90fd7d k 3 l: add sokrateslaptop 2017-05-09 22:45:16 +02:00
tv
15a56cb20a tv: mv-cd -> mv-ni 2017-05-06 10:23:11 +02:00
makefu
5cfbfd46bf
m gum: move to netcup 2017-05-02 14:03:25 +02:00
lassulus
4cc5b5c104 Merge remote-tracking branch 'gum/master' 2017-04-30 19:54:09 +02:00
lassulus
c5b1857384 Merge remote-tracking branch 'ni/master' 2017-04-30 18:31:11 +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
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
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
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
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
8f89bb5d3d k 3 hidden-ssh: start after network-online.target 2017-04-16 23:31:46 +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
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
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
fac92f5b28
k 3 m: disable v6 address for gum 2017-03-31 14:22:42 +02:00
lassulus
0c0d9472a6 k 3 l: update shodan pubkey 2017-03-25 11:15:25 +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
552a3e8f28 k 3: add htgen 2017-03-16 20:56:28 +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
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
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
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
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
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