summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* tv nginx public_html: drop .retiolumtv2017-04-121-1/+0
* shared collectd-base: .retiolum -> .rtv2017-04-121-1/+1
* krebs.urlwatch: .retiolum -> .rtv2017-04-121-1/+1
* shared: .retiolum -> .rtv2017-04-121-2/+2
* krebs.exim-* relay_to_domains: drop .retiolum from defaulttv2017-04-122-4/+2
* krebs.git.cgit: drop support for .retiolumtv2017-04-121-1/+0
* tv: drop .retiolumtv2017-04-121-14/+0
*-. Merge remote-tracking branches 'prism/master' and 'gum/master'tv2017-04-1220-122/+135
|\ \
| | * m: .retiolum -> .rmakefu2017-04-122-39/+29
| | * k 3 m: mv pgp keysmakefu2017-04-123-2/+2
| * | lass: .retiolum -> .rlassulus2017-04-123-26/+12
| * | Merge remote-tracking branch 'gum/master'lassulus2017-04-118-43/+57
| |\|
| * | l 2 paste: set client_max_body_size to 4Glassulus2017-04-111-0/+1
| * | l 2 repo-sync: sync Reaktorlassulus2017-04-111-0/+1
| * | l 2: add kpaste to pkgslassulus2017-04-111-0/+1
| * | k 5 kpaste: initlassulus2017-04-111-0/+5
| * | l 1 prism: import paste.nixlassulus2017-04-111-0/+1
| * | k 3 l: new prism alias: p.rlassulus2017-04-111-0/+1
| * | l 2: add paste.nixlassulus2017-04-111-0/+26
| * | l 2 websites domsen: add testuser@ubikmedia.eulassulus2017-04-111-0/+1
| * | l 2 hw tp-x220: disable vertEdgeScrolllassulus2017-04-111-0/+1
| * | Revert "l 2: use alternate dnscrypt resolver"lassulus2017-04-111-4/+1
| * | l 1 prism: update JuiceSSH pubkeylassulus2017-04-111-1/+1
| * | Merge remote-tracking branch 'ni/master'lassulus2017-04-112-3/+3
| |\ \
| * | | l 2 nixpkgs: ade5837 -> a563923lassulus2017-04-111-1/+1
| * | | Merge remote-tracking branch 'prism/newest'lassulus2017-04-029-78/+17
| |\ \ \
| * | | | l 2 hw tp-x220: set touchpad speed to very slowlassulus2017-04-021-1/+5
| * | | | Merge remote-tracking branch 'gum/master'lassulus2017-03-2612-36/+74
| |\ \ \ \
| * | | | | l 2 mail: use pkgs.concatlassulus2017-03-251-3/+6
| * | | | | l 2 websites domsen: add phpfpm restarterlassulus2017-03-251-0/+28
| * | | | | l 2 mpv: make scripts compatible with 0.24lassulus2017-03-251-23/+11
| * | | | | l 2 monitoring: disable ELKlassulus2017-03-252-21/+0
| * | | | | k 3 l: update shodan pubkeylassulus2017-03-251-1/+1
* | | | | | Merge remote-tracking branch 'prism/makefu'tv2017-04-1225-127/+239
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | m: gum takes over euer,wiki,graphs from wrymakefu2017-04-113-38/+15
| * | | | | m 2 bepasty-dual: use secretKeyFilemakefu2017-04-112-4/+4
| * | | | | m 5 awesomecfg: add todomakefu2017-04-111-0/+1
| * | | | | m 2 deployment/uwsgi: purgemakefu2017-04-111-16/+0
| * | | | | m 2 deployment: uwsgi addmakefu2017-04-111-0/+16
| * | | | | m 2 deployment: add graphsmakefu2017-04-111-0/+37
| * | | | | m 2 urlwatch: remove old vicious urlmakefu2017-04-031-1/+0
| | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'tv/master'makefu2017-03-312-29/+10
| |\ \ \ \
| * | | | | m 2 base-gui: Terminus naming fuckupmakefu2017-03-311-2/+3
| * | | | | k 3 m: disable v6 address for gummakefu2017-03-311-1/+1
| * | | | | m 2 default: use cups-dymo patchmakefu2017-03-311-1/+1
| * | | | | m 2 backup: wry on standbymakefu2017-03-311-1/+1
| * | | | | m 2 urlwatch: Mic92 is the new maintainer of viciousmakefu2017-03-311-0/+1
| * | | | | m 1 omo: do not watch urlsmakefu2017-03-301-1/+0
| * | | | | m 5 taskserver: ripmakefu2017-03-291-43/+0
| | |_|/ / | |/| | |
| * | | | m 2: fix printermakefu2017-03-251-1/+1