summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2016-10-273-8/+22
|\
| * m 2 hw: Plot twist - x220 was an x230 ALL ALONG!makefu2016-10-272-7/+17
| * Merge remote-tracking branch 'prism/lassulus'makefu2016-10-2710-26/+60
| |\
| * \ Merge remote-tracking branch 'cd/master'makefu2016-10-24181-355/+322
| |\ \
| * | | m 2 mycube: fix redis mimimimakefu2016-10-221-1/+5
* | | | l 1 mors: activate dockerlassulus2016-10-271-1/+1
* | | | pkgs.go -> pkgs.go-shortenerlassulus2016-10-274-4/+4
| |_|/ |/| |
* | | l 2 websites domsen: make smtp/imap finally worklassulus2016-10-271-40/+6
* | | l 5 xmonad-lass: add binding for termitelassulus2016-10-271-0/+1
* | | k 3 exim-smarthost: indent dkim configlassulus2016-10-271-2/+2
* | | l 2 websites fritz: update phpConfiglassulus2016-10-271-8/+2
* | | l 3 usershadow: more validators, expose pathlassulus2016-10-271-6/+35
* | | l 2 repo-sync: sync painloadlassulus2016-10-271-0/+1
* | | l 2 nixpkgs: 686bc9c -> 0195ab8lassulus2016-10-271-1/+1
* | | l 2: globally set CA/SSL stufflassulus2016-10-271-0/+7
* | | l 1 prism: enable usershadowlassulus2016-10-271-0/+5
* | | Revert "l 2 websites domsen: remove obsolete code"lassulus2016-10-261-0/+32
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-244-4/+23
|\ \ \ | | |/ | |/|
| * | krebs.git: add cgit-clear-cachetv2016-10-241-0/+6
| * | populate: 1.1.1 -> 1.2.0tv2016-10-231-2/+2
| * | tv nixpkgs: cd41bfe -> e4fb65atv2016-10-231-1/+1
| * | tv git: replace misplaced desc attrstv2016-10-231-2/+6
| * | tv git: add netcuptv2016-10-231-0/+1
| * | tv: globally set CURL_CA_BUNDLE, GIT_SSL_CAINFO, SSL_CERT_FILEtv2016-10-231-0/+8
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-234-6/+40
|\| |
| * | m 1 vbob:disable dockermakefu2016-10-221-3/+1
| * | m 1 x: disable docker for nowmakefu2016-10-221-3/+6
| * | m 1 gum: remove mattermostmakefu2016-10-221-2/+2
| * | m 2 default: bump to latest stable (dirtycow)makefu2016-10-221-1/+2
| * | l 2 nixpkgs: b8ede35 -> 686bc9classulus2016-10-221-1/+1
| * | l: import <stockholm/lib>lassulus2016-10-226-8/+6
| * | l 1 shodan: add sokratess userlassulus2016-10-221-0/+20
| * | l 2 websites domsen: remove obsolete codelassulus2016-10-221-32/+0
| * | l 2 c-base: add cifs-utilslassulus2016-10-221-0/+4
| * | l 1 mors: activate redislassulus2016-10-221-0/+3
| * | k 3 l: add sokratess userlassulus2016-10-221-0/+2
| * | tv djbdns: init at 1.05tv2016-10-221-0/+20
| * | tv pkgs: callPackage all subdirstv2016-10-222-5/+19
| * | tv nixpkgs: 31c72ce -> cd41bfetv2016-10-221-1/+1
* | | l 1 helios: remove jre from pkgslassulus2016-10-231-1/+0
* | | l 1 helios: oraclejre -> jrelassulus2016-10-221-1/+1
* | | Merge remote-tracking branch 'gum/master'lassulus2016-10-224-9/+11
|\ \ \ | | |/ | |/|
| * | m 1 vbob:disable dockermakefu2016-10-221-3/+1
| * | m 1 x: disable docker for nowmakefu2016-10-221-3/+6
| * | m 1 gum: remove mattermostmakefu2016-10-211-2/+2
| * | m 2 default: bump to latest stable (dirtycow)makefu2016-10-211-1/+2
* | | l 2 nixpkgs: b8ede35 -> 686bc9classulus2016-10-221-1/+1
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-224-43/+2
|\ \ \ | | |/ | |/|
| * | ire: RIPtv2016-10-223-42/+1
| * | tv nixpkgs: b8ede35 -> 31c72cetv2016-10-211-1/+1