summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2016-03-1614-40/+352
|\
| * ma 1 omo: fix misleading commentmakefu2016-03-161-1/+3
| |
| * ma 1 gum: allow vbob and omo usersmakefu2016-03-161-0/+6
| |
| * ma 1 darth: configure aux diskmakefu2016-03-161-3/+25
| |
| * ma 2 default: really do use tinc_premakefu2016-03-161-0/+1
| |
| * k 3 ma: expose pgp pubkeysmakefu2016-03-161-3/+5
| |
| * 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
| | | |
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | the default behavior is not changed but if the default does not apply to your use-case you now can change it
| * | | | k 3 ma: add default and brainmakefu2016-03-162-0/+115
| | |/ / | |/| |
* | | | l 2 vim: add file-line pluginlassulus2016-03-151-3/+13
| | | |
* | | | l 2 baseX: add xbacklightlassulus2016-03-151-0/+1
| | | |
* | | | l 3 newsbot-js -> k 3 newsbot-jslassulus2016-03-154-7/+4
| | | |
* | | | l 2 base: activate timesyncdlassulus2016-03-151-1/+2
| | | |
* | | | k 5 newsbot-js: bump rev 802b172 -> 09e0163lassulus2016-03-151-3/+3
| | | |
* | | | l 5 newsbot-js -> k 5 newsbot-jslassulus2016-03-153-1/+0
| | | |
* | | | Merge remote-tracking branch 'gum/master'lassulus2016-03-1516-96/+328
|\| | |
| * | | 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
| |\ \
| * | | 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
| |\ \ \
| * | | | 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
| |\ \ \ \
* | \ \ \ \ Merge remote-tracking branch 'cd/master'lassulus2016-03-158-35/+89
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | tv git: add newbot-jstv2016-03-151-0/+1
| | |_|_|/ | |/| | |
| * | | | infest-cac-centos7: target => systemmakefu2016-03-102-6/+6
| | | | |
| * | | | Merge remote-tracking branch 'gum/master'tv2016-03-1021-73/+223
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| | | | |