summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Collapse)AuthorAgeFilesLines
* k Zpubkeys: makefu* -> 3modulesmakefu2015-12-145-6/+14
|
* Merge branch 'master' of pnp:stockholmmakefu2015-12-0412-9/+40
|\ | | | | | | | | Conflicts: makefu/1systems/gum.nix
| * m 1 gum: provides mattermost via docker containermakefu2015-11-271-0/+2
| |
| * k 5 cacpanel: bump versionmakefu2015-11-271-2/+2
| |
| * k 5 drivedroid-gen-repo: bump versionmakefu2015-11-251-2/+2
| |
| * k 5: cacpy -> cacpanelmakefu2015-11-232-20/+18
| |
| * Merge remote-tracking branch 'cloudkrebs/master'makefu2015-11-221-1/+1
| |\
| | * Merge remote-tracking branch 'pnp/master'lassulus2015-11-218-8/+216
| | |\
| | * \ Merge remote-tracking branch 'cd/master'lassulus2015-11-217-6/+7
| | |\ \
| | * \ \ Merge remote-tracking branch 'cd/master'lassulus2015-11-173-0/+50
| | |\ \ \
| | * | | | k 3 l: bump echelon internet addrlassulus2015-11-141-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'cd/master'makefu2015-11-227-6/+7
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | krebs: add cgit.stro.retiolumtv2015-11-181-0/+1
| | | | | |
| | * | | | krebs pkgs: s/retiolum/internet/tv2015-11-186-6/+6
| | | |/ / | | |/| |
| * | | | k 5 cacpy: init at 0.6.0makefu2015-11-221-0/+20
| | | | |
| * | | | Merge branch 'master' of http://cgit.cd/stockholmmakefu2015-11-171-0/+10
| |\| | | | | |_|/ | |/| |
| | * | Zhosts: add strotv2015-11-171-0/+10
| | | |
* | | | k 3 tinc_graphs: add timeoutmakefu2015-12-031-1/+1
|/ / /
* | | Merge remote-tracking branch 'cd/master'makefu2015-11-172-0/+40
|\| |
| * | mv: inittv2015-11-172-0/+40
| | |
* | | acng: also add nar files to cachemakefu2015-11-171-1/+1
| | |
* | | k 3 apt-cacher-ng: add CAfilemakefu2015-11-171-0/+1
| | |
* | | k 3 shared: shack ip was already in usemakefu2015-11-171-1/+1
| | |
* | | k 5 drivedroid-gen-repo: init at 0.4.2makefu2015-11-171-0/+22
| | |
* | | pubkeys: add excomakefu2015-11-171-0/+1
| | |
* | | shared wolf: static ip, fix todomakefu2015-11-172-5/+11
| | |
* | | apt-cacher-ng is imported by krebs modulesmakefu2015-11-171-0/+1
| | |
* | | k 3 apt-cacher-ng: fix whitespacemakefu2015-11-171-34/+35
| | |
* | | apt-cacher-ng: init package and modulemakefu2015-11-172-0/+176
| | | | | | | | | | | | once apt-cacher-ng arrives in nixos stable it will be removed from stockholm
* | | Merge branch 'master' of pnp:stockholmmakefu2015-11-151-1/+1
|\ \ \
| * | | tinc_graphs: always restartmakefu2015-11-131-1/+1
| | | |
* | | | Merge remote-tracking branch 'cloudkrebs/master' into pre-mergemakefu2015-11-146-32/+200
|\ \ \ \ | | |_|/ | |/| |
| * | | l 5 go -> k 5 golassulus2015-11-132-0/+101
| | | |
| * | | move testhosts to shared from lasslassulus2015-11-132-32/+32
| |/ /
| * | l 3 go -> k 3 golassulus2015-11-132-0/+67
| | |
| * | Merge remote-tracking branch 'pnp/master'lassulus2015-11-122-0/+2
| |\ \ | | |/ | |/|
* | | Merge remote-tracking branch 'cd/master' into pre-mergemakefu2015-11-147-10/+243
|\| |
| * | {tv => krebs} git lib & git hookstv2015-11-093-2/+214
| | |
| * | tv git: move old stuff to the museum sectiontv2015-11-091-0/+3
| | |
| * | xmonad-stockholm: init at 1.0.0tv2015-11-091-0/+16
| | |
| * | stockholm: check if default.nix exists before importingtv2015-11-091-0/+2
| | |
| * | push: 1.1.0 -> 1.1.1tv2015-11-081-4/+3
| | |
| | |
| | \
| *-. \ Merge remote-tracking branches 'mors/master' and 'pnp/master'tv2015-11-0713-9/+231
| |\ \ \
| | * \ \ Merge remote-tracking branch 'pnp/master'lassulus2015-11-011-2/+2
| | |\ \ \
| | * | | | k 3 l: use rsa keys in prismlassulus2015-11-011-2/+2
| | | | | |
| * | | | | Merge remote-tracking branch 'cd/master'tv2015-11-073-1/+40
| |\ \ \ \ \
| * | | | | | xu: bump ssh keytv2015-11-071-1/+2
| | | | | | |
| * | | | | | nomic: bump ssh keytv2015-11-071-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of pnp:stockholmmakefu2015-11-102-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | infest: add curl to debian depsmakefu2015-11-101-0/+1
| | | | | | |