diff options
| -rw-r--r-- | krebs/3modules/tv/default.nix | 2 | ||||
| -rw-r--r-- | krebs/4lib/infest/prepare.sh | 10 | ||||
| -rw-r--r-- | tv/1systems/cd.nix | 4 | ||||
| -rw-r--r-- | tv/2configs/backup.nix | 12 |
4 files changed, 9 insertions, 19 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index d44c322aa..1220143a7 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -85,7 +85,7 @@ with import <stockholm/lib>; }; nets = { internet = { - ip4.addr = "45.62.237.203"; + ip4.addr = "64.137.177.226"; aliases = [ "cd.i" "cd.krebsco.de" diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh index e265b0e67..3f5d66431 100644 --- a/krebs/4lib/infest/prepare.sh +++ b/krebs/4lib/infest/prepare.sh @@ -143,10 +143,10 @@ prepare_common() {( mkdir -p /mnt/boot if mount | grep -Fq ' on /boot type '; then - bootdev=$(mount | grep " on /boot type " | sed 's/ .*//') - mount $bootdev /mnt/boot + bootpart=$(mount | grep ' on /boot type ' | sed 's/ .*//') + mount $bootpart /mnt/boot else - mount --bind /boot/ /mnt/boot + mount --bind /boot /mnt/boot fi fi @@ -155,10 +155,12 @@ prepare_common() {( # prepare install directory # - rootpart=$(mount | grep " on / type" | sed 's/ .*//') + rootpart=$(mount | grep ' on / type ' | sed 's/ .*//') mkdir -p /mnt/etc/nixos mkdir -m 0555 -p /mnt/var/empty + mkdir -p /mnt/var/src + touch /mnt/var/src/.populate if ! mount | grep -Fq "$rootpart on /mnt/root type "; then mkdir -p /mnt/root diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 108006f34..b718d19b8 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -16,11 +16,11 @@ with import <stockholm/lib>; networking = { interfaces.enp2s1.ip4 = singleton { address = let - addr = "45.62.237.203"; + addr = "64.137.177.226"; in assert config.krebs.build.host.nets.internet.ip4.addr == addr; addr; prefixLength = 24; }; - defaultGateway = "45.62.237.1"; + defaultGateway = "64.137.177.1"; nameservers = ["8.8.8.8"]; }; diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix index 7c91b1cf1..5cc86cfdd 100644 --- a/tv/2configs/backup.nix +++ b/tv/2configs/backup.nix @@ -46,12 +46,6 @@ with import <stockholm/lib>; dst = { host = config.krebs.hosts.zu; path = "/bku/xu-home"; }; startAt = "06:20"; }; - xu-pull-cd-ejabberd = { - method = "pull"; - src = { host = config.krebs.hosts.cd; path = "/var/ejabberd"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/cd-ejabberd"; }; - startAt = "07:00"; - }; xu-pull-cd-home = { method = "pull"; src = { host = config.krebs.hosts.cd; path = "/home"; }; @@ -76,12 +70,6 @@ with import <stockholm/lib>; dst = { host = config.krebs.hosts.xu; path = "/bku/zu-home"; }; startAt = "05:00"; }; - zu-pull-cd-ejabberd = { - method = "pull"; - src = { host = config.krebs.hosts.cd; path = "/var/ejabberd"; }; - dst = { host = config.krebs.hosts.zu; path = "/bku/cd-ejabberd"; }; - startAt = "06:00"; - }; zu-pull-cd-home = { method = "pull"; src = { host = config.krebs.hosts.cd; path = "/home"; }; |