commit d91976dafc9fc0f10ebfaddad00233d2b42fb4c8 (tree) parent 0a4b11c2e4695bb5ba3b904cf58b8c062214f2fb Author: Motiejus Jakštys <motiejus@jakstys.lt> Date: Tue, 27 Aug 2024 08:14:53 +0300 dns and ssh8022 changes Diffstat:
| M | data.nix | | | 54 | +++++++++++++++++++++++++++++------------------------- |
| M | modules/services/ssh8022/default.nix | | | 2 | +- |
2 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/data.nix b/data.nix @@ -197,7 +197,6 @@ rec { auth A ${vno1} dl A ${vno1} fra1-b A ${fra1b} - vno1 A ${vno1} @ TXT google-site-verification=sU99fmO8gEJF-0lbOY-IzkovC6MXsP3Gozqrs8BR5OM @ TXT hosted-email-verify=rvyd6h64 @@ -218,29 +217,34 @@ rec { _imaps._tcp SRV 0 1 993 imap.migadu.com. _pop3s._tcp SRV 0 1 995 imap.migadu.com. - grafana 300 A ${hosts."fwminex.servers.jakst".jakstIP} - _acme-challenge.grafana 300 CNAME _acme-endpoint.grafana - _acme-endpoint.grafana 300 NS ns._acme-endpoint.grafana - ns._acme-endpoint.grafana 300 A ${vno1} - - irc 300 A ${hosts."fwminex.servers.jakst".jakstIP} - _acme-challenge.irc 300 CNAME _acme-endpoint.irc - _acme-endpoint.irc 300 NS ns._acme-endpoint.irc - ns._acme-endpoint.irc 300 A ${vno1} - - hass 300 A ${hosts."fwminex.servers.jakst".jakstIP} - _acme-challenge.hass 300 CNAME _acme-endpoint.hass - _acme-endpoint.hass 300 NS ns._acme-endpoint.hass - ns._acme-endpoint.hass 300 A ${vno1} - - bitwarden 300 A ${hosts."fwminex.servers.jakst".jakstIP} - _acme-challenge.bitwarden 300 CNAME _acme-endpoint.bitwarden - _acme-endpoint.bitwarden 300 NS ns._acme-endpoint.bitwarden - ns._acme-endpoint.bitwarden 300 A ${vno1} - - hdd 300 A ${hosts."vno3-rp3b.servers.jakst".jakstIP} - _acme-challenge.hdd 300 CNAME _acme-endpoint.hdd - _acme-endpoint.hdd 300 NS ns._acme-endpoint.hdd - ns._acme-endpoint.hdd 300 A ${vno1} + grafana A ${hosts."fwminex.servers.jakst".jakstIP} + _acme-challenge.grafana CNAME _acme-endpoint.grafana + _acme-endpoint.grafana NS ns._acme-endpoint.grafana + ns._acme-endpoint.grafana A ${vno1} + + hass A ${hosts."fwminex.servers.jakst".jakstIP} + _acme-challenge.hass CNAME _acme-endpoint.hass + _acme-endpoint.hass NS ns._acme-endpoint.hass + ns._acme-endpoint.hass A ${vno1} + + irc A ${hosts."fwminex.servers.jakst".jakstIP} + _acme-challenge.irc CNAME _acme-endpoint.irc + _acme-endpoint.irc NS ns._acme-endpoint.irc + ns._acme-endpoint.irc A ${vno1} + + hass A ${hosts."fwminex.servers.jakst".jakstIP} + _acme-challenge.hass CNAME _acme-endpoint.hass + _acme-endpoint.hass NS ns._acme-endpoint.hass + ns._acme-endpoint.hass A ${vno1} + + bitwarden A ${hosts."fwminex.servers.jakst".jakstIP} + _acme-challenge.bitwarden CNAME _acme-endpoint.bitwarden + _acme-endpoint.bitwarden NS ns._acme-endpoint.bitwarden + ns._acme-endpoint.bitwarden A ${vno1} + + hdd A ${hosts."vno3-rp3b.servers.jakst".jakstIP} + _acme-challenge.hdd CNAME _acme-endpoint.hdd + _acme-endpoint.hdd NS ns._acme-endpoint.hdd + ns._acme-endpoint.hdd A ${vno1} ''; } diff --git a/modules/services/ssh8022/default.nix b/modules/services/ssh8022/default.nix @@ -24,7 +24,7 @@ in lib.mkIf cfg.enable { programs.ssh.extraConfig = '' - Host dl.jakstys.lt fra1-b.jakstys.lt + Host fra1-b.jakstys.lt jakstys.lt ProxyCommand ${pkgs.spiped}/bin/spipe -t %h:8022 -k ${cfg.keyfile} ''; }