summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master'makefu2017-01-0512-109/+42
|\
| * l 2 games: add 32bit support for pulseaudiolassulus2017-01-021-0/+2
| * l 2 baseX: remove pulse.nix and use pulseaudiolassulus2017-01-022-97/+6
| * l: add & import makefu-sip configlassulus2016-12-292-0/+22
| * l 2 websites fritz: also enable nginxlassulus2016-12-291-0/+3
| * l 2: add icarus to authorizedKeyslassulus2016-12-291-0/+2
| * l 1 mors: remove obsolete powertop activationslassulus2016-12-291-4/+0
| * l 1 icarus: import gameslassulus2016-12-291-0/+1
| * Merge remote-tracking branch 'gum/master'lassulus2016-12-292-9/+77
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2016-12-282-8/+2
| |\ \
| | * | shared: don't define test aliasestv2016-12-281-4/+0
| | * | shared: test ip4 addr 10.243.111.111 -> 10.243.73.57tv2016-12-281-1/+1
| | * | irc-announce: mktemp --tmpdirtv2016-12-281-1/+1
| | * | Revert "k 5 irc-announce: cd to /tmp"tv2016-12-281-2/+0
| * | | l 2 tests dummy-secrets: add grafana securitylassulus2016-12-281-0/+4
| |/ /
* | | m 1 fileleech: enable ftpmakefu2017-01-051-4/+25
* | | m 1 fileleech: post-congressmakefu2017-01-051-1/+38
| |/ |/|
* | m 2 elchos/stats: trigger for all hostsmakefu2016-12-281-3/+56
* | m 2 elchos: update irc-tokenmakefu2016-12-281-6/+21
* | Merge remote-tracking branch 'lass/master'makefu2016-12-2823-822/+438
|\|
| * l 2 nixpkgs: 435b5f8 -> 819c1ablassulus2016-12-271-2/+2
| * l 1 mors: add graphite_beacon testing codelassulus2016-12-271-0/+131
| * k 5 irc-announce: cd to /tmplassulus2016-12-271-0/+2
| * k 5: move irc-announce to seperate packagelassulus2016-12-272-63/+67
| * l 2 hfos: redirect port 80 to 1080lassulus2016-12-271-2/+2
| * l 1 mors: disable obsolete mongoDBlassulus2016-12-271-4/+0
| * l 2 nixpkgs: 9625cae -> 435b5f8lassulus2016-12-261-1/+1
| * l 2 websites fritz: remove obsolete manageCertslassulus2016-12-261-2/+1
| * l 2 tests secrets: torrent-autfile -> torrent-authlassulus2016-12-262-1/+3
| * l 1 mors: disable skypelassulus2016-12-261-1/+0
| * l 2 websites lassulus: listen cgit also on port 80lassulus2016-12-261-0/+1
| * l 2 nixpkgs: 2a97e14 -> 9625caelassulus2016-12-261-1/+1
| * l 2: add hfos.nixlassulus2016-12-262-0/+34
| * l 3: remove obsolete nginx moduleslassulus2016-12-263-476/+0
| * l 2 websites lassulus: challenge in default dirlassulus2016-12-261-2/+2
| * l 2 websites fritz: remove biostase.delassulus2016-12-261-3/+0
| * l 2 websites domsen: stop serving *.ubikmedia.delassulus2016-12-261-1/+0
| * l 2 downloading: adapt to new apilassulus2016-12-261-3/+2
| * l: krebs.nginx -> services.nginxlassulus2016-12-2610-241/+165
| * l 1 prism: import libvirtlassulus2016-12-261-4/+1
| * l 2 libvirt: add iptables config for NATlassulus2016-12-261-0/+23
| * l 2 libvirt: add lass to libvirtdlassulus2016-12-261-18/+2
| * k 3 realwallpaper: daymap only available via httpslassulus2016-12-261-1/+1
| * k 3 l: make icarus securelassulus2016-12-261-0/+1
| * Merge remote-tracking branch 'gum/master'lassulus2016-12-2523-480/+427
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2016-12-252-1/+19
| |\ \
| * \ \ Merge remote-tracking branch 'gum/master'lassulus2016-12-2310-39/+157
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'ni/master'lassulus2016-12-237-321/+47
| |\ \ \ \
| | * | | | tv nginx: enable recommendationstv2016-12-231-0/+4
| | * | | | tv nginx: return 404 by defaulttv2016-12-231-0/+7