Commit Graph

830 Commits

Author SHA1 Message Date
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