Move to new house
This commit is contained in:
parent
2371c6f03f
commit
241847c7c7
4 changed files with 13 additions and 9 deletions
|
@ -23,7 +23,7 @@ done
|
|||
|
||||
first_server="${SERVERS%% *}"
|
||||
previous_manifest=$(
|
||||
envsubst <<EOF | ssh -T "root@$first_server.dmz"
|
||||
envsubst <<EOF | ssh -T "root@$first_server"
|
||||
if [[ -f "$GCROOTDIR/$NAME.yml" ]]; then
|
||||
cat "$GCROOTDIR/$NAME.yml"
|
||||
fi
|
||||
|
@ -46,7 +46,7 @@ read -r -p "Continue? " _
|
|||
echo Uploading closure...
|
||||
for server in $SERVERS; do
|
||||
echo Uploading closure to "$server"...
|
||||
nix copy --to "ssh://root@$server.dmz" "$MANIFEST"
|
||||
nix copy --to "ssh://root@$server" "$MANIFEST"
|
||||
done
|
||||
|
||||
echo Applying Kubernetes manifest...
|
||||
|
@ -59,7 +59,7 @@ vals eval -fail-on-missing-key-in-map <"$MANIFEST" |
|
|||
|
||||
echo Creating GC roots
|
||||
for server in $SERVERS; do
|
||||
ssh "root@$server.dmz" "mkdir -p $GCROOTDIR && ln -sf $MANIFEST $GCROOTDIR/${NAME}.yml"
|
||||
ssh "root@$server" "mkdir -p $GCROOTDIR && ln -sf $MANIFEST $GCROOTDIR/${NAME}.yml"
|
||||
done
|
||||
|
||||
if $CREATE_LOCAL_GCROOT; then
|
||||
|
|
|
@ -34,8 +34,8 @@ _: {
|
|||
};
|
||||
};
|
||||
|
||||
routerPublicIPv4 = "192.145.57.90";
|
||||
routerPublicIPv6 = "2a0d:6e00:1a77::1";
|
||||
routerPublicIPv4 = "89.220.7.89";
|
||||
#routerPublicIPv6 = "2a0d:6e00:1a77::1";
|
||||
bind9Ipv6 = "2a0d:6e00:1a77:30::134";
|
||||
|
||||
# Load balancer IPv4
|
||||
|
|
|
@ -117,6 +117,7 @@ in {
|
|||
bind9-udp = {
|
||||
metadata.annotations = {
|
||||
"metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}";
|
||||
# "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4}";
|
||||
"metallb.universe.tf/allow-shared-ip" = "dns";
|
||||
};
|
||||
|
||||
|
@ -137,6 +138,7 @@ in {
|
|||
bind9-tcp = {
|
||||
metadata.annotations = {
|
||||
"metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}";
|
||||
# "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4}";
|
||||
"metallb.universe.tf/allow-shared-ip" = "dns";
|
||||
};
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ with dns.lib.combinators; {
|
|||
SOA = {
|
||||
nameServer = "ns1";
|
||||
adminEmail = "webmaster.kun.is";
|
||||
serial = 2024041301;
|
||||
serial = 2024041302;
|
||||
};
|
||||
|
||||
NS = [
|
||||
|
@ -24,13 +24,15 @@ with dns.lib.combinators; {
|
|||
subdomains = rec {
|
||||
"*".A = [globals.routerPublicIPv4];
|
||||
|
||||
ns = {
|
||||
ns1 = {
|
||||
A = [globals.routerPublicIPv4];
|
||||
AAAA = [];
|
||||
};
|
||||
|
||||
ns1 = ns;
|
||||
ns2 = ns;
|
||||
ns2 = {
|
||||
A = ["192.145.57.90"];
|
||||
AAAA = [];
|
||||
};
|
||||
|
||||
wg = {
|
||||
A = [globals.routerPublicIPv4];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue