summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | krebs: expose krebs.populatemakefu2015-11-101-0/+1
| | |_|_|_|/ | |/| | | |
* / | | | | Reaktor: bump versionmakefu2015-11-081-2/+2
|/ / / / /
* | | | | Merge remote-tracking branch 'cd/master'makefu2015-11-065-5/+51
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | krebs.build.source.dir.host defaults to current.hosttv2015-11-061-1/+4
| * | | | {tv => krebs} per-usertv2015-11-062-0/+36
| |/ / /
| * | | tv: add users.tv_{wu,nomic}.pubkeytv2015-11-062-4/+11
* | | | 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
| |\| | |
| | * | | nomic: fix ssh.{priv,pub}keytv2015-11-021-1/+2
| | * | | krebs.init: talk about ssh.privkey.pathtv2015-11-021-0/+1
| | * | | krebs nix-install: softcode using target-pathtv2015-11-021-1/+1
* | | | | k 4 makefu: add filepimpmakefu2015-11-061-0/+24
|/ / / /
* | | / k Zhosts gum: remove paste.krebsco.de aliasmakefu2015-11-051-1/+0
| |_|/ |/| |
* | | collectd-connect-time: bump to 0.3.0makefu2015-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
| |\ \
| | * | krebs 5 collectd-connect-time: bump version (again)makefu2015-10-281-2/+2
| | * | k 5 collectd-connect-time: bump to 0.2.0makefu2015-10-271-2/+2
| | * | Merge branch 'master' of pnp:stockholmmakefu2015-10-2718-90/+284
| | |\ \
| | * | | k 5 collectd-connect-time: initial commitmakefu2015-10-271-0/+15
| * | | | m 1 wry: serve euer wikimakefu2015-10-281-2/+3
| * | | | m 1 gum: prepare stockholmmakefu2015-10-281-1/+2
| | |/ / | |/| |
| * | | k 3 urlwatch: add verbose flagmakefu2015-10-261-1/+8
| * | | tinc_graphs: clean up mv {makefu,krebs}makefu2015-10-261-2/+2
| * | | k 3 tinc_graphs: is now completely self-containedmakefu2015-10-252-2/+31
| * | | Merge remote-tracking branch 'cd/master'makefu2015-10-255-0/+84
| |\ \ \ | | | |/ | | |/|
* | | | krebs 4 infest prepare.sh: update pacman databaselassulus2015-10-301-0/+1