summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ni/master'lassulus2017-01-095-28/+15
|\
| * krebs.git: add authorizedKeys only for users found in rulestv2017-01-071-3/+5
| * alnus nixpkgs: d745044 -> e924319tv2017-01-071-5/+1
| * tv: use body instead of outtv2017-01-053-20/+9
* | l 2 websites domsen: add ubikmedia subdomainslassulus2017-01-091-0/+8
* | l 2 websites domsen: remove obsolete ssl functionlassulus2017-01-091-32/+0
* | l 2 hfos: forward smtplassulus2017-01-091-0/+2
* | l 1 shodan: reinstall with btrfslassulus2017-01-091-6/+2
* | l 3: add kapacitor servicelassulus2017-01-092-0/+102
* | l 3: add telegraf servicelassulus2017-01-092-0/+68
* | k 5: add kapacitorlassulus2017-01-091-0/+23
* | k 5: add telegraflassulus2017-01-092-0/+615
* | Merge remote-tracking branch 'gum/master'lassulus2017-01-051-2/+60
|\ \ | |/ |/|
| * Merge remote-tracking branch 'lass/master'makefu2017-01-0512-109/+42
| |\
| * | m 1 fileleech: enable ftpmakefu2017-01-051-4/+25
| * | m 1 fileleech: post-congressmakefu2017-01-051-1/+38
* | | Merge remote-tracking branch 'prism/lassulus'tv2017-01-0512-110/+117
|\ \ \ | | |/ | |/|
| * | 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
| |\|
| | * 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
| | |\
| | * \ Merge remote-tracking branch 'tv/master'makefu2016-12-251-0/+19
| | |\ \
| * | \ \ Merge remote-tracking branch 'ni/master'lassulus2016-12-282-8/+2
| |\ \ \ \
| * | | | | l 2 tests dummy-secrets: add grafana securitylassulus2016-12-281-0/+4
| | |_|_|/ | |/| | |
* | | | | tv backup: drop *-pull-cd-ejabberdtv2017-01-041-12/+0
* | | | | cd: hart eingeCACttv2017-01-042-3/+3
* | | | | infest/prepare: touch /mnt/var/src/.populatetv2017-01-041-0/+2
* | | | | infest/prepare: fix style inconsistenciestv2017-01-041-4/+4
| |/ / / |/| | |
* | | | 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 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