summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cloudkrebs/master'tv2016-06-0684-702/+2213
|\
| * Merge remote-tracking branch 'prism/master'makefu2016-06-021-1/+2
| |\
| | * Merge remote-tracking branch 'gum/master'lassulus2016-06-0213-136/+243
| | |\
| | * | l 2 baseX: add lm_sensors to pkgslassulus2016-06-021-1/+2
| * | | ma 5: remove leftover `./result`makefu2016-06-021-1/+0
| | |/ | |/|
| * | k 2 steam.nix: initmakefu2016-06-021-0/+6
| * | ma 2 exim-retiolum: add firewall exception for exim-retiolummakefu2016-06-021-1/+2
| * | ma 1 pornocauster: cleanupmakefu2016-06-021-8/+22
| * | k 3 ma: fix addrs4 for tpswmakefu2016-06-021-2/+2
| * | m 2 default:use stable branchmakefu2016-06-021-2/+3
| * | Merge remote-tracking branch 'cd/master'makefu2016-06-022-118/+113
| |\ \
| * \ \ Merge remote-tracking branch 'prism/master'makefu2016-06-0226-441/+608
| |\ \ \ | | | |/ | | |/|
| | * | k 5: disable buildbot overridelassulus2016-06-011-7/+7
| | * | l 2 websites util: add server-names to manageCertslassulus2016-06-011-0/+1
| | * | l 2 websites: put sqlBackup in seperate filelassulus2016-06-013-70/+69
| | * | l 2 exim-smarthost: redirect dominik@apanowicz.delassulus2016-06-011-0/+1
| | * | l 2 exim-smarthost: add mail for finanzamtlassulus2016-06-011-0/+1
| | * | l 2: bump nixpkgs e781dae -> f632f8elassulus2016-06-011-1/+1
| | * | l 2: add mainUser to fuse for sshfslassulus2016-06-011-0/+1
| | * | l 2 browsers: add com browserlassulus2016-06-011-0/+1
| | * | l 1 mors: add remmina to pkgslassulus2016-06-011-0/+1
| | * | k 3 nginx: unique server-names to silence nginxlassulus2016-06-011-1/+1
| | * | l 1 prism: add cgit for cgit.lassul.uslassulus2016-06-011-1/+9
| | * | l 1 prism: import buildbot normallylassulus2016-05-311-6/+1
| | * | l: move websites libs to 2/websites/utillassulus2016-05-316-238/+248
| | * | k 3 iptables: allow DNAT ruleslassulus2016-05-291-1/+1
| | * | l 2 radio print_current: show youtube linklassulus2016-05-251-1/+3
| | * | l 2 websites fritz: use ssl everywherelassulus2016-05-251-7/+7
| | * | l 2 websites domsen: use old phpIni againlassulus2016-05-251-3/+12
| | * | l 2 radio: add config for lassul.us/the_playlistlassulus2016-05-251-0/+25
| | * | l 2 radio: add Reaktor configlassulus2016-05-251-0/+19
| | * | l 2 radio: add and use utilslassulus2016-05-251-5/+21
| | * | l 2 git: add the_playlist without announcementlassulus2016-05-251-0/+7
| | * | l 2: use nixos-16.03 with new ts3 serverlassulus2016-05-251-2/+2
| | * | Merge remote-tracking branch 'cd/master' into HEADlassulus2016-05-259-101/+156
| | |\ \
| | * | | l 1 prism: serve wallpaper.png under lassul.uslassulus2016-05-241-0/+10
| | * | | l 1 mors: reactivate snalassulus2016-05-241-8/+8
| | * | | l 1 mors: dont import texlivelassulus2016-05-241-1/+1
| | * | | l 2 websites fritz: add fritz root authorizedKeyslassulus2016-05-241-0/+3
| | * | | l 2 websites fritz: serve biostase.delassulus2016-05-241-1/+1
| | * | | k 3 l: add fritz pubkeylassulus2016-05-241-0/+3
| | * | | Merge remote-tracking branch 'cd/master'lassulus2016-05-242-1/+5
| | |\ \ \
| | * | | | l 2 websites fritz: prefix www. everywherelassulus2016-05-241-14/+14
| * | | | | add init stockholmmakefu2016-06-021-0/+3
| * | | | | Merge remote-tracking branch 'cd/master'makefu2016-05-241-1/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge remote-tracking branch 'cloudkrebs/master'makefu2016-05-2458-632/+1661
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'cd/master'lassulus2016-05-216-10/+21
| | |\ \ \ \
| | * | | | | l 2 git: add the_playlist repolassulus2016-05-211-0/+1
| | * | | | | l 2 weechat: allow connection from shodanlassulus2016-05-211-0/+1
| | * | | | | l 2 downloading: remove unneeded file endinglassulus2016-05-211-1/+1