summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Collapse)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
| | | | | | | | this is convinient when you only want to speak a certain protocol
* | 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
| |
* | 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
| | | | | | | | Use HTGEN_VERBOSE for printing debug information.
| * htgen: 1.2.3 -> 1.2.4tv2020-09-151-2/+2
| |
| * Merge remote-tracking branch 'prism/master'tv2020-09-0813-39/+254
| |\
* | | shack: add telegram_bot secretlassulus2020-09-151-0/+0
| | |
* | | Merge remote-tracking branch 'gum/master' into HEADlassulus2020-09-159-122/+100
|\ \ \
| * | | 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
| | | |
| * | | shack/glados: re-enable influxdb outputmakefu2020-09-091-7/+8
| | | |
| * | | glados/wasser: giesszeit 10 -> 20makefu2020-09-011-1/+1
| | | |
* | | | go: return go.r for shortened urlslassulus2020-09-151-1/+1
| | | |
* | | | Merge remote-tracking branch 'ni/master' into HEADlassulus2020-09-083-6/+80
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | krebs.permown: add keepGoing optiontv2020-09-081-3/+17
| | |
| * | tv au: inittv2020-09-051-0/+27
| | |
| * | krebs.tinc: add support for ED25519 keystv2020-09-051-3/+36
| | |
* | | 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-203-30/+47
|\ \ \
| * | | mic92: lower-case userJörg Thalheim2020-08-203-19/+19
| | | |
| * | | 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-194-44/+13
|\ \ \ \ | | |/ / | |/| |
| * | | tv: privatize gg23tv2020-08-192-38/+0
| | | |
| * | | krebs.dns: allow disabling search-domaintv2020-08-163-6/+13
| | | |
* | | | Merge remote-tracking branch 'gum/master'lassulus2020-08-193-1/+7
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | gitlab-ci: run only on tagsmakefu2020-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | we have some rogue non-nix runners going around on gitlab-ci therefore we now tag the runners shacklan - inside the shack lan nix - has nix installed
| * | Merge branch 'master' of ssh.git.shackspace.de:rz/stockholmmakefu2020-08-121-1/+1
| |\ \
| | * | Changed Gießzeit to 10 secondsNeos2020-08-101-1/+1
| | | |
| * | | Merge remote-tracking branch 'lass/master'makefu2020-08-1113-43/+150
| |\ \ \ | | |/ / | |/| |
| * | | shack/share: downgrade samba securitymakefu2020-08-041-0/+4
| | | |
* | | | wiki: allow push to gitlassulus2020-08-121-26/+44
| | | |