summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'pnp/master'lassulus2015-11-218-8/+216
|\
| * Merge remote-tracking branch 'cd/master'makefu2015-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
| * | 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
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'cd/master' into pre-mergemakefu2015-11-147-10/+243
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of pnp:stockholmmakefu2015-11-102-0/+2
| |\ \ \ \ \
| * | | | | | Reaktor: bump versionmakefu2015-11-081-2/+2
* | | | | | | Merge remote-tracking branch 'cd/master'lassulus2015-11-217-6/+7
|\ \ \ \ \ \ \
| * | | | | | | krebs: add cgit.stro.retiolumtv2015-11-181-0/+1
| * | | | | | | krebs pkgs: s/retiolum/internet/tv2015-11-186-6/+6
* | | | | | | | Merge remote-tracking branch 'cd/master'lassulus2015-11-173-0/+50
|\| | | | | | |
| * | | | | | | Zhosts: add strotv2015-11-171-0/+10
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | mv: inittv2015-11-172-0/+40
| | |_|/ / / | |/| | | |
* | | | | | k 3 l: bump echelon internet addrlassulus2015-11-141-1/+1
| |_|_|/ / |/| | | |
* | | | | 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
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | infest: add curl to debian depsmakefu2015-11-101-0/+1
| * | krebs: expose krebs.populatemakefu2015-11-101-0/+1
| |/
* | {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 'cd/master'makefu2015-11-065-5/+51
| | |\
| | * \ Merge branch 'master' of pnp:stockholmmakefu2015-11-066-3/+80
| | |\ \
| | | * | k 5 krebspaste: resolve TODO, retiolum is always securemakefu2015-11-051-3/+1
| | | * | krebs 5 krebspaste: initial commitmakefu2015-11-052-0/+31
| | | * | k 3 makefu: wry handles blog and wikimakefu2015-11-051-1/+4
| | | * | k 5 translate-shell: init at 0.9.0.9makefu2015-11-051-0/+43
| | | * | Merge remote-tracking branch 'cd/master'makefu2015-11-052-2/+4
| | | |\ \
| | * | | | k 4 makefu: add filepimpmakefu2015-11-061-0/+24
| | |/ / /
| | * | | k Zhosts gum: remove paste.krebsco.de aliasmakefu2015-11-051-1/+0
| * | | | Merge remote-tracking branch 'pnp/master'lassulus2015-11-011-2/+2
| |\| | |
| | * | | collectd-connect-time: bump to 0.3.0makefu2015-11-011-2/+2
| * | | | k 3 l: use rsa keys in prismlassulus2015-11-011-2/+2
| |/ / /
| * | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-315-4/+57
| |\ \ \
| | * \ \ Merge branch 'master' of pnp:stockholmmakefu2015-10-281-0/+15
| | |\ \ \