Commit Graph

337 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
makefu
c7568df0e2 k 5 cacpanel: bump version 2015-11-27 23:10:05 +01:00
makefu
4234745645 k 5 drivedroid-gen-repo: bump version 2015-11-25 22:00:54 +01:00
makefu
f12ded12c6 k 5: cacpy -> cacpanel 2015-11-23 07:53:42 +01:00
makefu
c8a920c6d9 Merge remote-tracking branch 'cloudkrebs/master' 2015-11-22 13:23:11 +01:00
makefu
c2885e2491 Merge remote-tracking branch 'cd/master' 2015-11-22 13:22:57 +01:00
makefu
e28930340b k 5 cacpy: init at 0.6.0 2015-11-22 13:22:30 +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
tv
3a34a2e0b0 krebs pkgs: s/retiolum/internet/ 2015-11-18 00:27:07 +01:00
lassulus
718c672e7c Merge remote-tracking branch 'cd/master' 2015-11-17 23:22:02 +01:00
makefu
a207bfd482 Merge branch 'master' of http://cgit.cd/stockholm 2015-11-17 23:20:59 +01:00
tv
63da8c4f6a Zhosts: add stro 2015-11-17 23:19:59 +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
9e2ac199d5 k 5 drivedroid-gen-repo: init at 0.4.2 2015-11-17 22:18:32 +01:00
makefu
7346527c4f pubkeys: add exco 2015-11-17 22:15:31 +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
makefu
773a67a983 Merge remote-tracking branch 'cloudkrebs/master' into pre-merge 2015-11-14 01:51:36 +01:00
makefu
a0fbe917ac Merge remote-tracking branch 'cd/master' into pre-merge 2015-11-14 01:50:39 +01:00
lassulus
07dca51963 l 5 go -> k 5 go 2015-11-13 14:53:26 +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
lassulus
e6b3931daf Merge remote-tracking branch 'pnp/master' 2015-11-12 14:15:57 +01:00
makefu
5ac356be52 Merge branch 'master' of pnp:stockholm 2015-11-10 19:01:43 +01:00
makefu
94a394539d infest: add curl to debian deps 2015-11-10 18:52:50 +01:00
makefu
45cb096a87 krebs: expose krebs.populate 2015-11-10 12:58:09 +01:00
tv
193bb70e2e {tv => krebs} git lib & git hooks 2015-11-09 19:07:26 +01:00
tv
1f4d7ffa50 tv git: move old stuff to the museum section 2015-11-09 18:34:02 +01:00
tv
604ce6bd59 xmonad-stockholm: init at 1.0.0 2015-11-09 17:56:47 +01:00
tv
b0094ce0e4 stockholm: check if default.nix exists before importing 2015-11-09 02:58:21 +01:00
makefu
c9032105eb Reaktor: bump version 2015-11-08 14:04:25 +01:00
tv
610a3ce59c push: 1.1.0 -> 1.1.1 2015-11-08 12:46:56 +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