Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2024-09-08 01:01:50 +02:00
commit 7061e9c14d
3 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
kartei/makefu/default.nix
View File

@ -205,53 +205,56 @@ in {
gum = rec { gum = rec {
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
rss.euer IN A ${nets.internet.ip4.addr} admin.work.euer IN A ${nets.internet.ip4.addr}
o.euer IN A ${nets.internet.ip4.addr} api.work.euer IN A ${nets.internet.ip4.addr}
bw.euer IN A ${nets.internet.ip4.addr} atuin.euer IN A ${nets.internet.ip4.addr}
board.euer IN A ${nets.internet.ip4.addr}
bookmark.euer IN A ${nets.internet.ip4.addr} bookmark.euer IN A ${nets.internet.ip4.addr}
boot IN A ${nets.internet.ip4.addr} boot IN A ${nets.internet.ip4.addr}
boot.euer IN A ${nets.internet.ip4.addr} boot.euer IN A ${nets.internet.ip4.addr}
build.euer IN A ${nets.internet.ip4.addr} build.euer IN A ${nets.internet.ip4.addr}
bw.euer IN A ${nets.internet.ip4.addr}
cache.euer IN A ${nets.internet.ip4.addr} cache.euer IN A ${nets.internet.ip4.addr}
cache.gum IN A ${nets.internet.ip4.addr} cache.gum IN A ${nets.internet.ip4.addr}
cgit.euer IN A ${nets.internet.ip4.addr} cgit.euer IN A ${nets.internet.ip4.addr}
dl.euer IN A ${nets.internet.ip4.addr} dl.euer IN A ${nets.internet.ip4.addr}
dns.euer IN A ${nets.internet.ip4.addr} dns.euer IN A ${nets.internet.ip4.addr}
dockerhub IN A ${nets.internet.ip4.addr} dockerhub IN A ${nets.internet.ip4.addr}
etherpad.euer IN A ${nets.internet.ip4.addr}
euer IN A ${nets.internet.ip4.addr} euer IN A ${nets.internet.ip4.addr}
euer IN MX 1 aspmx.l.google.com. feed.euer IN A ${nets.internet.ip4.addr}
ghook IN A ${nets.internet.ip4.addr} ghook IN A ${nets.internet.ip4.addr}
git.euer IN A ${nets.internet.ip4.addr} git.euer IN A ${nets.internet.ip4.addr}
gold IN A ${nets.internet.ip4.addr} gold IN A ${nets.internet.ip4.addr}
graph IN A ${nets.internet.ip4.addr} graph IN A ${nets.internet.ip4.addr}
gum IN A ${nets.internet.ip4.addr} gum IN A ${nets.internet.ip4.addr}
io IN NS gum.krebsco.de.
iso.euer IN A ${nets.internet.ip4.addr} iso.euer IN A ${nets.internet.ip4.addr}
feed.euer IN A ${nets.internet.ip4.addr} maps.work.euer IN A ${nets.internet.ip4.addr}
board.euer IN A ${nets.internet.ip4.addr} meet.euer IN A ${nets.internet.ip4.addr}
etherpad.euer IN A ${nets.internet.ip4.addr}
mediengewitter IN CNAME over.dose.io.
mon.euer IN A ${nets.internet.ip4.addr} mon.euer IN A ${nets.internet.ip4.addr}
music.euer IN A ${nets.internet.ip4.addr}
netdata.euer IN A ${nets.internet.ip4.addr} netdata.euer IN A ${nets.internet.ip4.addr}
nixos.unstable IN CNAME krebscode.github.io. ntfy.euer IN A ${nets.internet.ip4.addr}
o.euer IN A ${nets.internet.ip4.addr}
paper.euer IN A ${nets.internet.ip4.addr}
photostore IN A ${nets.internet.ip4.addr} photostore IN A ${nets.internet.ip4.addr}
pigstarter IN CNAME makefu.github.io. play.work.euer IN A ${nets.internet.ip4.addr}
push.work.euer IN A ${nets.internet.ip4.addr}
rss.euer IN A ${nets.internet.ip4.addr}
share.euer IN A ${nets.internet.ip4.addr} share.euer IN A ${nets.internet.ip4.addr}
ul.work.euer IN A ${nets.internet.ip4.addr}
wg.euer IN A ${nets.internet.ip4.addr} wg.euer IN A ${nets.internet.ip4.addr}
wiki.euer IN A ${nets.internet.ip4.addr} wiki.euer IN A ${nets.internet.ip4.addr}
wikisearch IN A ${nets.internet.ip4.addr} wikisearch IN A ${nets.internet.ip4.addr}
meet.euer IN A ${nets.internet.ip4.addr}
work.euer IN A ${nets.internet.ip4.addr} work.euer IN A ${nets.internet.ip4.addr}
admin.work.euer IN A ${nets.internet.ip4.addr}
push.work.euer IN A ${nets.internet.ip4.addr} mediengewitter IN CNAME over.dose.io.
api.work.euer IN A ${nets.internet.ip4.addr} nixos.unstable IN CNAME krebscode.github.io.
maps.work.euer IN A ${nets.internet.ip4.addr} pigstarter IN CNAME makefu.github.io.
play.work.euer IN A ${nets.internet.ip4.addr}
ul.work.euer IN A ${nets.internet.ip4.addr} euer IN MX 1 aspmx.l.google.com.
music.euer IN A ${nets.internet.ip4.addr}
ntfy.euer IN A ${nets.internet.ip4.addr} io IN NS gum.krebsco.de.
paper.euer IN A ${nets.internet.ip4.addr}
''; '';
}; };
nets = rec { nets = rec {
@ -284,6 +287,7 @@ in {
"blog.makefu.r" "blog.makefu.r"
"cache.gum.r" "cache.gum.r"
"cgit.gum.r" "cgit.gum.r"
"git.gum.r"
"dcpp.gum.r" "dcpp.gum.r"
"dcpp.nextgum.r" "dcpp.nextgum.r"
"graph.makefu.r" "graph.makefu.r"

85
krebs/1systems/puyak/config.nix
View File

@ -2,49 +2,52 @@
{ {
imports = [ imports = [
./net.nix ./net.nix
<stockholm/krebs> ../../../krebs
<stockholm/krebs/2configs> ../../../krebs/2configs
<stockholm/krebs/2configs/secret-passwords.nix> ../../2configs/secret-passwords.nix
<stockholm/krebs/2configs/hw/x220.nix> ../../2configs/hw/x220.nix
# see documentation in included getty-for-esp.nix: # see documentation in included getty-for-esp.nix:
# brain hosts/puyak/root # brain hosts/puyak/root
<stockholm/krebs/2configs/hw/getty-for-esp.nix> ../../2configs/hw/getty-for-esp.nix
../../2configs/buildbot/worker.nix
## initrd unlocking ## initrd unlocking
# (brain hosts/puyak/luks-ssd;echo) | ssh root@$(brain krebs-secrets/puyak/initrd/hostname) 'cat > /crypt-ramfs/passphrase' # (brain hosts/puyak/luks-ssd;echo) | ssh root@$(brain krebs-secrets/puyak/initrd/hostname) 'cat /crypt-ramfs/passphrase'
<stockholm/krebs/2configs/tor/initrd.nix> ../../2configs/tor/initrd.nix
<stockholm/krebs/2configs/binary-cache/nixos.nix> ../../2configs/binary-cache/nixos.nix
<stockholm/krebs/2configs/binary-cache/prism.nix> ../../2configs/binary-cache/prism.nix
<stockholm/krebs/2configs/container-networking.nix> ## news host
<stockholm/krebs/2configs/syncthing.nix>
../../2configs/container-networking.nix
../../2configs/syncthing.nix
### shackspace ### ### shackspace ###
# handle the worlddomination map via coap # handle the worlddomination map via coap
<stockholm/krebs/2configs/shack/worlddomination.nix> ../../2configs/shack/worlddomination.nix
<stockholm/krebs/2configs/shack/ssh-keys.nix> ../../2configs/shack/ssh-keys.nix
# drivedroid.shack for shackphone # drivedroid.shack for shackphone
<stockholm/krebs/2configs/shack/drivedroid.nix> ../../2configs/shack/drivedroid.nix
# <stockholm/krebs/2configs/shack/nix-cacher.nix> # ../../2configs/shack/nix-cacher.nix
# Say if muell will be collected # Say if muell will be collected
<stockholm/krebs/2configs/shack/muell_caller.nix> ../../2configs/shack/muell_caller.nix
# provide muellshack api: muell.shack # provide muellshack api: muell.shack
<stockholm/krebs/2configs/shack/muellshack.nix> ../../2configs/shack/muellshack.nix
# send mail if muell was not handled # send mail if muell was not handled
<stockholm/krebs/2configs/shack/muell_mail.nix> ../../2configs/shack/muell_mail.nix
# provide light control api # provide light control api
<stockholm/krebs/2configs/shack/node-light.nix> # light.shack lounge.light.shack power.light.shack openhab.shack lightapi.shack ../../2configs/shack/node-light.nix # light.shack lounge.light.shack power.light.shack openhab.shack lightapi.shack
# light.shack web-ui # light.shack web-ui
<stockholm/krebs/2configs/shack/light.shack.nix> #light.shack ../../2configs/shack/light.shack.nix #light.shack
# fetch the u300 power stats # fetch the u300 power stats
<stockholm/krebs/2configs/shack/power/u300-power.nix> ../../2configs/shack/power/u300-power.nix
{ # do not log to /var/spool/log { # do not log to /var/spool/log
@ -64,50 +67,50 @@
} }
# create samba share for anonymous usage with the laser and 3d printer pc # create samba share for anonymous usage with the laser and 3d printer pc
<stockholm/krebs/2configs/shack/share.nix> ../../2configs/shack/share.nix
# mobile.lounge.mpd.shack # mobile.lounge.mpd.shack
<stockholm/krebs/2configs/shack/mobile.mpd.nix> ../../2configs/shack/mobile.mpd.nix
# hass.shack # hass.shack
<stockholm/krebs/2configs/shack/glados> ../../2configs/shack/glados
<stockholm/krebs/2configs/shack/esphome.nix> ../../2configs/shack/esphome.nix
# connect to git.shackspace.de as group runner for rz # connect to git.shackspace.de as group runner for rz
<stockholm/krebs/2configs/shack/gitlab-runner.nix> ../../2configs/shack/gitlab-runner.nix
# Statistics collection and visualization # Statistics collection and visualization
# <stockholm/krebs/2configs/shack/graphite.nix> # graphiteApi is broken and unused(hopefully) # ../../2configs/shack/graphite.nix # graphiteApi is broken and unused(hopefully)
## Collect data from mqtt.shack and store in graphite database ## Collect data from mqtt.shack and store in graphite database
<stockholm/krebs/2configs/shack/mqtt_sub.nix> ../../2configs/shack/mqtt_sub.nix
## Collect radioactive data and put into graphite ## Collect radioactive data and put into graphite
<stockholm/krebs/2configs/shack/radioactive.nix> ../../2configs/shack/radioactive.nix
## mqtt.shack ## mqtt.shack
<stockholm/krebs/2configs/shack/mqtt.nix> ../../2configs/shack/mqtt.nix
## influx.shack ## influx.shack
<stockholm/krebs/2configs/shack/influx.nix> ../../2configs/shack/influx.nix
## Collect local statistics via collectd and send to collectd ## Collect local statistics via collectd and send to collectd
# <stockholm/krebs/2configs/stats/shack-client.nix> # ../../2configs/stats/shack-client.nix
# <stockholm/krebs/2configs/stats/shack-debugging.nix> # ../../2configs/stats/shack-debugging.nix
## netbox.shack: Netbox is disabled as nobody seems to be using it anyway ## netbox.shack: Netbox is disabled as nobody seems to be using it anyway
# <stockholm/krebs/2configs/shack/netbox.nix> # ../../2configs/shack/netbox.nix
# grafana.shack # grafana.shack
<stockholm/krebs/2configs/shack/grafana.nix> ../../2configs/shack/grafana.nix
# shackdns.shack # shackdns.shack
# replacement for leases.shack and shackles.shack # replacement for leases.shack and shackles.shack
<stockholm/krebs/2configs/shack/shackDNS.nix> ../../2configs/shack/shackDNS.nix
# monitoring: prometheus.shack # monitoring: prometheus.shack
<stockholm/krebs/2configs/shack/prometheus/node.nix> ../../2configs/shack/prometheus/node.nix
<stockholm/krebs/2configs/shack/prometheus/server.nix> ../../2configs/shack/prometheus/server.nix
<stockholm/krebs/2configs/shack/prometheus/blackbox.nix> ../../2configs/shack/prometheus/blackbox.nix
#<stockholm/krebs/2configs/shack/prometheus/unifi.nix> #../../2configs/shack/prometheus/unifi.nix
# TODO: alertmanager 0.24+ supports telegram # TODO: alertmanager 0.24+ supports telegram
# <stockholm/krebs/2configs/shack/prometheus/alertmanager-telegram.nix> # ../../2configs/shack/prometheus/alertmanager-telegram.nix
]; ];
krebs.build.host = config.krebs.hosts.puyak; krebs.build.host = config.krebs.hosts.puyak;

4
krebs/2configs/buildbot/worker.nix
View File

@ -1,4 +1,4 @@
{ buildbot-nix, ... }: { config, buildbot-nix, ... }:
{ {
imports = [ imports = [
buildbot-nix.nixosModules.buildbot-worker buildbot-nix.nixosModules.buildbot-worker
@ -6,6 +6,8 @@
services.buildbot-nix.worker = { services.buildbot-nix.worker = {
enable = true; enable = true;
name = config.krebs.build.host.name;
workerPasswordFile = "/var/src/secrets/nix-worker-file"; workerPasswordFile = "/var/src/secrets/nix-worker-file";
masterUrl = "tcp:host=gum:port=9989";
}; };
} }