summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | ma 1 shoney: enable tinc_graphs for siem tincmakefu2016-06-231-15/+31
* | | ma 1 pornocauster: add siem networkmakefu2016-06-231-0/+8
* | | ma 1 darth: remove natmakefu2016-06-231-9/+3
* | | add siem internal networkmakefu2016-06-232-4/+49
* | | krebs 3 tinc_graphs: allow network different from retiolummakefu2016-06-231-22/+37
|/ /
* | l 2 buildbot-standalone: add treeStableTimerlassulus2016-06-141-2/+2
* | Merge remote-tracking branch 'wolf/master'lassulus2016-06-148-21/+80
|\ \
| * | Merge remote-tracking branch 'cd/master'makefu2016-06-1425-122/+146
| |\|
| * | s 1 wolf: use tcponly in shack networkmakefu2016-06-141-1/+1
| * | k 3 ma: update shoney ip after failed deploy :3makefu2016-06-141-1/+1
| * | ma 1 shoney: init siem tincmakefu2016-06-141-0/+2
| * | ma 1 dartH: fix nat from tincmakefu2016-06-141-6/+24
| * | s 1 buildbot: re-add treeStableTimermakefu2016-06-131-2/+2
| * | s 1 wolf: fix interface namemakefu2016-06-131-1/+1
| * | cp tv/2/*CAC -> makefu/2/makefu2016-06-134-10/+49
* | | Merge remote-tracking branch 'wolf/master'lassulus2016-06-131-0/+3
|\ \ \ | | |/ | |/|
| * | Makefile: assert existence of $(nixos-config)tv2016-06-131-0/+3
* | | l 2 websites domsen: generalize msmtp targetlassulus2016-06-131-2/+2
* | | l: add and use rs pkglassulus2016-06-133-0/+8
* | | l 2 umts: upgrade wvdial-defaultslassulus2016-06-131-1/+3
* | | l 2 fetchWallpaper: check for umtslassulus2016-06-131-0/+1
* | | l 1 dishfire: activate simple exim-smarthostlassulus2016-06-131-1/+30
* | | l 2 umts: start wpa_supplicant again in traplassulus2016-06-131-2/+1
* | | Merge remote-tracking branch 'cd/master'lassulus2016-06-1323-101/+108
|\| |
| * | scatter some sigilstv2016-06-131-12/+12
| * | sprinkle with some write{B,D}ashtv2016-06-1320-51/+32
| * | lib.genAttrs': inittv2016-06-131-0/+2
| * | types.{addr*,label,{host,file,{absolute-,}path}name}: use isStringtv2016-06-131-7/+8
| * | makeScriptWriter: inittv2016-06-131-26/+17
| * | lib.write{Files => Out}: admit file modetv2016-06-131-4/+15
| * | types.file-mode: inittv2016-06-131-1/+7
| * | lib.lpad: inittv2016-06-131-0/+5
| * | lib.guard: inittv2016-06-131-0/+10
* | | l 2 websites fritz: activate sendmaillassulus2016-06-131-0/+20
* | | l 1 mors: add umts configlassulus2016-06-132-0/+62
* | | Merge remote-tracking branch 'gum/master'lassulus2016-06-1310-35/+126
|\ \ \ | | |/ | |/|
| * | m shoney: initmakefu2016-06-122-0/+59
| * | m 2 defaut: fix .nix-defexpr in activation script"makefu2016-06-121-0/+9
| * | ma 2 tp-x2x0: add remark why to not start charge at 80makefu2016-06-121-1/+2
| * | ma 2 tp-x220: minor tweaksmakefu2016-06-121-2/+2
| * | ma 1 pornocauster: add boot unlockmakefu2016-06-121-1/+3
| * | ma 2 fingerprint-reader: initmakefu2016-06-121-0/+6
| * | ma 1 omo: finish hw merge for omomakefu2016-06-122-24/+29
| * | Merge remote-tracking branch 'cd/master'makefu2016-06-122-17/+21
| |\ \
| * \ \ Merge remote-tracking branch 'cd/master'makefu2016-06-1216-280/+511
| |\ \ \
| * | | | m 3 umts: use 1509 for wvdial packagemakefu2016-06-101-1/+9
| * | | | k 3 m: fix filepimp pubkeymakefu2016-06-091-6/+7
* | | | | l 2 newsbot-js: fix some feedslassulus2016-06-121-2/+1
* | | | | Merge remote-tracking branch 'cd/master'lassulus2016-06-1216-281/+530
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | tv nix.vim: transparent nix_*_region_* and curly blockstv2016-06-121-5/+9