Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of http://cgit.gum.r/stockholm | lassulus | 2019-11-29 | 5 | -98/+121 |
|\ | |||||
| * | shack: streamline ssh-key deployment onto puyak and wolf | makefu | 2019-11-25 | 3 | -14/+13 |
| | | |||||
| * | ma shack/prometheus: import alerting-rules from mayflower | makefu | 2019-11-25 | 2 | -84/+108 |
| | | | | | | | | see: https://github.com/mayflower/nixexprs/blob/master/modules/monitoring/alert-rules.nix | ||||
* | | ci: redownload all repos | lassulus | 2019-11-29 | 1 | -0/+1 |
|/ | |||||
* | newsbot-js: fix build on 19.09 | lassulus | 2019-11-24 | 3 | -269/+204 |
| | |||||
* | delete mb | lassulus | 2019-11-24 | 2 | -152/+0 |
| | |||||
* | nixpkgs: 07e6648 -> 4ad6f14 | lassulus | 2019-11-24 | 1 | -3/+3 |
| | |||||
* | nixpkgs-unstable: c196652 -> e89b215 | lassulus | 2019-11-24 | 1 | -3/+3 |
| | |||||
* | nixpkgs-unstable: 7827d3f -> c196652 | lassulus | 2019-11-17 | 1 | -3/+3 |
| | |||||
* | nixpkgs: cb2cdab -> 07e6648 | lassulus | 2019-11-17 | 1 | -3/+3 |
| | |||||
* | m: use correct tinc addresses for amy/clara | Jörg Thalheim | 2019-11-15 | 1 | -4/+4 |
| | | | | Signed-off-by: Jörg Thalheim <joerg@thalheim.io> | ||||
* | nixpkgs: c5aabb0 -> cb2cdab | lassulus | 2019-11-14 | 1 | -3/+3 |
| | |||||
* | Merge remote-tracking branch 'ni/master' | lassulus | 2019-11-12 | 1 | -12/+0 |
|\ | |||||
| * | Merge remote-tracking branch 'prism/master' | tv | 2019-11-12 | 13 | -39/+95 |
| |\ | |||||
| * | | exim: remove because upstream has caught up | tv | 2019-11-12 | 1 | -12/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'gum/master' | lassulus | 2019-11-12 | 2 | -31/+25 |
|\ \ \ | |||||
| * | | | shack/glados: remove version, google -> google_translate | makefu | 2019-11-07 | 1 | -6/+3 |
| | | | | |||||
| * | | | shack/glados: fix regression, disable influx publisher, disable archiving | makefu | 2019-11-07 | 1 | -23/+20 |
| | | | | |||||
| * | | | shack/node-light: bump to latest hash | makefu | 2019-11-07 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | nixpkgs-unstable: 471869c -> 7827d3f | lassulus | 2019-11-06 | 1 | -3/+3 |
| | | | |||||
* | | | nixpkgs: c75de8b -> c5aabb0 | lassulus | 2019-11-05 | 1 | -3/+3 |
|/ / | |||||
* | | nixpkgs-unstable: 4cd2cb4 -> 471869c | lassulus | 2019-11-02 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'lass/master' | makefu | 2019-10-31 | 3 | -15/+71 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'enklave/master' | lassulus | 2019-10-31 | 1 | -12/+12 |
| |\ \ | |||||
| | * | | j reagenzglas: add new retiolum key | Jeschli | 2019-10-30 | 1 | -12/+12 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'gum/master' | lassulus | 2019-10-31 | 2 | -4/+3 |
| |\ \ \ | |||||
| * | | | | l: add host amy/clara | Jörg Thalheim | 2019-10-30 | 1 | -0/+56 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jörg Thalheim <joerg@thalheim.io> | ||||
| * | | | | nixpkgs: 7952807 -> c75de8b | lassulus | 2019-10-29 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | wolf.r: disable swap | makefu | 2019-10-31 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | shack/*: fix regression with mkYarnPackage and pypi2nix generated files | makefu | 2019-10-31 | 5 | -11/+12 |
| |/ / / |/| | | | |||||
* | | | | rtorrent module: set listen.owner in phpfpm | makefu | 2019-10-28 | 1 | -3/+2 |
| | | | | |||||
* | | | | shack/muellshack: mkYarnPackage is not vendored anymore, using ↵ | makefu | 2019-10-28 | 1 | -1/+1 |
|/ / / | | | | | | | | | | pkgs.yarn2nix-moretea.mkYarnPackage | ||||
* | | | reaktor2: fix invalid character crash | lassulus | 2019-10-23 | 1 | -0/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'enklave/master' | lassulus | 2019-10-22 | 1 | -13/+14 |
|\| | | |||||
| * | | j reagenzglas: change formating | Jeschli | 2019-10-22 | 1 | -13/+14 |
| |/ | |||||
* / | external: change palos ssh key | Ingolf Wagner | 2019-10-21 | 1 | -1/+1 |
|/ | |||||
* | l: remove deprecated users & keys | lassulus | 2019-10-17 | 10 | -175/+0 |
| | |||||
* | Merge remote-tracking branch 'ni/master' | lassulus | 2019-10-16 | 1 | -3/+2 |
|\ | |||||
| * | krebs exim-smarthost: update eloop addresses | tv | 2019-10-02 | 1 | -3/+2 |
| | | |||||
* | | Merge remote-tracking branch 'gum/19.09' | lassulus | 2019-10-16 | 3 | -14/+19 |
|\ \ | |||||
| * | | shack/muell_mail: use callPackage | makefu | 2019-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | shack/prometheus: use alertmanagers instead of alertmanagerURL | makefu | 2019-10-15 | 1 | -1/+6 |
| | | | |||||
| * | | rtorrent module: switch from poolConfigs to pools for phpfpm | makefu | 2019-10-15 | 1 | -12/+12 |
| | | | |||||
| * | | shack/muell_mail: mkYarnPackage comes from yarn2nix now | makefu | 2019-10-15 | 1 | -2/+2 |
| | | | |||||
* | | | external: remove kruck and add sterni to retiolum | Ingolf Wagner | 2019-10-15 | 1 | -13/+10 |
|/ / | |||||
* | | l morpheus.r: RIP | lassulus | 2019-10-14 | 1 | -36/+0 |
| | | |||||
* | | Merge remote-tracking branch 'gum/19.09' into 19.09 | lassulus | 2019-10-14 | 12 | -14/+25 |
|\ \ | |||||
| * | | nixpkgs: 88bbb3c -> 7952807 | makefu | 2019-10-14 | 1 | -3/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'lass/19.09' into 19.09 | makefu | 2019-10-14 | 12 | -73/+172 |
| |\ \ | |||||
| * | | | ma pigstarter: revive dead links in vulnerability disclosures | makefu | 2019-10-13 | 1 | -1/+1 |
| | | | |