Commit Graph

243 Commits

Author SHA1 Message Date
makefu
65cc52e01e Merge branch 'master' of pnp:stockholm
Conflicts:
	makefu/1systems/gum.nix
2015-12-04 10:16:09 +01:00
makefu
597f9e8597 k 3 tinc_graphs: add timeout 2015-12-03 20:39:29 +01:00
makefu
c7bb244bdf m 1 gum: provides mattermost via docker container 2015-11-27 23:10:44 +01:00
lassulus
f531e7e625 Merge remote-tracking branch 'pnp/master' 2015-11-21 14:25:02 +01:00
lassulus
a020268317 Merge remote-tracking branch 'cd/master' 2015-11-21 14:24:46 +01:00
tv
817a78c711 krebs: add cgit.stro.retiolum 2015-11-18 01:20:17 +01:00
lassulus
718c672e7c Merge remote-tracking branch 'cd/master' 2015-11-17 23:22:02 +01:00
makefu
84743dcd4a Merge remote-tracking branch 'cd/master' 2015-11-17 23:14:28 +01:00
makefu
0f54a195b7 acng: also add nar files to cache 2015-11-17 23:11:29 +01:00
makefu
a3e074094b k 3 apt-cacher-ng: add CAfile 2015-11-17 23:03:21 +01:00
makefu
b8dea556e9 k 3 shared: shack ip was already in use 2015-11-17 22:26:11 +01:00
makefu
5aed0a395b shared wolf: static ip, fix todo 2015-11-17 22:15:07 +01:00
tv
dba0db28d9 mv: init 2015-11-17 19:04:32 +01:00
makefu
5a450ad787 apt-cacher-ng is imported by krebs modules 2015-11-17 13:49:29 +01:00
makefu
4c26fb9383 k 3 apt-cacher-ng: fix whitespace 2015-11-17 13:29:56 +01:00
makefu
48c9789141 apt-cacher-ng: init package and module
once apt-cacher-ng arrives in nixos stable it will be removed from stockholm
2015-11-17 12:16:51 +01:00
makefu
dcf55255e6 Merge branch 'master' of pnp:stockholm 2015-11-15 20:18:35 +01:00
lassulus
d0a573c4c5 k 3 l: bump echelon internet addr 2015-11-14 17:54:08 +01:00
lassulus
a204949071 move testhosts to shared from lass 2015-11-13 13:05:19 +01:00
makefu
383d875023 tinc_graphs: always restart 2015-11-13 12:24:43 +01:00
lassulus
58eab5df69 l 3 go -> k 3 go 2015-11-13 01:18:30 +01:00
tv
bbcdef021a Merge remote-tracking branches 'mors/master' and 'pnp/master' 2015-11-07 10:38:27 +01:00
tv
8ad05d0f40 Merge remote-tracking branch 'cd/master' 2015-11-07 09:48:06 +01:00
tv
d590cf26cd xu: bump ssh key 2015-11-07 09:45:43 +01:00
tv
1d8be110e1 nomic: bump ssh key 2015-11-07 09:43:05 +01:00
makefu
9a0e67cf65 Merge remote-tracking branch 'cd/master' 2015-11-06 22:38:44 +01:00
makefu
736e1426d5 Merge branch 'master' of pnp:stockholm 2015-11-06 22:23:46 +01:00
tv
4d93a8215f krebs.build.source.dir.host defaults to current.host 2015-11-06 22:20:26 +01:00
tv
a0c068d6ec {tv => krebs} per-user 2015-11-06 21:37:58 +01:00
tv
f58d024f48 tv: add users.tv_{wu,nomic}.pubkey 2015-11-06 19:45:50 +01:00
makefu
e8ad43c082 k 4 makefu: add filepimp 2015-11-06 10:59:40 +01:00
makefu
2e785e6be5 k 3 makefu: wry handles blog and wiki 2015-11-05 12:31:54 +01:00
makefu
625cfe81a0 Merge remote-tracking branch 'cd/master' 2015-11-05 11:10:14 +01:00
tv
9b985720ea nomic: fix ssh.{priv,pub}key 2015-11-02 13:51:03 +01:00
lassulus
f171c53dd8 k 3 l: use rsa keys in prism 2015-11-01 19:52:49 +01:00
lassulus
10779f3cb9 Merge remote-tracking branch 'pnp/master' 2015-10-31 00:14:35 +01:00
lassulus
8dd8ddb27d lass: add prism host 2015-10-30 16:05:51 +01:00
lassulus
2ba85cff33 k 3 l: echelon has 2 cores 2015-10-29 15:12:46 +01:00
makefu
84ebd8c021 m 1 wry: serve euer wiki 2015-10-28 22:06:17 +01:00
makefu
c6ca11062a m 1 gum: prepare stockholm 2015-10-28 15:06:41 +01:00
makefu
526adba3c8 k 3 urlwatch: add verbose flag 2015-10-26 00:17:48 +01:00
makefu
6425831452 k 3 tinc_graphs: is now completely self-contained 2015-10-25 21:54:59 +01:00
lassulus
43b856994f Merge remote-tracking branch 'cd/master' 2015-10-25 21:27:26 +01:00
makefu
bb16a38df6 Merge remote-tracking branch 'cd/master' 2015-10-25 18:17:14 +01:00
makefu
cca25c7b66 wry: listen for graphs.retiolum 2015-10-25 18:06:46 +01:00
tv
8f15daf2ea init krebs.current 2015-10-25 14:15:21 +01:00
tv
daa8fe2aa8 init users.shared.wolf 2015-10-25 14:08:51 +01:00
tv
3dcc050cd9 Merge remote-tracking branches 'mors/master' and 'pnp/master' 2015-10-24 10:07:00 +02:00
makefu
a1d05482e5 Merge remote-tracking branch 'cloudkrebs/master' 2015-10-23 15:38:01 +02:00
makefu
709ebf6bbc krebs 3 zone-generation: for consistency, add newline at the end 2015-10-23 15:31:31 +02:00
makefu
5842130703 wrong MX entry resulted in inability to upload zone 2015-10-23 14:39:35 +02:00
lassulus
93dcfe5ad6 Merge remote-tracking branch 'cd/master' 2015-10-22 20:21:01 +02:00
tv
128e5feae9 Merge remote-tracking branch 'pnp/master' 2015-10-22 20:14:01 +02:00
makefu
f092e6acb4 krebs 3 zones: remove empty lines 2015-10-22 17:17:04 +02:00
makefu
be39c6d849 krebs 3 bepasty-server: styling 2015-10-22 16:14:37 +02:00
makefu
9bb3069f69 krebs 3 tinc_graphs: mv from makefu 3 tinc_graphs 2015-10-22 15:33:05 +02:00
makefu
9be59a0400 krebs 3 modules: bepasty-server is a krebs module 2015-10-22 15:26:54 +02:00
lassulus
692a59423a Merge remote-tracking branch 'pnp/master' 2015-10-21 19:06:48 +02:00
makefu
6eb195b0bc wry: is the new provider for paste.krebsco.de 2015-10-21 18:49:20 +02:00
makefu
dc1bb40c45 krebs 3 nginx: extraConfig is type string 2015-10-21 18:44:51 +02:00
lassulus
864f39634b Merge remote-tracking branch 'cd/master' 2015-10-21 13:52:20 +02:00
lassulus
14f08e2a1c k 3 l: add cores to testsystems 2015-10-21 13:51:10 +02:00
tv
b55f07e57a mkdir: 104.233.84.215 -> 104.167.114.142 2015-10-21 13:48:53 +02:00
lassulus
a19cf6d4a3 Merge remote-tracking branch 'cd/master' 2015-10-21 13:40:23 +02:00
tv
0863983b7d wu: add alias cgit.wu.retiolum 2015-10-21 13:16:04 +02:00
tv
3ce57c3de3 stockholm: provide krebs lib 2015-10-21 01:53:07 +02:00
lassulus
309102967e l: add test systems 2015-10-21 01:52:47 +02:00
tv
226ea391ca stockholm: provide krebs lib 2015-10-21 00:11:12 +02:00
lassulus
114bbe669a Merge remote-tracking branch 'pnp/master' 2015-10-20 23:47:39 +02:00
lassulus
f6187b3796 Merge remote-tracking branch 'cd/master' 2015-10-20 23:47:29 +02:00
makefu
0bc015bf3c krebs 3 retiolum-bootstra: use nginx listen list
consolidate nginx servers into 1, provide a means to override the listen
addresses.
2015-10-20 20:00:05 +02:00
makefu
e0eed572ec Merge remote-tracking branch 'cd/master' 2015-10-20 19:17:25 +02:00
tv
b2fd7be3ff nginx service: allow multiple listen entries 2015-10-20 18:53:11 +02:00
makefu
ded0821d9b m 1,2 : wry serves as iodine entry point 2015-10-19 23:46:10 +02:00
makefu
8d3ebfc096 krebs 3 retiolum-bootstrap: fix assert todo 2015-10-19 21:57:05 +02:00
makefu
858034cc61 m 1 wry: host is the new provider for tinc.krebsco.de 2015-10-19 21:51:20 +02:00
makefu
754ea55ab8 krebs 3 retiolum-bootstrap: init module 2015-10-19 21:50:25 +02:00
tv
dc52c4b988 nginx service: replace port by listen 2015-10-19 20:42:18 +02:00
tv
222ca361e3 nginx service: add port option and extraConfig 2015-10-19 20:36:09 +02:00
lassulus
ffef87c5df l: specify krebs.hosts.*.nets.gg23 2015-10-18 17:50:54 +02:00
tv
8af96d3245 tv: specify krebs.hosts.*.nets.gg23 2015-10-18 16:14:07 +02:00
tv
d50d582560 add krebs.dns.providers.gg23 2015-10-18 16:12:14 +02:00
tv
c9a3d1a3d9 tv extraZones: set TTL to 60 2015-10-17 21:42:03 +02:00
tv
5c5b421b20 Merge remote-tracking branch 'pnp/master' 2015-10-17 21:33:23 +02:00
tv
9f4f51b1c7 cd,ire: add extraZones 2015-10-17 21:32:59 +02:00
makefu
5d0e4243bf krebs 3 makefu: remove retard entries for pigstarter 2015-10-17 21:21:13 +02:00
tv
9efe536e45 cd: claim cgit.cd.krebsco.de 2015-10-17 18:31:27 +02:00
makefu
f83b3770dd krebs 2 Reaktor: Delay Restart of Reaktor - avoid fast restart loops 2015-10-17 11:17:54 +02:00
tv
335ea5a4c1 Merge remote-tracking branch 'mors/master' 2015-10-14 19:24:36 +02:00
lassulus
69098a4847 use go as url-shortener for newsbot-js 2015-10-14 19:22:44 +02:00
tv
96f4248b65 Merge remote-tracking branch 'cloudkrebs/master' 2015-10-09 14:48:58 +02:00
tv
694c79a5bc github-hosts-sync service: fix directory creation 2015-10-09 14:32:45 +02:00
tv
51e4b62de2 krebs.github-host-sync.ssh-identity-file: fix type 2015-10-09 14:11:38 +02:00
tv
87fa7792e3 disband github-known_hosts harder 2015-10-09 13:34:25 +02:00
lassulus
938b6fe278 Merge remote-tracking branch 'nomic/master' 2015-10-09 13:27:02 +02:00
tv
f1cc52aeaf known_hosts: GitHub is 192.30.252.0/22 2015-10-09 13:18:21 +02:00
tv
9ae6d1611e add github.com and its addrs4 to known_hosts 2015-10-09 12:06:00 +02:00
makefu
2460a6c226 krebs 3 realwallpaper: actually start realwallpaper as timer 2015-10-07 15:20:12 +02:00
lassulus
eabf194460 krebs 3 lass: add ssh pubkeys 2015-10-05 16:33:41 +02:00
lassulus
cf28831057 move realwallpaper to krebs 3 2015-10-05 14:49:36 +02:00