summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'tv2019-11-296-98/+122
|\
| * Merge branch 'master' of http://cgit.gum.r/stockholmlassulus2019-11-295-98/+121
| |\
| | * shack: streamline ssh-key deployment onto puyak and wolfmakefu2019-11-253-14/+13
| | * ma shack/prometheus: import alerting-rules from mayflowermakefu2019-11-252-84/+108
| * | ci: redownload all reposlassulus2019-11-291-0/+1
| |/
* | Merge remote-tracking branch 'prism/master'tv2019-11-277-427/+210
|\|
| * newsbot-js: fix build on 19.09lassulus2019-11-243-269/+204
| * delete mbmb-riplassulus2019-11-242-152/+0
| * nixpkgs: 07e6648 -> 4ad6f14lassulus2019-11-241-3/+3
| * nixpkgs-unstable: c196652 -> e89b215lassulus2019-11-241-3/+3
* | krebs exim-smarthost: RIP slash16tv2019-11-271-2/+1
|/
* nixpkgs-unstable: 7827d3f -> c196652lassulus2019-11-171-3/+3
* nixpkgs: cb2cdab -> 07e6648lassulus2019-11-171-3/+3
* m: use correct tinc addresses for amy/claraJörg Thalheim2019-11-151-4/+4
* nixpkgs: c5aabb0 -> cb2cdablassulus2019-11-141-3/+3
* Merge remote-tracking branch 'ni/master'lassulus2019-11-121-12/+0
|\
| * Merge remote-tracking branch 'prism/master'tv2019-11-1213-39/+95
| |\
| * | exim: remove because upstream has caught uptv2019-11-121-12/+0
* | | Merge remote-tracking branch 'gum/master'lassulus2019-11-122-31/+25
|\ \ \
| * | | shack/glados: remove version, google -> google_translatemakefu2019-11-071-6/+3
| * | | shack/glados: fix regression, disable influx publisher, disable archivingmakefu2019-11-071-23/+20
| * | | shack/node-light: bump to latest hashmakefu2019-11-071-2/+2
| | |/ | |/|
* | | nixpkgs-unstable: 471869c -> 7827d3fnixpkgslassulus2019-11-061-3/+3
* | | nixpkgs: c75de8b -> c5aabb0lassulus2019-11-051-3/+3
|/ /
* | nixpkgs-unstable: 4cd2cb4 -> 471869classulus2019-11-021-3/+3
* | Merge remote-tracking branch 'lass/master'makefu2019-10-313-15/+71
|\ \
| * \ Merge remote-tracking branch 'enklave/master'lassulus2019-10-311-12/+12
| |\ \
| | * | j reagenzglas: add new retiolum keyJeschli2019-10-301-12/+12
| * | | Merge remote-tracking branch 'gum/master'lassulus2019-10-312-4/+3
| |\ \ \
| * | | | l: add host amy/claraJörg Thalheim2019-10-301-0/+56
| * | | | nixpkgs: 7952807 -> c75de8blassulus2019-10-291-3/+3
* | | | | wolf.r: disable swapmakefu2019-10-311-4/+0
* | | | | shack/*: fix regression with mkYarnPackage and pypi2nix generated filesmakefu2019-10-315-11/+12
| |/ / / |/| | |
* | | | rtorrent module: set listen.owner in phpfpmmakefu2019-10-281-3/+2
* | | | shack/muellshack: mkYarnPackage is not vendored anymore, using pkgs.yarn2nix-...makefu2019-10-281-1/+1
|/ / /
* | | reaktor2: fix invalid character crashlassulus2019-10-231-0/+3
* | | Merge remote-tracking branch 'enklave/master'lassulus2019-10-221-13/+14
|\| |
| * | j reagenzglas: change formatingJeschli2019-10-221-13/+14
| |/
* / external: change palos ssh keyIngolf Wagner2019-10-211-1/+1
|/
* l: remove deprecated users & keyslassulus2019-10-1710-175/+0
* Merge remote-tracking branch 'ni/master'lassulus2019-10-161-3/+2
|\
| * krebs exim-smarthost: update eloop addressestv2019-10-021-3/+2
* | Merge remote-tracking branch 'gum/19.09'lassulus2019-10-163-14/+19
|\ \
| * | shack/muell_mail: use callPackagemakefu2019-10-151-1/+1
| * | shack/prometheus: use alertmanagers instead of alertmanagerURLmakefu2019-10-151-1/+6
| * | rtorrent module: switch from poolConfigs to pools for phpfpmmakefu2019-10-151-12/+12
| * | shack/muell_mail: mkYarnPackage comes from yarn2nix nowmakefu2019-10-151-2/+2
* | | external: remove kruck and add sterni to retiolumIngolf Wagner2019-10-151-13/+10
|/ /
* | l morpheus.r: RIPlassulus2019-10-141-36/+0
* | Merge remote-tracking branch 'gum/19.09' into 19.09lassulus2019-10-1412-14/+25
|\ \