summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'gum/master'lassulus2017-01-1015-64/+174
|\ \ \ | | |/ | |/|
| * | m 1 wry: add central-stats-clientmakefu2017-01-101-2/+2
| * | m 2 logging: retabmakefu2017-01-092-27/+27
| * | m 3 logging-config: initmakefu2017-01-091-0/+11
| * | m 2 nginx/share-download: expose dl-dir via nginxmakefu2017-01-091-0/+18
| * | m 2 logging: initmakefu2017-01-092-0/+96
| * | m: expose torrent-secretsmakefu2017-01-093-2/+17
| * | m 2 omo-share: expose crypt0 read-onlymakefu2017-01-091-0/+6
| * | m 2 elchos/stats: remove graphite-beaconmakefu2017-01-091-55/+12
| * | m 2 elchos/log: do not write to stdoutmakefu2017-01-091-3/+3
| * | m 2 backup: add gum to backupmakefu2017-01-091-1/+2
| * | k 3 rtorrent: always restartmakefu2017-01-091-1/+2
| * | k 3 m: gum add subdomainsmakefu2017-01-092-0/+5
* | | l 2 vim: add flake8 for python style checkinglassulus2017-01-101-0/+1
* | | l 2 nixpkgs: 819c1ab -> d98b556lassulus2017-01-091-1/+1
* | | Merge remote-tracking branch 'gum/master'lassulus2017-01-092-0/+425
|\| |
| * | m 2 openvpn: add vpngatemakefu2017-01-081-0/+280
| * | m 2 deployment: init owncloudmakefu2017-01-081-0/+145
* | | 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