Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mic92/master' | lassulus | 2020-09-16 | 2 | -13/+17 |
|\ | |||||
| * | mic92: add rock publickey | Jörg Thalheim | 2020-09-15 | 1 | -13/+14 |
| | | |||||
| * | add prometheus.r | Jörg Thalheim | 2020-09-15 | 1 | -0/+1 |
| | | |||||
| * | mic92: add v4/v6 aliases to etc hosts | Jörg Thalheim | 2020-09-15 | 1 | -0/+2 |
| | | | | | | | | this is convinient when you only want to speak a certain protocol | ||||
* | | Merge remote-tracking branch 'ni/master' | lassulus | 2020-09-15 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | htgen: 1.2.7 -> 1.2.8 | tv | 2020-09-15 | 1 | -2/+2 |
| | | |||||
* | | reaktor2: nicks can have special characters | lassulus | 2020-09-15 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'ni/master' | lassulus | 2020-09-15 | 1 | -2/+2 |
|\| | |||||
| * | htgen: 1.2.6 -> 1.2.7 | tv | 2020-09-15 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'ni/master' | lassulus | 2020-09-15 | 1 | -2/+2 |
|\| | |||||
| * | htgen: 1.2.5 -> 1.2.6 | tv | 2020-09-15 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'ni/master' | lassulus | 2020-09-15 | 1 | -2/+2 |
|\| | |||||
| * | htgen: 1.2.4 -> 1.2.5 | tv | 2020-09-15 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'ni/master' | lassulus | 2020-09-15 | 3 | -11/+15 |
|\| | |||||
| * | htgen-imgur: 1.0.0 -> 1.1.0 | tv | 2020-09-15 | 2 | -9/+13 |
| | | | | | | | | Use HTGEN_VERBOSE for printing debug information. | ||||
| * | htgen: 1.2.3 -> 1.2.4 | tv | 2020-09-15 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'prism/master' | tv | 2020-09-08 | 13 | -39/+254 |
| |\ | |||||
* | | | shack: add telegram_bot secret | lassulus | 2020-09-15 | 1 | -0/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'gum/master' into HEAD | lassulus | 2020-09-15 | 9 | -122/+100 |
|\ \ \ | |||||
| * | | | puyak.r: enable alertmanager-bot | makefu | 2020-09-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | shack/prometheus: strip down number of alerts to 3 | makefu | 2020-09-14 | 2 | -101/+43 |
| | | | | |||||
| * | | | shack/prometheus: alertmanager-bot on a different port now | makefu | 2020-09-14 | 2 | -6/+4 |
| | | | | |||||
| * | | | shack/prometheus: activate alerting to telegram | makefu | 2020-09-14 | 2 | -8/+20 |
| | | | | |||||
| * | | | wolf.r: more relevant nginx data | makefu | 2020-09-13 | 3 | -0/+24 |
| | | | | |||||
| * | | | shack/glados: re-enable influxdb output | makefu | 2020-09-09 | 1 | -7/+8 |
| | | | | |||||
| * | | | glados/wasser: giesszeit 10 -> 20 | makefu | 2020-09-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | go: return go.r for shortened urls | lassulus | 2020-09-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'ni/master' into HEAD | lassulus | 2020-09-08 | 3 | -6/+80 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| * | | krebs.permown: add keepGoing option | tv | 2020-09-08 | 1 | -3/+17 |
| | | | |||||
| * | | tv au: init | tv | 2020-09-05 | 1 | -0/+27 |
| | | | |||||
| * | | krebs.tinc: add support for ED25519 keys | tv | 2020-09-05 | 1 | -3/+36 |
| | | | |||||
* | | | nixpkgs-unstable: 8e2b14a -> c59ea8b | lassulus | 2020-09-07 | 1 | -3/+3 |
| | | | |||||
* | | | nixpkgs: e23e054 -> 4267405 | lassulus | 2020-09-07 | 1 | -3/+3 |
| | | | |||||
* | | | Mic92 -> mic92 | lassulus | 2020-08-21 | 1 | -0/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'mic92/master' | lassulus | 2020-08-20 | 3 | -30/+47 |
|\ \ \ | |||||
| * | | | mic92: lower-case user | Jörg Thalheim | 2020-08-20 | 3 | -19/+19 |
| | | | | |||||
| * | | | eva: add public ip addresses | Jörg Thalheim | 2020-08-19 | 1 | -1/+8 |
| | | | | |||||
| * | | | mic92: update eva public key | Jörg Thalheim | 2020-08-19 | 1 | -8/+14 |
| | | | | |||||
| * | | | mic92: use subnet that does not include my server | Jörg Thalheim | 2020-08-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | mic92: allocate retiolum subnet for tinc | Jörg Thalheim | 2020-08-13 | 1 | -2/+6 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'ni/master' | lassulus | 2020-08-19 | 4 | -44/+13 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | tv: privatize gg23 | tv | 2020-08-19 | 2 | -38/+0 |
| | | | | |||||
| * | | | krebs.dns: allow disabling search-domain | tv | 2020-08-16 | 3 | -6/+13 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'gum/master' | lassulus | 2020-08-19 | 3 | -1/+7 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | gitlab-ci: run only on tags | makefu | 2020-08-12 | 1 | -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/stockholm | makefu | 2020-08-12 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Changed Gießzeit to 10 seconds | Neos | 2020-08-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'lass/master' | makefu | 2020-08-11 | 13 | -43/+150 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | shack/share: downgrade samba security | makefu | 2020-08-04 | 1 | -0/+4 |
| | | | | |||||
* | | | | wiki: allow push to git | lassulus | 2020-08-12 | 1 | -26/+44 |
| | | | |