feat(zackbiene): reenable hass with ACME double proxy

hosts/sentinel/acme.nix

@@ -16,6 +16,6 @@ in {
       dnsPropagationCheck = true;
       reloadServices = ["nginx"];
     };
+    wildcardDomains = acme.domains;
   };
-  security.acme.wildcardDomains = acme.domains;
 }

hosts/zackbiene/default.nix

@@ -1,9 +1,12 @@
 {
+  config,
   lib,
   nodes,
   ...
 }: let
+  inherit (config.repo.secrets.local) acme;
   sentinelCfg = nodes.sentinel.config;
+  inherit (sentinelCfg.repo.secrets.local) personalDomain;
 in {
   imports = [
     ../../modules/optional/hardware/odroid-n2plus.nix
@@ -15,15 +18,25 @@ in {
 
     #./esphome.nix
     ./fs.nix
-    #./home-assistant.nix
+    ./home-assistant.nix
     ./hostapd.nix
     #./mosquitto.nix
     ./kea.nix
     ./net.nix
-    #./nginx.nix
     #./zigbee2mqtt.nix
   ];
 
+  users.groups.acme.members = ["nginx"];
+  services.nginx.enable = true;
+
+  security.acme = {
+    acceptTerms = true;
+    defaults = {
+      inherit (acme) email;
+      reloadServices = ["nginx"];
+    };
+  };
+
   meta.wireguard-proxy.sentinel = {};
   meta.promtail = {
     enable = true;

hosts/zackbiene/esphome.nix

@@ -10,6 +10,9 @@
     # TODO instead deny the zigbee device
   };
 
+  #security.acme.certs."home.${personalDomain}".extraDomainNames = [
+  #  "esphome.home.${personalDomain}"
+  #];
   systemd.services.nginx = {
     serviceConfig.SupplementaryGroups = ["esphome"];
     requires = ["esphome.service"];

hosts/zackbiene/home-assistant.nix

@@ -1,10 +1,14 @@
 {
   lib,
   config,
+  nodes,
   ...
 }: let
-  haPort = 8123;
+  sentinelCfg = nodes.sentinel.config;
+  homeDomain = "home.${sentinelCfg.repo.secrets.local.personalDomain}";
 in {
+  meta.wireguard-proxy.sentinel.allowedTCPPorts = [80];
+
   services.home-assistant = {
     enable = true;
     extraComponents = [
@@ -21,7 +25,7 @@ in {
     config = {
       http = {
         server_host = ["127.0.0.1"];
-        server_port = haPort;
+        server_port = 8123;
         use_x_forwarded_for = true;
         trusted_proxies = ["127.0.0.1"];
       };
@@ -38,7 +42,6 @@ in {
           manual = "!include manual.yaml";
         };
       };
-      met = {};
 
       #### only selected components from default_config ####
 
@@ -107,23 +110,21 @@ in {
   # - only allow connections from privileged LAN to HA or from vpn range
 
   services.nginx = {
-    upstreams."homeassistant" = {
+    upstreams.homeassistant = {
-      servers."localhost:${toString haPort}" = {};
+      servers."localhost:${toString config.services.home-assistant.config.http.server_port}" = {};
       extraConfig = ''
         zone homeassistant 64k;
         keepalive 2;
       '';
     };
-    virtualHosts."${config.repo.secrets.local.homeassistant.domain}" = {
+    virtualHosts.${homeDomain} = {
-      serverAliases = ["192.168.1.21"]; # TODO remove later
       forceSSL = true;
-      #enableACME = true;
+      enableACME = true;
-      sslCertificate = config.age.secrets."selfcert.crt".path;
-      sslCertificateKey = config.age.secrets."selfcert.key".path;
       locations."/" = {
         proxyPass = "http://homeassistant";
         proxyWebsockets = true;
       };
+      # TODO listenAddresses = ["127.0.0.1" "[::1]"];
       # TODO dynamic definitions for the "local" network, IPv6
       extraConfig = ''
         allow 192.168.0.0/22;
@@ -131,4 +132,22 @@ in {
       '';
     };
   };
+
+  nodes.sentinel = {
+    services.nginx = {
+      upstreams."zackbiene" = {
+        servers."${config.meta.wireguard.proxy-sentinel.ipv4}:80" = {};
+        extraConfig = ''
+          zone zackbiene 64k;
+          keepalive 2;
+        '';
+      };
+      virtualHosts.${homeDomain} = {
+        # useACMEWildcardHost = true;
+        # TODO add aliases
+        rejectSSL = true; # TODO TLS SNI pass with `ssl_preread on;`
+        locations."/".proxyPass = "http://zackbiene";
+      };
+    };
+  };
 }

hosts/zackbiene/zigbee2mqtt.nix

@@ -10,6 +10,9 @@
     group = "mosquitto";
   };
 
+  #security.acme.certs."home.${personalDomain}".extraDomainNames = [
+  #  "zigbee.home.${personalDomain}"
+  #];
   services.zigbee2mqtt = {
     enable = true;
     settings = {

modules/config/impermanence.nix

@@ -165,6 +165,22 @@
           group = "root";
           mode = "0700";
         }
+      ]
+      ++ lib.optionals config.services.esphome.enable [
+        {
+          directory = "/var/lib/private/esphome";
+          user = "root";
+          group = "root";
+          mode = "0700";
+        }
+      ]
+      ++ lib.optionals config.services.home-assistant.enable [
+        {
+          directory = config.services.home-assistant.configDir;
+          user = "hass";
+          group = "hass";
+          mode = "0700";
+        }
       ];
   };
 }

modules/meta/nginx.nix

@@ -77,6 +77,7 @@ in {
       virtualHosts.dummy = {
         listenAddresses = ["127.0.0.1" "[::1]"];
         default = true;
+        rejectSSL = true;
         locations."/".extraConfig = ''
           deny all;
         '';