diff --git a/hosts/reverse-proxy/default.nix b/hosts/reverse-proxy/default.nix index 868b34c..9012e98 100644 --- a/hosts/reverse-proxy/default.nix +++ b/hosts/reverse-proxy/default.nix @@ -103,7 +103,7 @@ initialScript = config.sops.templates.mariadb-init.path; }; - sops.templates.mariadb-init.owner = config.services.mariadb.user; + sops.templates.mariadb-init.owner = config.services.mysql.user; sops.templates.mariadb-init.content = '' CREATE USER 'ergo'@'localhost' IDENTIFIED BY '${config.sops.placeholder.mysql-password}'; CREATE DATABASE ergo_history; diff --git a/hosts/router2/default.nix b/hosts/router2/default.nix index 4fbe734..2951ab2 100644 --- a/hosts/router2/default.nix +++ b/hosts/router2/default.nix @@ -497,7 +497,7 @@ }; chain postrouting { type nat hook postrouting priority 100; policy accept; - ip saddr 192.168.4.1/16 ip daddr 192.168.36.2 meta l4proto { tcp, udp } th dport { 22, 80, 443, 1965, 3471, 5349, 6697, 8448, 3022 } masquerade + ip saddr 192.168.4.1/16 ip daddr 192.168.36.2 meta l4proto { tcp, udp } th dport { 2222, 80, 443, 1965, 3471, 5349, 6697, 8448, 3022 } masquerade #ip6 saddr fd24:9401:8cd6:168::/64 ip6 daddr fd24:9401:8cd6:168::36:2 meta l4proto { tcp, udp } th dport { 80, 443, 1965, 3471, 5349, 6697, 8448, 3022 } masquerade #ip6 saddr fd24:9401:8cd6::/48 snat to 2603:3004:115:8300::97 oifname wan0 snat ip to 50.45.137.234