summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mic92/master'lassulus2020-09-162-13/+17
|\
| * mic92: add rock publickeyJörg Thalheim2020-09-151-13/+14
| * add prometheus.rJörg Thalheim2020-09-151-0/+1
| * mic92: add v4/v6 aliases to etc hostsJörg Thalheim2020-09-151-0/+2
* | Merge remote-tracking branch 'ni/master'lassulus2020-09-151-2/+2
|\ \ | |/ |/|
| * htgen: 1.2.7 -> 1.2.8tv2020-09-151-2/+2
* | reaktor2: nicks can have special characterslassulus2020-09-151-1/+1
* | l yellow.r: add flix-index servicelassulus2020-09-151-1/+22
* | Merge remote-tracking branch 'ni/master'lassulus2020-09-151-2/+2
|\|
| * htgen: 1.2.6 -> 1.2.7tv2020-09-151-2/+2
* | Merge remote-tracking branch 'ni/master'lassulus2020-09-151-2/+2
|\|
| * htgen: 1.2.5 -> 1.2.6tv2020-09-151-2/+2
* | Merge remote-tracking branch 'ni/master'lassulus2020-09-151-2/+2
|\|
| * htgen: 1.2.4 -> 1.2.5tv2020-09-151-2/+2
* | Merge remote-tracking branch 'ni/master'lassulus2020-09-153-11/+15
|\|
| * htgen-imgur: 1.0.0 -> 1.1.0tv2020-09-152-9/+13
| * htgen: 1.2.3 -> 1.2.4tv2020-09-151-2/+2
| * Merge remote-tracking branch 'prism/master'tv2020-09-0827-56/+367
| |\
* | | shack: add telegram_bot secretlassulus2020-09-151-0/+0
* | | l games: disable most gameslassulus2020-09-151-8/+10
* | | 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