summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'cd/master'lassulus2016-02-16181-1192/+1478
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | l 2 xserver: add systemPackages PATHlassulus2016-02-161-4/+2
| * | | | | | | | | | | | | | | | | | | l 2 git: add politics-fetching repolassulus2016-02-161-0/+1
| * | | | | | | | | | | | | | | | | | | l 2 git: add extraction_webinterface repolassulus2016-02-161-0/+1
| * | | | | | | | | | | | | | | | | | | l 2 browsers: allow audio in flash browserlassulus2016-02-161-1/+1
| * | | | | | | | | | | | | | | | | | | l 1 mors: activate postgresqllassulus2016-02-151-0/+6
| * | | | | | | | | | | | | | | | | | | l 1 mors: add python test-envlassulus2016-02-151-0/+33
| * | | | | | | | | | | | | | | | | | | l 1 helios: disbale intel sna because of bugslassulus2016-02-151-9/+0
| * | | | | | | | | | | | | | | | | | | l 1 helios: open up port 8000 for webtestinglassulus2016-02-151-0/+9
| * | | | | | | | | | | | | | | | | | | l 1 helios: add pass.nix configlassulus2016-02-151-0/+1
* | | | | | | | | | | | | | | | | | | | addr4: str -> mkOptionTypetv2016-04-071-4/+10
* | | | | | | | | | | | | | | | | | | | exim: 4.86.2 -> 4.87tv2016-04-071-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | tv: import mutv2016-03-312-1/+177
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | {nukular,darth}: fix addrs6tv2016-03-171-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add new retiolum short form to default hostnamesmakefu2016-03-151-0/+1
| * | | | | | | | | | | | | | | | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-03-159-17/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | ma 2: use tinc-pre per defaultmakefu2016-03-159-17/+5
| * | | | | | | | | | | | | | | | k 3 nginx: add default404 optionmakefu2016-03-151-6/+22
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | 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
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | |