summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | This reverts commit 3ecebca46f8924de9dd97bd79a1f0272f39d9ae6.
* | l 2 tests dummy-secrets: add grafana securitylassulus2016-12-281-0/+4
|/
* l 2 nixpkgs: 435b5f8 -> 819c1ablassulus2016-12-271-2/+2
| | | | we need this change to make graphite_beacon work with cli support
* 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
|\
| * m 1 shoney: update to new tinc_stats api, reject externalmakefu2016-12-251-3/+8
| |
| * m 1 wry: forbid external paste accessmakefu2016-12-251-6/+6
| |
| * Merge remote-tracking branch 'lass/master'makefu2016-12-2512-9/+114
| |\
| * | k 3 bepasty-server: finish krebs.nginx -> servers.nginxmakefu2016-12-252-27/+19
| | |
| * | m 2 elchos/test/: initmakefu2016-12-241-0/+7
| | |
| * | m 2 elchos/log: initmakefu2016-12-241-0/+56
| | |
| * | m 2 omo-share: disable nginx sharingmakefu2016-12-241-32/+6
| | |
| * | m 2 main-laptop: look up once in a whilemakefu2016-12-241-1/+11
| | |
| * | m 2 elchos/stats: krebs.nginx -> services.nginxmakefu2016-12-241-53/+33
| | |
| * | m 2 disable_v6: only soft-disable ipv6makefu2016-12-241-1/+0
| | |
| * | m 1 wry: krebs.nginx -> services.nginxmakefu2016-12-241-9/+12
| | |
| * | m 1 gum: enable ipv6 (for nginx), krebs.nginx -> services.nginxmakefu2016-12-241-6/+4
| | |
| * | m 1 fileleech: mount crypt-disksmakefu2016-12-241-22/+106
| | |
| * | m 1 omo: be more permissive with mergerfsmakefu2016-12-241-3/+8
| | |
| * | k 3 tinc_graphs: krebs.nginx -> services.nginxmakefu2016-12-241-43/+32
| | |
| * | k 3 bepasty-server: krebs.nginx -> services.nginxmakefu2016-12-241-11/+19
| | |
| * | m 2 *: krebs.nginx -> services.nginxmakefu2016-12-249-272/+109
| | |
| * | Merge remote-tracking branch 'tv/master'makefu2016-12-2410-321/+57
| |\ \
| * | | m 2 default: f52eaf4 -> ee13b9afmakefu2016-12-241-1/+1
| | | |