summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'nomic/master'tv2015-11-076-26/+41
|\ \ \
| * | | tv: mv user xr to subtv2015-11-076-26/+38
| * | | Merge remote-tracking branch 'cd/master'tv2015-11-074-16/+10
| |\ \ \
| * | | | xu nixpkgs: c44a593 -> 7ae05edtv2015-11-071-0/+3
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge remote-tracking branches 'mors/master' and 'pnp/master'tv2015-11-0747-138/+800
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | m 2: base -> default, rm base-sourcesmakefu2015-11-0610-85/+47
| | * | Merge remote-tracking branch 'cd/master'makefu2015-11-0616-71/+106
| | |\ \
| | * \ \ Merge branch 'master' of pnp:stockholmmakefu2015-11-0619-40/+255
| | |\ \ \
| | | * | | 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
| | | * | | m 2 nginx/euer*: prepare folders if they do not existmakefu2015-11-052-9/+38
| | | * | | m 1 wry: use new import layout for CAC from tvmakefu2015-11-052-4/+7
| | | * | | k 5 translate-shell: init at 0.9.0.9makefu2015-11-051-0/+43
| | | * | | Merge remote-tracking branch 'cd/master'makefu2015-11-0511-26/+134
| | | |\ \ \
| | * | | | | m 1,2: refactor, remove overhead for fs/hw, add filepimpmakefu2015-11-068-30/+61
| | * | | | | k 4 makefu: add filepimpmakefu2015-11-061-0/+24
| | * | | | | update collectd targetsmakefu2015-11-052-3/+3
| | |/ / / /
| | * | | | k Zhosts gum: remove paste.krebsco.de aliasmakefu2015-11-051-1/+0
| * | | | | Merge remote-tracking branch 'cd/master'lassulus2015-11-019-24/+126
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'pnp/master'lassulus2015-11-011-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | collectd-connect-time: bump to 0.3.0makefu2015-11-011-2/+2
| * | | | | | l 1 prism: allowUnfree for ts3lassulus2015-11-011-0/+3
| * | | | | | l 1 mors: add hashPassword to systemPackageslassulus2015-11-011-0/+1
| * | | | | | l 1 prism: activate ts3 serverlassulus2015-11-011-0/+1
| * | | | | | l 2: add ts3.nixlassulus2015-11-011-0/+19
| * | | | | | k 3 l: use rsa keys in prismlassulus2015-11-011-2/+2
| * | | | | | l 2 downloading: get rpc-password from secretslassulus2015-10-311-3/+5
| * | | | | | l 2: get ssh-keys via apilassulus2015-10-312-6/+6
| * | | | | | l 1 prism: add git.nixlassulus2015-10-311-0/+1
| |/ / / / /
| * | | | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-3120-26/+352
| |\ \ \ \ \
| | * | | | | shared wolf: enable collectd towards heidimakefu2015-10-302-0/+42
| | * | | | | m 2 *: s,/root/secrets,<secrets>,makefu2015-10-293-10/+16
| | * | | | | m 2 euer.blog: init (untested)makefu2015-10-291-0/+29
| | * | | | | Merge branch 'master' of pnp:stockholmmakefu2015-10-284-1/+60
| | |\ \ \ \ \
| | | * | | | | 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-2771-438/+2499
| | | |\ \ \ \ \
| | | * | | | | | m 12 collectd: wry uses cherry-picked collectd to enable python supportmakefu2015-10-272-1/+4
| | | * | | | | | m 2 collectd: add first sample howto configure collectd with collectd-connect...makefu2015-10-271-0/+42
| | | * | | | | | k 5 collectd-connect-time: initial commitmakefu2015-10-271-0/+15
| | * | | | | | | m 1 wry: serve euer wikimakefu2015-10-283-4/+121
| | * | | | | | | m 5 tw-upload-plugin: use new versionmakefu2015-10-281-2/+2
| | * | | | | | | m 5 tw-upload-plugin: initmakefu2015-10-282-0/+9
| | * | | | | | | m 2 sources: add system tagmakefu2015-10-282-0/+2
| | * | | | | | | m 1 gum: prepare stockholmmakefu2015-10-282-1/+46
| | * | | | | | | m 2 urlwatch: replace dynamic with static page for bepastymakefu2015-10-281-1/+1
| | * | | | | | | m 2 headless: initmakefu2015-10-283-2/+6
| | | |/ / / / / | | |/| | | | |
| | * | | | | | m 1 pnp: make urlwatch verbose, update url listmakefu2015-10-262-0/+4
| | * | | | | | k 3 urlwatch: add verbose flagmakefu2015-10-261-1/+8