Commit Graph

193 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