config

commit c440ee3043c2be1e0efd45fc5f7e78029357fcb3 (tree)
parent df212bdc8c2bb91393fa729bbe6c8078042b7b41
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Fri,  2 Aug 2024 16:32:04 +0300

remove tls from hass

Diffstat:
M
hosts/vno1-oh2/configuration.nix
 | 
10
+---------

1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix
@@ -172,7 +172,6 @@
           zones = {
             "irc.jakstys.lt".accountKey = accountKey;
             "hdd.jakstys.lt".accountKey = accountKey;
-            "hass.jakstys.lt".accountKey = accountKey;
             "grafana.jakstys.lt".accountKey = accountKey;
             "bitwarden.jakstys.lt".accountKey = accountKey;
           };
@@ -238,11 +237,10 @@
         "git.jakstys.lt".extraConfig = ''reverse_proxy http://${
           myData.hosts."fwminex.servers.jakst".vno1IP
         }'';
-        "hass.jakstys.lt".extraConfig = ''
+        "hass.jakstys.lt:80".extraConfig = ''
           @denied not remote_ip ${myData.subnets.tailscale.cidr}
           abort @denied
           reverse_proxy 127.0.0.1:8123
-          tls {$CREDENTIALS_DIRECTORY}/hass.jakstys.lt-cert.pem {$CREDENTIALS_DIRECTORY}/hass.jakstys.lt-key.pem
         '';
         "grafana.jakstys.lt".extraConfig = ''
           @denied not remote_ip ${myData.subnets.tailscale.cidr}
@@ -534,7 +532,6 @@
     caddy =
       let
         irc = config.mj.services.nsd-acme.zones."irc.jakstys.lt";
-        hass = config.mj.services.nsd-acme.zones."hass.jakstys.lt";
         grafana = config.mj.services.nsd-acme.zones."grafana.jakstys.lt";
         bitwarden = config.mj.services.nsd-acme.zones."bitwarden.jakstys.lt";
       in
@@ -542,8 +539,6 @@
         serviceConfig.LoadCredential = [
           "irc.jakstys.lt-cert.pem:${irc.certFile}"
           "irc.jakstys.lt-key.pem:${irc.keyFile}"
-          "hass.jakstys.lt-cert.pem:${hass.certFile}"
-          "hass.jakstys.lt-key.pem:${hass.keyFile}"
           "grafana.jakstys.lt-cert.pem:${grafana.certFile}"
           "grafana.jakstys.lt-key.pem:${grafana.keyFile}"
           "bitwarden.jakstys.lt-cert.pem:${bitwarden.certFile}"
@@ -551,13 +546,11 @@
         ];
         after = [
           "nsd-acme-irc.jakstys.lt.service"
-          "nsd-acme-hass.jakstys.lt.service"
           "nsd-acme-grafana.jakstys.lt.service"
           "nsd-acme-bitwarden.jakstys.lt.service"
         ];
         requires = [
           "nsd-acme-irc.jakstys.lt.service"
-          "nsd-acme-hass.jakstys.lt.service"
           "nsd-acme-grafana.jakstys.lt.service"
           "nsd-acme-bitwarden.jakstys.lt.service"
         ];
@@ -639,7 +632,6 @@
       pathConfig = {
         PathChanged = [
           config.mj.services.nsd-acme.zones."irc.jakstys.lt".certFile
-          config.mj.services.nsd-acme.zones."hass.jakstys.lt".certFile
           config.mj.services.nsd-acme.zones."grafana.jakstys.lt".certFile
           config.mj.services.nsd-acme.zones."bitwarden.jakstys.lt".certFile
         ];