From 691498e56062493471ed874ce8c8ed45c0044240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt> Date: Thu, 13 Mar 2025 07:33:23 +0000 Subject: [PATCH] Revert "disable frigate for now" This reverts commit faa21054b6f071ed5d63638807de99e9c82f6967. --- hosts/fwminex/configuration.nix | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index e05ef94..5afdcea 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -27,10 +27,10 @@ in syncthing-key.file = ../../secrets/fwminex/syncthing/key.pem.age; syncthing-cert.file = ../../secrets/fwminex/syncthing/cert.pem.age; frigate.file = ../../secrets/frigate.age; - #r1-htpasswd = { - # file = ../../secrets/r1-htpasswd.age; - # owner = "nginx"; - #}; + r1-htpasswd = { + file = ../../secrets/r1-htpasswd.age; + owner = "nginx"; + }; ssh8022-server = { file = ../../secrets/ssh8022.age; @@ -361,22 +361,22 @@ in }; }; - #nginx = { - # defaultHTTPListenPort = 8081; - # defaultSSLListenPort = 8443; - # recommendedTlsSettings = true; - # virtualHosts."r1.jakstys.lt" = { - # extraConfig = '' - # error_page 497 301 =307 https://$host:$server_port$request_uri; - # auth_basic secured; - # auth_basic_user_file ${config.age.secrets.r1-htpasswd.path}; - # ''; + nginx = { + defaultHTTPListenPort = 8081; + defaultSSLListenPort = 8443; + recommendedTlsSettings = true; + virtualHosts."r1.jakstys.lt" = { + extraConfig = '' + error_page 497 301 =307 https://$host:$server_port$request_uri; + auth_basic secured; + auth_basic_user_file ${config.age.secrets.r1-htpasswd.path}; + ''; - # addSSL = true; - # sslCertificate = "/run/credentials/nginx.service/r1.jakstys.lt-cert.pem"; - # sslCertificateKey = "/run/credentials/nginx.service/r1.jakstys.lt-key.pem"; - # }; - #}; + addSSL = true; + sslCertificate = "/run/credentials/nginx.service/r1.jakstys.lt-cert.pem"; + sslCertificateKey = "/run/credentials/nginx.service/r1.jakstys.lt-key.pem"; + }; + }; nsd = { enable = true; @@ -499,7 +499,7 @@ in }; frigate = { - enable = false; + enable = true; secretsEnv = config.age.secrets.frigate.path; };