summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master'makefu2016-03-167-27/+175
|\
| * krebs types += tinc-pubkeytv2016-03-161-1/+3
| * krebs types += pgp-pubkey, user.pgp.pubkeytv2016-03-162-1/+14
| * krebs types += ssh-{priv,pub}keytv2016-03-161-21/+23
| * krebs lib += getAttrDeftv2016-03-161-0/+1
| * krebs types.host.ssh.pubkeys: trace only own missing keystv2016-03-161-4/+4
| * krebs lib += optionalTracetv2016-03-161-1/+3
| * krebs.users.tv.pgp.pubkey: 2CAEE3B5tv2016-03-161-0/+29
| * Merge remote-tracking branch 'gum/master'tv2016-03-1617-102/+351
| |\
| * | krebs.backup: use krebs.on-failuretv2016-03-151-0/+6
| * | krebs.on-failure: inittv2016-03-152-0/+92
| * | tv git: add newbot-jstv2016-03-151-0/+1
* | | Merge branch 'master' of gum:stockholmmakefu2016-03-161-6/+23
|\ \ \ | | |/ | |/|
| * | add new retiolum short form to default hostnamesmakefu2016-03-151-0/+1
| * | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-03-159-17/+5
| |\ \
| * | | k 3 nginx: add default404 optionmakefu2016-03-151-6/+22
* | | | k 3 ma: add default and brainmakefu2016-03-162-0/+115
| |/ / |/| |
* | | ma 2: use tinc-pre per defaultmakefu2016-03-159-17/+5
|/ /
* | ma 1 darth: add omo ssh pubkeymakefu2016-03-111-0/+3
* | Merge branch 'master' of gum:stockholm-baremakefu2016-03-113-10/+11
|\|
| * infest-cac-centos7: target => systemmakefu2016-03-102-6/+6
| * Merge remote-tracking branch 'gum/master'tv2016-03-1021-73/+223
| |\
| * | Makefile: define nixos-config using ?=tv2016-03-101-3/+2
| * | Makefile: ifndef HOSTNAME, def ittv2016-03-101-1/+3
* | | s 1 wolf: use tinc_pre for local discoverymakefu2016-03-113-0/+5
* | | s 2 base: use default connectTomakefu2016-03-111-9/+1
* | | k 3 makefu: add hosts near to my heart <3makefu2016-03-111-35/+235
* | | ma 2 tinc-basic-retiolum: RIPmakefu2016-03-119-37/+32
* | | k 3 retiolum: pigstarter -> [ prism cd ]makefu2016-03-111-1/+1
* | | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-03-106-31/+83
|\ \ \ | | |/ | |/|
| * | k 5 test/infest-cac-centos7: remove hardcoded pathmakefu2016-03-101-1/+1
| * | add proot dependencymakefu2016-03-101-2/+3
| * | Merge remote-tracking branch 'cd/master'makefu2016-03-1028-48/+278
| |\|
| * | s 2 base: bump nixpkgsmakefu2016-03-091-1/+1
| * | k 5 infest-cac-centos7: 0.2.0 -> 0.2.6makefu2016-03-092-22/+58
| * | k 4 infest/prepare: build nixos-installmakefu2016-03-091-0/+14
| * | ma 1 omo: replace crypt2makefu2016-03-082-6/+7
* | | s 2 shared: build without debugmakefu2016-03-101-2/+1
* | | ma 1 filepimp: remove disk2makefu2016-03-061-7/+20
* | | add darthmakefu2016-03-062-1/+38
* | | Merge remote-tracking branch 'cd/master'makefu2016-03-0628-48/+278
|\ \ \ | |/ / |/| / | |/
| * nq: RIPtv2016-03-054-19/+0
| * krebs pkgs: detect old overridestv2016-03-051-5/+18
| * cgit: init at 0.12tv2016-03-051-0/+64
| * krebs.exim-smarthost to-lsearch: append \n to each entrytv2016-03-051-1/+1
| * krebs.exim-smarthost.dkim: support multiple domainstv2016-03-052-21/+26
| * tv exim-smarthost: set dkim.domaintv2016-03-051-0/+3
| * krebs.exim-smarthost: add DKIM support to remote_smtptv2016-03-051-2/+44
| * krebs.nginx: don't include (redundant) mime.typestv2016-03-051-1/+0
| * tv nginx: expose /etc/os-releasetv2016-03-056-3/+21