summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master' into HEADlassulus2020-09-1516-141/+202
|\
| * puyak.r: enable alertmanager-botmakefu2020-09-141-0/+1
| * shack/prometheus: strip down number of alerts to 3makefu2020-09-142-101/+43
| * shack/prometheus: alertmanager-bot on a different port nowmakefu2020-09-142-6/+4
| * shack/prometheus: activate alerting to telegrammakefu2020-09-142-8/+20
| * wolf.r: more relevant nginx datamakefu2020-09-133-0/+24
| * ma tools: add esphome, remove esptoolmakefu2020-09-131-2/+1
| * shack/glados: re-enable influxdb outputmakefu2020-09-091-7/+8
| * ma wbob.r: disable logging servermakefu2020-09-032-9/+18
| * ma pkgs.awesomecfg: start chapter-marks with ctrl-u, create new entry with ct...makefu2020-09-021-4/+17
| * ma pkgs.chapter-marker: bump to latest mastermakefu2020-09-021-4/+5
| * glados/wasser: giesszeit 10 -> 20makefu2020-09-011-1/+1
| * ma pkgs.nsrenamer: new naming schememakefu2020-08-182-11/+11
| * ma pkgs.nsrenamer: initmakefu2020-08-172-0/+61
* | go: return go.r for shortened urlslassulus2020-09-151-1/+1
* | Merge remote-tracking branch 'ni/master' into HEADlassulus2020-09-088-13/+141
|\ \
| * | krebs.permown: add keepGoing optiontv2020-09-081-3/+17
| * | tv au: inittv2020-09-054-1/+77
| * | krebs.tinc: add support for ED25519 keystv2020-09-052-3/+40
| * | tv alnus: don't allow unfreetv2020-08-261-4/+0
| * | tv alnus: enable earlyoom; prefer firefox tabstv2020-08-261-0/+6
| * | tv alnus: remove chromiumtv2020-08-261-1/+0
| * | tv alnus: btrfs -> ext4tv2020-08-261-2/+2
* | | nixpkgs-unstable: 8e2b14a -> c59ea8blassulus2020-09-071-3/+3
* | | nixpkgs: e23e054 -> 4267405lassulus2020-09-071-3/+3
* | | Mic92 -> mic92lassulus2020-08-211-0/+0
* | | Merge remote-tracking branch 'mic92/master'lassulus2020-08-204-34/+51
|\ \ \
| * | | mic92: lower-case userJörg Thalheim2020-08-204-23/+23
| * | | eva: add public ip addressesJörg Thalheim2020-08-191-1/+8
| * | | mic92: update eva public keyJörg Thalheim2020-08-191-8/+14
| * | | mic92: use subnet that does not include my serverJörg Thalheim2020-08-131-2/+2
| * | | mic92: allocate retiolum subnet for tincJörg Thalheim2020-08-131-2/+6
* | | | Merge remote-tracking branch 'ni/master'lassulus2020-08-198-46/+85
|\ \ \ \ | | |/ / | |/| |
| * | | tv nets: gg23 -> hkwtv2020-08-194-16/+16
| * | | tv: privatize gg23tv2020-08-194-38/+70
| * | | krebs.dns: allow disabling search-domaintv2020-08-163-6/+13
* | | | Merge remote-tracking branch 'gum/master'lassulus2020-08-1913-6/+109
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | pkgs.hactool: fix sha256summakefu2020-08-161-4/+5
| * | ma tools: add newly packaged toolsmakefu2020-08-162-0/+3
| * | ma pkgs.hactool: fix metadatamakefu2020-08-161-8/+7
| * | ma pkgs.nx_game_info: init at 0.7.1makefu2020-08-161-0/+32
| * | ma pkgs.hactool: init at 1.4.0makefu2020-08-163-0/+35
| * | gitlab-ci: run only on tagsmakefu2020-08-122-0/+14
| * | gitlab-ci: debug gpg issuemakefu2020-08-121-0/+2
| * | Merge branch 'master' of ssh.git.shackspace.de:rz/stockholmmakefu2020-08-121-1/+1
| |\ \
| | * | Changed Gießzeit to 10 secondsNeos2020-08-101-1/+1
| * | | ma bureautomation: fetch latest xkcd comicmakefu2020-08-123-5/+18
| * | | Merge remote-tracking branch 'lass/master'makefu2020-08-1133-75/+364
| |\ \ \ | | |/ / | |/| |
| * | | shack/share: downgrade samba securitymakefu2020-08-041-0/+4
* | | | wiki: allow push to gitlassulus2020-08-121-26/+44