From 34766782ba8d79ab4e19f0cca02c3cb0bf691874 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 8 Jun 2025 23:36:11 -0500 Subject: [PATCH 01/42] feat: test --- modules/nixos/services/jellyfin/default.nix | 3 +-- modules/nixos/services/minecraft/default.nix | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/modules/nixos/services/jellyfin/default.nix b/modules/nixos/services/jellyfin/default.nix index cf05dc1..7153901 100644 --- a/modules/nixos/services/jellyfin/default.nix +++ b/modules/nixos/services/jellyfin/default.nix @@ -1,6 +1,5 @@ -{ config, ... }: +{ flake, ... }: let - flake = config.flake; inherit (flake.config.people) user0; inherit (flake.config.machines.devices) ceres; inherit (flake.config.services.instances) jellyfin web; diff --git a/modules/nixos/services/minecraft/default.nix b/modules/nixos/services/minecraft/default.nix index c92ce69..cdb5fe4 100755 --- a/modules/nixos/services/minecraft/default.nix +++ b/modules/nixos/services/minecraft/default.nix @@ -4,12 +4,8 @@ ... }: let - inherit (flake.config.machines.devices) - ceres - ; - inherit (flake.config.services.instances) - minecraft - ; + inherit (flake.config.machines.devices) ceres; + inherit (flake.config.services.instances) minecraft; service = minecraft; in { From f5dcb24bde3895d123e0ee77cca247eacd365e99 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 8 Jun 2025 23:56:11 -0500 Subject: [PATCH 02/42] feat: test --- modules/nixos/default.nix | 2 +- modules/nixos/services/{jellyfin => jellyfinS}/default.nix | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename modules/nixos/services/{jellyfin => jellyfinS}/default.nix (100%) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 05de450..363e111 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -77,7 +77,7 @@ in acme audiobookshelf caddy - jellyfin + jellyfinS logrotate mastodon minecraft diff --git a/modules/nixos/services/jellyfin/default.nix b/modules/nixos/services/jellyfinS/default.nix similarity index 100% rename from modules/nixos/services/jellyfin/default.nix rename to modules/nixos/services/jellyfinS/default.nix From d4e51acad4002e8b4c83cc49778e62d23ded6d72 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 00:13:34 -0500 Subject: [PATCH 03/42] feat: test --- modules/nixos/default.nix | 2 +- modules/nixos/services/glance/config/pages.nix | 2 +- .../config/widgets/{jellyfin => jelly}/config/default.nix | 0 .../glance/config/widgets/{jellyfin => jelly}/default.nix | 0 modules/nixos/services/{jellyfinS => jellyfin}/default.nix | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename modules/nixos/services/glance/config/widgets/{jellyfin => jelly}/config/default.nix (100%) rename modules/nixos/services/glance/config/widgets/{jellyfin => jelly}/default.nix (100%) rename modules/nixos/services/{jellyfinS => jellyfin}/default.nix (100%) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 363e111..05de450 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -77,7 +77,7 @@ in acme audiobookshelf caddy - jellyfinS + jellyfin logrotate mastodon minecraft diff --git a/modules/nixos/services/glance/config/pages.nix b/modules/nixos/services/glance/config/pages.nix index 00bda0a..95cff7b 100755 --- a/modules/nixos/services/glance/config/pages.nix +++ b/modules/nixos/services/glance/config/pages.nix @@ -2,7 +2,7 @@ let widgetsPath = ./widgets; widgets = { - jellyfin = import (widgetsPath + /jellyfin) { inherit config flake; }; + jellyfin = import (widgetsPath + /jelly) { inherit config flake; }; steam = import (widgetsPath + /steam); podcasts = import (widgetsPath + /podcasts.nix); calendar = import (widgetsPath + /calendar.nix); diff --git a/modules/nixos/services/glance/config/widgets/jellyfin/config/default.nix b/modules/nixos/services/glance/config/widgets/jelly/config/default.nix similarity index 100% rename from modules/nixos/services/glance/config/widgets/jellyfin/config/default.nix rename to modules/nixos/services/glance/config/widgets/jelly/config/default.nix diff --git a/modules/nixos/services/glance/config/widgets/jellyfin/default.nix b/modules/nixos/services/glance/config/widgets/jelly/default.nix similarity index 100% rename from modules/nixos/services/glance/config/widgets/jellyfin/default.nix rename to modules/nixos/services/glance/config/widgets/jelly/default.nix diff --git a/modules/nixos/services/jellyfinS/default.nix b/modules/nixos/services/jellyfin/default.nix similarity index 100% rename from modules/nixos/services/jellyfinS/default.nix rename to modules/nixos/services/jellyfin/default.nix From e9fc51faceb27867fad40acdd94aa58250605020 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 00:32:23 -0500 Subject: [PATCH 04/42] feat: test --- modules/nixos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 05de450..ec84c5a 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -89,7 +89,7 @@ in vaultwarden forgejo xserver - # kanboard + kanboard ; }; }; From 4fe55f07ea90f9b60442e0186650d29b14eec2ec Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 00:47:17 -0500 Subject: [PATCH 05/42] feat: kanboard test --- modules/nixos/services/kanboard/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix index 1275b4c..09b966f 100755 --- a/modules/nixos/services/kanboard/default.nix +++ b/modules/nixos/services/kanboard/default.nix @@ -16,6 +16,7 @@ in services = { kanboard = { enable = true; + domain = host; dataDir = "/var/lib/${service.name}"; settings = { HTTP_PROXY_HOSTNAME = host; From 25566608ecee6ea34ab47707d11b38eab837bb5c Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 00:49:28 -0500 Subject: [PATCH 06/42] feat: kanboard test --- modules/config/instances/config/kanboard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/config/instances/config/kanboard.nix b/modules/config/instances/config/kanboard.nix index 542380b..a894a55 100755 --- a/modules/config/instances/config/kanboard.nix +++ b/modules/config/instances/config/kanboard.nix @@ -25,7 +25,7 @@ in path0 = "${servicePath}/${kanboardLabel}"; }; ports = { - port0 = 3434; + port0 = 3232; }; ssl = { cert = "${sslPath}/${kanboardSubdomain}.${domain0}/fullchain.pem"; From 16cb28a20e7d167479284ad732ef03d737bc1aac Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 00:50:17 -0500 Subject: [PATCH 07/42] feat: kanboard test --- modules/config/instances/config/kanboard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/config/instances/config/kanboard.nix b/modules/config/instances/config/kanboard.nix index a894a55..a94b030 100755 --- a/modules/config/instances/config/kanboard.nix +++ b/modules/config/instances/config/kanboard.nix @@ -25,7 +25,7 @@ in path0 = "${servicePath}/${kanboardLabel}"; }; ports = { - port0 = 3232; + port0 = 3128; }; ssl = { cert = "${sslPath}/${kanboardSubdomain}.${domain0}/fullchain.pem"; From 95c4e903ad1f43f5c43ca7a43a162f922850655d Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 00:52:05 -0500 Subject: [PATCH 08/42] feat: kanboard test --- modules/nixos/services/kanboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix index 09b966f..5a2c930 100755 --- a/modules/nixos/services/kanboard/default.nix +++ b/modules/nixos/services/kanboard/default.nix @@ -19,8 +19,8 @@ in domain = host; dataDir = "/var/lib/${service.name}"; settings = { - HTTP_PROXY_HOSTNAME = host; - HTTP_PROXY_PORT = service.ports.port0; + # HTTP_PROXY_HOSTNAME = host; + # HTTP_PROXY_PORT = service.ports.port0; MAIL_SMTP_HOSTNAME = smtp.hostname; MAIL_TRANSPORT = "smtp"; MAIL_SMTP_PORT = smtp.ports.port0; From e8f8c44dcb8c3aa2b9481b488b5e7d1fe15928f6 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 00:56:44 -0500 Subject: [PATCH 09/42] feat: kanboard test --- modules/nixos/services/kanboard/default.nix | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix index 5a2c930..3a2f9e3 100755 --- a/modules/nixos/services/kanboard/default.nix +++ b/modules/nixos/services/kanboard/default.nix @@ -17,18 +17,18 @@ in kanboard = { enable = true; domain = host; - dataDir = "/var/lib/${service.name}"; - settings = { - # HTTP_PROXY_HOSTNAME = host; - # HTTP_PROXY_PORT = service.ports.port0; - MAIL_SMTP_HOSTNAME = smtp.hostname; - MAIL_TRANSPORT = "smtp"; - MAIL_SMTP_PORT = smtp.ports.port0; - MAIL_SMTP_USERNAME = service.email.address0; - MAIL_FROM = service.email.address0; - MAIL_SMTP_PASSWORD = config.sops.secrets."${service.name}-smtp".path; - MAIL_SMTP_ENCRYPTION = "tls"; - }; + # dataDir = "/var/lib/${service.name}"; + # settings = { + # HTTP_PROXY_HOSTNAME = host; + # HTTP_PROXY_PORT = service.ports.port0; + # MAIL_SMTP_HOSTNAME = smtp.hostname; + # MAIL_TRANSPORT = "smtp"; + # MAIL_SMTP_PORT = smtp.ports.port0; + # MAIL_SMTP_USERNAME = service.email.address0; + # MAIL_FROM = service.email.address0; + # MAIL_SMTP_PASSWORD = config.sops.secrets."${service.name}-smtp".path; + # MAIL_SMTP_ENCRYPTION = "tls"; + # }; }; caddy = { virtualHosts = { From 6b4e499a3abab4b520b762d277d52f414d613863 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 01:08:23 -0500 Subject: [PATCH 10/42] feat: kanboard test --- modules/nixos/services/kanboard/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix index 3a2f9e3..35f39dd 100755 --- a/modules/nixos/services/kanboard/default.nix +++ b/modules/nixos/services/kanboard/default.nix @@ -36,6 +36,15 @@ in extraConfig = '' reverse_proxy ${localhost}:${toString service.ports.port0} + route { + encode zstd gzip + + php_fastcgi unix//run/php/php7.2-fpm.sock + + try_files {path} {path}/index.php /index.php?{query} + file_server + } + tls ${service.ssl.cert} ${service.ssl.key} ''; }; From 2b0ab1d5388e336b6f6645aeef9783a2e27cf44b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 01:12:16 -0500 Subject: [PATCH 11/42] feat: kanboard test --- modules/nixos/services/kanboard/default.nix | 78 ++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix index 35f39dd..d7e416d 100755 --- a/modules/nixos/services/kanboard/default.nix +++ b/modules/nixos/services/kanboard/default.nix @@ -16,7 +16,7 @@ in services = { kanboard = { enable = true; - domain = host; + domain = web.localhost.address1; # dataDir = "/var/lib/${service.name}"; # settings = { # HTTP_PROXY_HOSTNAME = host; @@ -51,47 +51,47 @@ in }; }; }; - sops = - let - sopsPath = secret: { - path = "${service.sops.path0}/${service.name}-${secret}"; - owner = service.name; - mode = "600"; - }; - in - { - secrets = builtins.listToAttrs ( - map - (secret: { - name = "${service.name}-${secret}"; - value = sopsPath secret; - }) - [ - "smtp" - ] - ); - }; + # sops = + # let + # sopsPath = secret: { + # path = "${service.sops.path0}/${service.name}-${secret}"; + # owner = service.name; + # mode = "600"; + # }; + # in + # { + # secrets = builtins.listToAttrs ( + # map + # (secret: { + # name = "${service.name}-${secret}"; + # value = sopsPath secret; + # }) + # [ + # "smtp" + # ] + # ); + # }; - fileSystems."/var/lib/${service.name}" = { - device = service.paths.path0; - fsType = "none"; - options = [ - "bind" - ]; - depends = [ - ceres.storage0.mount - ]; - }; + # fileSystems."/var/lib/${service.name}" = { + # device = service.paths.path0; + # fsType = "none"; + # options = [ + # "bind" + # ]; + # depends = [ + # ceres.storage0.mount + # ]; + # }; - systemd.tmpfiles.rules = [ - "Z ${service.paths.path0} 755 ${service.name} ${service.name} -" - "Z ${service.sops.path0} 755 ${service.name} ${service.name} -" - ]; + # systemd.tmpfiles.rules = [ + # "Z ${service.paths.path0} 755 ${service.name} ${service.name} -" + # "Z ${service.sops.path0} 755 ${service.name} ${service.name} -" + # ]; - users.users.${service.name}.extraGroups = [ - "caddy" - "postgres" - ]; + # users.users.${service.name}.extraGroups = [ + # "caddy" + # "postgres" + # ]; networking = { firewall = { From 6693bc981d83a2e9cf75fd639abafb59d2d5817b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 01:25:32 -0500 Subject: [PATCH 12/42] feat: kanboard removed --- modules/config/instances/config/kanboard.nix | 34 ------ modules/nixos/default.nix | 1 - modules/nixos/services/jellyfin/default.nix | 0 modules/nixos/services/kanboard/default.nix | 103 ------------------- 4 files changed, 138 deletions(-) delete mode 100755 modules/config/instances/config/kanboard.nix mode change 100644 => 100755 modules/nixos/services/jellyfin/default.nix delete mode 100755 modules/nixos/services/kanboard/default.nix diff --git a/modules/config/instances/config/kanboard.nix b/modules/config/instances/config/kanboard.nix deleted file mode 100755 index a94b030..0000000 --- a/modules/config/instances/config/kanboard.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ instancesFunctions }: -let - inherit (instancesFunctions) - domain0 - servicePath - sslPath - sopsPath - ; - - kanboardLabel = "Kanboard"; - kanboardName = "kanboard"; - kanboardSubdomain = "todo"; -in -{ - label = kanboardLabel; - name = kanboardName; - email = { - address0 = "noreply@${domain0}"; - }; - sops = { - path0 = "${sopsPath}/${kanboardName}"; - }; - subdomain = kanboardSubdomain; - paths = { - path0 = "${servicePath}/${kanboardLabel}"; - }; - ports = { - port0 = 3128; - }; - ssl = { - cert = "${sslPath}/${kanboardSubdomain}.${domain0}/fullchain.pem"; - key = "${sslPath}/${kanboardSubdomain}.${domain0}/key.pem"; - }; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index ec84c5a..e171e44 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -89,7 +89,6 @@ in vaultwarden forgejo xserver - kanboard ; }; }; diff --git a/modules/nixos/services/jellyfin/default.nix b/modules/nixos/services/jellyfin/default.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix deleted file mode 100755 index d7e416d..0000000 --- a/modules/nixos/services/kanboard/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - flake, - config, - ... -}: -let - inherit (flake.config.machines.devices) - ceres - ; - inherit (flake.config.services.instances) smtp kanboard web; - service = kanboard; - localhost = web.localhost.address0; - host = "${service.subdomain}.${web.domains.url0}"; -in -{ - services = { - kanboard = { - enable = true; - domain = web.localhost.address1; - # dataDir = "/var/lib/${service.name}"; - # settings = { - # HTTP_PROXY_HOSTNAME = host; - # HTTP_PROXY_PORT = service.ports.port0; - # MAIL_SMTP_HOSTNAME = smtp.hostname; - # MAIL_TRANSPORT = "smtp"; - # MAIL_SMTP_PORT = smtp.ports.port0; - # MAIL_SMTP_USERNAME = service.email.address0; - # MAIL_FROM = service.email.address0; - # MAIL_SMTP_PASSWORD = config.sops.secrets."${service.name}-smtp".path; - # MAIL_SMTP_ENCRYPTION = "tls"; - # }; - }; - caddy = { - virtualHosts = { - "${host}" = { - extraConfig = '' - reverse_proxy ${localhost}:${toString service.ports.port0} - - route { - encode zstd gzip - - php_fastcgi unix//run/php/php7.2-fpm.sock - - try_files {path} {path}/index.php /index.php?{query} - file_server - } - - tls ${service.ssl.cert} ${service.ssl.key} - ''; - }; - }; - }; - }; - # sops = - # let - # sopsPath = secret: { - # path = "${service.sops.path0}/${service.name}-${secret}"; - # owner = service.name; - # mode = "600"; - # }; - # in - # { - # secrets = builtins.listToAttrs ( - # map - # (secret: { - # name = "${service.name}-${secret}"; - # value = sopsPath secret; - # }) - # [ - # "smtp" - # ] - # ); - # }; - - # fileSystems."/var/lib/${service.name}" = { - # device = service.paths.path0; - # fsType = "none"; - # options = [ - # "bind" - # ]; - # depends = [ - # ceres.storage0.mount - # ]; - # }; - - # systemd.tmpfiles.rules = [ - # "Z ${service.paths.path0} 755 ${service.name} ${service.name} -" - # "Z ${service.sops.path0} 755 ${service.name} ${service.name} -" - # ]; - - # users.users.${service.name}.extraGroups = [ - # "caddy" - # "postgres" - # ]; - - networking = { - firewall = { - allowedTCPPorts = [ - service.ports.port0 - ]; - }; - }; -} From f8f538acd91e82bd723acf12c1f3164c4436461f Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 02:07:27 -0500 Subject: [PATCH 13/42] feat: nextcloud test --- modules/nixos/default.nix | 1 + modules/nixos/services/nextcloud/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index e171e44..85ae938 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -89,6 +89,7 @@ in vaultwarden forgejo xserver + nextcloud ; }; }; diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 7c8d3b3..2d4baca 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -29,6 +29,7 @@ in inherit (config.services.service.package.packages.apps) contacts calendar + deck ; }; config = { From 6e7ccc32b13829cfb18b6c61927b046d611c327b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 02:12:22 -0500 Subject: [PATCH 14/42] feat: nextcloud test --- modules/nixos/services/acme/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixos/services/acme/default.nix b/modules/nixos/services/acme/default.nix index abc2775..0c23a31 100755 --- a/modules/nixos/services/acme/default.nix +++ b/modules/nixos/services/acme/default.nix @@ -38,7 +38,6 @@ in "syncthing" "searx" "vaultwarden" - "kanboard" "audiobookshelf" ] ) From 5fc36f05f76518a3569c8af222d488914969ec96 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 02:18:16 -0500 Subject: [PATCH 15/42] feat: nextcloud test --- modules/config/instances/config/nginx.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 modules/config/instances/config/nginx.nix diff --git a/modules/config/instances/config/nginx.nix b/modules/config/instances/config/nginx.nix new file mode 100644 index 0000000..fa9bce9 --- /dev/null +++ b/modules/config/instances/config/nginx.nix @@ -0,0 +1,19 @@ +{ instancesFunctions }: +let + inherit (instancesFunctions) + sopsPath + ; + + nginxLabel = "Nginx"; + nginxName = "nginx"; +in +{ + label = nginxLabel; + name = nginxName; + sops = { + path0 = "${sopsPath}/${nginxName}"; + }; + ports = { + port0 = 8080; + }; +} From c6f5c7cdad09c7ad300c8e38bbe69b4fb14e8465 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 02:22:57 -0500 Subject: [PATCH 16/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 2d4baca..463c6cb 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -26,7 +26,7 @@ in phpOptions."opcache.interned_strings_buffer" = "24"; extraAppsEnable = true; extraApps = { - inherit (config.services.service.package.packages.apps) + inherit (pkgs.nextcloud31Packages.apps) contacts calendar deck From 5d981ba6ee23fdaff163ca3c29b95ef411e783af Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 02:24:08 -0500 Subject: [PATCH 17/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 463c6cb..109bd71 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -22,7 +22,7 @@ in enable = true; hostName = host; https = true; - package = pkgs.nextcloud30; + package = pkgs.nextcloud31; phpOptions."opcache.interned_strings_buffer" = "24"; extraAppsEnable = true; extraApps = { From b4ffe57f6ab3443af3d44b32840474e7ed6f6aa7 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 02:29:45 -0500 Subject: [PATCH 18/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 109bd71..06b318b 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -110,6 +110,7 @@ in systemd.tmpfiles.rules = [ "Z ${service.paths.path0} 750 ${service.name} ${service.name} -" + "Z ${service.paths.path0}/config 750 ${service.name} ${service.name} -" "Z ${service.sops.path0} 750 ${service.name} ${service.name} -" ]; From 1d1afd49ccabc73214f8dd4362e0754c06a65c5a Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 02:32:50 -0500 Subject: [PATCH 19/42] feat: nextcloud test --- modules/nixos/services/acme/default.nix | 1 + modules/nixos/services/nextcloud/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/acme/default.nix b/modules/nixos/services/acme/default.nix index 0c23a31..1cbec44 100755 --- a/modules/nixos/services/acme/default.nix +++ b/modules/nixos/services/acme/default.nix @@ -35,6 +35,7 @@ in "jellyfin" "minecraft" "ollama" + "nextcloud" "syncthing" "searx" "vaultwarden" diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 06b318b..4fecb65 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -11,7 +11,7 @@ let inherit (flake.config.services.instances) nextcloud nginx web; service = nextcloud; localhost = web.localhost.address0; - host = "${service.subdomain}.${web.domains.url1}"; + host = "${service.subdomain}.${web.domains.url0}"; in { services = { From f664c6142bd205eee01398dcb18128da22138f90 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:04:37 -0500 Subject: [PATCH 20/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 18 +++++++++++++++--- secrets/secrets.yaml | 6 +++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 4fecb65..afecf88 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -8,7 +8,12 @@ let inherit (flake.config.people) user0; inherit (flake.config.people.users.${user0}) name; inherit (flake.config.machines.devices) ceres; - inherit (flake.config.services.instances) nextcloud nginx web; + inherit (flake.config.services.instances) + nextcloud + nginx + smtp + web + ; service = nextcloud; localhost = web.localhost.address0; host = "${service.subdomain}.${web.domains.url0}"; @@ -43,8 +48,14 @@ in settings = { default_phone_region = "CA"; log_type = "file"; - mail_sendmailmode = "pipe"; - mail_smtpmode = "sendmail"; + mail_sendmailmode = "smtp"; + mail_smtpmode = "smtp"; + mail_smtphost = service.email.address0; + mail_smtpport = smtp.ports.port0; + mail_smtpsecure = "ssl"; + mail_smtpauth = true; + mail_smtpname = smtp.hostname; + mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; trusted_proxies = [ @@ -93,6 +104,7 @@ in }) [ "pass" + "smtp" ] ); }; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index ea48b5b..68942a8 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -35,7 +35,7 @@ wireguard-CA220: ENC[AES256_GCM,data:rNy/IMKqAOsgMUu5r8BZsjTCu0L5fDDDV3/g+pkhW1y wireguard-CA358: ENC[AES256_GCM,data:/VewmiNfRc9/wSE7TT+z1F9LLIvr/5wPsQZ/zBwAh3dEi9yswOGyde2b/XQ=,iv:7U5dmqFiwhCoL1moGSfHprv85o5TdMr6T2sNk5gH82I=,tag:T1hqh8CiO2iBa+ksaiKCtA==,type:str] wireguard-CA627: ENC[AES256_GCM,data:chmDsH2nE0nagjFRZWuxX08/Ykt+rIgCHYkMHd+7nIqihK5SebF7MJlrp84=,iv:NVOlGE7W70nQ0UM/i5WixJvDULO3Y4cLf8h+OAGHhQQ=,tag:L123ShCnr9+kIg1itIoqBA==,type:str] glance-jellyfin: ENC[AES256_GCM,data:ozdDKgAWkA88J2j8RtiOP/aQPAt/neUOSlAZF20g510=,iv:x+VhYlnA9F/VPrzVcma4/oPelCc8kjWoTZvOs4L9Uqo=,tag:crdSDjr8Y5GH/JAF6t8Yeg==,type:str] -kanboard-smtp: ENC[AES256_GCM,data:FmmLEGr5Q8RHtie11Y88XQ==,iv:KtY/Bl2vpkXim7KrkK7cc5n0M0RDlxerbXu9jczj/hI=,tag:ZlbV6d1wH6KmbvHJR3Fq/w==,type:str] +nextcloud-smtp: ENC[AES256_GCM,data:XMNPN6qLGw4WEl5C+u+sDg==,iv:LOhQ5yscdwCYGj3U3RoUy8SdpElZKEr3xSJfE+rDVYc=,tag:+kr4gjrCfqwrXsT4T4CBYQ==,type:str] sops: age: - recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0 @@ -47,7 +47,7 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-09T00:32:17Z" - mac: ENC[AES256_GCM,data:b4WMUmVOzgcz/ajxPl0OfQUGarUtnFIFS3DA9CjogPz6aVNDGWrVged5FB6UOotoqQ5RcgThewSu2HztEfCbhM0ZwZ0ak87XS8QHb++s97HhYeeh5mqgVnpsvF4Coa9aRpc2H4etuUNYFxoDojT/hTUKzg3a3QNSWzB06aKTd1A=,iv:YEJN5sakhN1rFytIDMIHpHAVYxvbt9iI2eXL2YBUYnY=,tag:SNBQWZIrXw4ptMLEqkR/xA==,type:str] + lastmodified: "2025-06-09T08:04:25Z" + mac: ENC[AES256_GCM,data:K7bTarl/RZ3tZ01dG9ZQBpfGzP9Zcx9mnce5HuMUOevkQ+fnBFuFq2QUdV4FDQ+XgUXL7/sIR/epEaOIUxWvaM+CY8Ni6+oI1zIRTJobuUULjz1gKapMaGmTLS0/3JbLgfyYRkY46iV30bn5sSD6yDXZJW4P2pE6Qui3nbBNccE=,iv:ndrrc34ETY+FRGpgmKnJ6X8++f//93HvrzHxyow3b6Y=,tag:Nhz17+DIfRKW9/hcD5JG+A==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From ee2f20c6ad61eab1180b6d870948d5cb6d1d1ec2 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:08:05 -0500 Subject: [PATCH 21/42] feat: nextcloud test --- modules/config/instances/config/nextcloud.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/config/instances/config/nextcloud.nix b/modules/config/instances/config/nextcloud.nix index cedb045..b111c85 100755 --- a/modules/config/instances/config/nextcloud.nix +++ b/modules/config/instances/config/nextcloud.nix @@ -1,7 +1,7 @@ { instancesFunctions }: let inherit (instancesFunctions) - domain1 + domain0 servicePath sslPath sopsPath @@ -13,6 +13,9 @@ in { label = nextcloudLabel; name = nextcloudName; + email = { + address0 = "noreply@${nextcloudName}.${domain0}"; + }; sops = { path0 = "${sopsPath}/${nextcloudName}"; }; @@ -24,7 +27,7 @@ in port0 = 8354; # Nextcloud }; ssl = { - cert = "${sslPath}/${nextcloudName}.${domain1}/fullchain.pem"; - key = "${sslPath}/${nextcloudName}.${domain1}/key.pem"; + cert = "${sslPath}/${nextcloudName}.${domain0}/fullchain.pem"; + key = "${sslPath}/${nextcloudName}.${domain0}/key.pem"; }; } From 3c2f96baa51819e6f4376ecccf67da41abfcaa12 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:23:19 -0500 Subject: [PATCH 22/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 4 +++- secrets/secrets.yaml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index afecf88..0c30bae 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -48,13 +48,15 @@ in settings = { default_phone_region = "CA"; log_type = "file"; + mail_domain = host; mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; - mail_smtphost = service.email.address0; + mail_smtphost = localhost; mail_smtpport = smtp.ports.port0; mail_smtpsecure = "ssl"; mail_smtpauth = true; mail_smtpname = smtp.hostname; + mail_from_address = "noreply"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 68942a8..4efc4a3 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -35,7 +35,7 @@ wireguard-CA220: ENC[AES256_GCM,data:rNy/IMKqAOsgMUu5r8BZsjTCu0L5fDDDV3/g+pkhW1y wireguard-CA358: ENC[AES256_GCM,data:/VewmiNfRc9/wSE7TT+z1F9LLIvr/5wPsQZ/zBwAh3dEi9yswOGyde2b/XQ=,iv:7U5dmqFiwhCoL1moGSfHprv85o5TdMr6T2sNk5gH82I=,tag:T1hqh8CiO2iBa+ksaiKCtA==,type:str] wireguard-CA627: ENC[AES256_GCM,data:chmDsH2nE0nagjFRZWuxX08/Ykt+rIgCHYkMHd+7nIqihK5SebF7MJlrp84=,iv:NVOlGE7W70nQ0UM/i5WixJvDULO3Y4cLf8h+OAGHhQQ=,tag:L123ShCnr9+kIg1itIoqBA==,type:str] glance-jellyfin: ENC[AES256_GCM,data:ozdDKgAWkA88J2j8RtiOP/aQPAt/neUOSlAZF20g510=,iv:x+VhYlnA9F/VPrzVcma4/oPelCc8kjWoTZvOs4L9Uqo=,tag:crdSDjr8Y5GH/JAF6t8Yeg==,type:str] -nextcloud-smtp: ENC[AES256_GCM,data:XMNPN6qLGw4WEl5C+u+sDg==,iv:LOhQ5yscdwCYGj3U3RoUy8SdpElZKEr3xSJfE+rDVYc=,tag:+kr4gjrCfqwrXsT4T4CBYQ==,type:str] +nextcloud-smtp: ENC[AES256_GCM,data:rRElgpQWXYdP1Ec44qLBrg==,iv:0yAvqBJnqOOvDR1JOmqhW46TQfJvVU4ipp+GKd1z3IQ=,tag:17QgXH9pEJp5dYbWiv4IhQ==,type:str] sops: age: - recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0 @@ -47,7 +47,7 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-09T08:04:25Z" - mac: ENC[AES256_GCM,data:K7bTarl/RZ3tZ01dG9ZQBpfGzP9Zcx9mnce5HuMUOevkQ+fnBFuFq2QUdV4FDQ+XgUXL7/sIR/epEaOIUxWvaM+CY8Ni6+oI1zIRTJobuUULjz1gKapMaGmTLS0/3JbLgfyYRkY46iV30bn5sSD6yDXZJW4P2pE6Qui3nbBNccE=,iv:ndrrc34ETY+FRGpgmKnJ6X8++f//93HvrzHxyow3b6Y=,tag:Nhz17+DIfRKW9/hcD5JG+A==,type:str] + lastmodified: "2025-06-09T08:21:52Z" + mac: ENC[AES256_GCM,data:gUobrhkkRdrCvQcMIRwoXjsDD1t6xL+3UUWxqj43DM6a2X1p8uMTEjco1OT8B+LtDvh0+KJvwbXNB1xOBa29DtnwQZM5wSbVIYShmJuO92QMr/AF6dWQso0Ekvr4H/UO64Dc9Jrhda3S7wpAzdHn6hqLacFg8dANF7r4Fcb0h98=,iv:HkKMaRTBi1eJpmRGpCwG1xLuOUocDkFMzU9pjv/7JnA=,tag:1Y6IrqK+Urzwy3KQJhVrBQ==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From dcc77642aa590a1ffd5e9ac02ff7c4c674a9996b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:26:01 -0500 Subject: [PATCH 23/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 0c30bae..aaa3fc1 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -53,8 +53,7 @@ in mail_smtpmode = "smtp"; mail_smtphost = localhost; mail_smtpport = smtp.ports.port0; - mail_smtpsecure = "ssl"; - mail_smtpauth = true; + # mail_smtpauth = true; mail_smtpname = smtp.hostname; mail_from_address = "noreply"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; From f0f02d15383f195d3edf01262a5f8d2bf8b9ab50 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:27:26 -0500 Subject: [PATCH 24/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index aaa3fc1..ecc522e 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -53,7 +53,7 @@ in mail_smtpmode = "smtp"; mail_smtphost = localhost; mail_smtpport = smtp.ports.port0; - # mail_smtpauth = true; + mail_smtpauth = false; mail_smtpname = smtp.hostname; mail_from_address = "noreply"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; From 7e6a670bb4584ca225c37bf067203ab3d9467993 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:31:21 -0500 Subject: [PATCH 25/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index ecc522e..62f91ca 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -53,6 +53,7 @@ in mail_smtpmode = "smtp"; mail_smtphost = localhost; mail_smtpport = smtp.ports.port0; + mail_smtpsecure = ""; mail_smtpauth = false; mail_smtpname = smtp.hostname; mail_from_address = "noreply"; From efd73253e2f9fd35ebfa5462db2f1da6ddd7aaed Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:34:13 -0500 Subject: [PATCH 26/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 62f91ca..57464c4 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -51,7 +51,7 @@ in mail_domain = host; mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; - mail_smtphost = localhost; + mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; mail_smtpsecure = ""; mail_smtpauth = false; From ab254d473d52b884cef8176e92e179e2bb02793f Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:36:29 -0500 Subject: [PATCH 27/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 57464c4..ec7532b 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -51,10 +51,10 @@ in mail_domain = host; mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; - mail_smtphost = smtp.hostname; + mail_smtphost = localhost; mail_smtpport = smtp.ports.port0; mail_smtpsecure = ""; - mail_smtpauth = false; + mail_smtpauth = true; mail_smtpname = smtp.hostname; mail_from_address = "noreply"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; From c3a6be41d3cf09a29ed96b017fbcafbc6809bd7b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:38:56 -0500 Subject: [PATCH 28/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index ec7532b..244dbe7 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -51,11 +51,11 @@ in mail_domain = host; mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; - mail_smtphost = localhost; + mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; mail_smtpsecure = ""; mail_smtpauth = true; - mail_smtpname = smtp.hostname; + mail_smtpname = service.email.address0; mail_from_address = "noreply"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; From 26bbd1f5eea7d9843e24dc3e8437fb7523691f38 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:41:07 -0500 Subject: [PATCH 29/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 244dbe7..9b99b05 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -53,7 +53,7 @@ in mail_smtpmode = "smtp"; mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; - mail_smtpsecure = ""; + mail_smtpsecure = "ssl"; mail_smtpauth = true; mail_smtpname = service.email.address0; mail_from_address = "noreply"; From 300cb132bc8431dcd1f996de3150a49337b05284 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 03:56:22 -0500 Subject: [PATCH 30/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 9b99b05..d23f15c 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -48,15 +48,15 @@ in settings = { default_phone_region = "CA"; log_type = "file"; - mail_domain = host; - mail_sendmailmode = "smtp"; + # mail_domain = host; + # mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; mail_smtpsecure = "ssl"; mail_smtpauth = true; mail_smtpname = service.email.address0; - mail_from_address = "noreply"; + # mail_from_address = "noreply"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; From dc20dde91c1b447788e5e91da5e5929b2ef20188 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:02:39 -0500 Subject: [PATCH 31/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index d23f15c..2ed3d56 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -48,15 +48,15 @@ in settings = { default_phone_region = "CA"; log_type = "file"; - # mail_domain = host; - # mail_sendmailmode = "smtp"; + mail_domain = host; + mail_from_address = "noreply"; + mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; mail_smtpsecure = "ssl"; mail_smtpauth = true; mail_smtpname = service.email.address0; - # mail_from_address = "noreply"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; From a4e6bb82c6dbec4799f97e02305242e9c1abf0e9 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:07:13 -0500 Subject: [PATCH 32/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 2ed3d56..fa2ae92 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -53,7 +53,7 @@ in mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; mail_smtphost = smtp.hostname; - mail_smtpport = smtp.ports.port0; + mail_smtpport = 587; # smtp.ports.port0; mail_smtpsecure = "ssl"; mail_smtpauth = true; mail_smtpname = service.email.address0; @@ -139,6 +139,7 @@ in allowedTCPPorts = [ nginx.ports.port0 service.ports.port0 + 587 ]; }; }; From 21ff52ad7d8f18712587e72604aae811a96bd70c Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:10:11 -0500 Subject: [PATCH 33/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index fa2ae92..90e7831 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -53,8 +53,8 @@ in mail_sendmailmode = "smtp"; mail_smtpmode = "smtp"; mail_smtphost = smtp.hostname; - mail_smtpport = 587; # smtp.ports.port0; - mail_smtpsecure = "ssl"; + mail_smtpport = smtp.ports.port0; + mail_smtpsecure = ""; mail_smtpauth = true; mail_smtpname = service.email.address0; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; @@ -139,7 +139,6 @@ in allowedTCPPorts = [ nginx.ports.port0 service.ports.port0 - 587 ]; }; }; From 90d50b27576945894e2f497e12d5c54b005b9be9 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:18:38 -0500 Subject: [PATCH 34/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 90e7831..2ace0a1 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -55,6 +55,7 @@ in mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; mail_smtpsecure = ""; + mail_smtptimeout = 30; mail_smtpauth = true; mail_smtpname = service.email.address0; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; From 9b497a5078112da399ce11d6abc9908f23f290a6 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:24:29 -0500 Subject: [PATCH 35/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 2ace0a1..33eb362 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -57,7 +57,7 @@ in mail_smtpsecure = ""; mail_smtptimeout = 30; mail_smtpauth = true; - mail_smtpname = service.email.address0; + mail_smtpname = "nick@uprootnutrition.com"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; From b2327a6651f311af5213e170a1b865f4794fd443 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:25:52 -0500 Subject: [PATCH 36/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 33eb362..2ace0a1 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -57,7 +57,7 @@ in mail_smtpsecure = ""; mail_smtptimeout = 30; mail_smtpauth = true; - mail_smtpname = "nick@uprootnutrition.com"; + mail_smtpname = service.email.address0; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; From 07cd42eb03ef23dbdb4b6556df4b5ae956bfedf8 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:32:50 -0500 Subject: [PATCH 37/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 2ace0a1..ff6e18a 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -57,7 +57,7 @@ in mail_smtpsecure = ""; mail_smtptimeout = 30; mail_smtpauth = true; - mail_smtpname = service.email.address0; + mail_smtpname = "noreply@uprootnutrition.com"; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; From 64c6a2c25c7b042c0d906c2279554afe3649e3cc Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:35:07 -0500 Subject: [PATCH 38/42] feat: nextcloud test --- secrets/secrets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 4efc4a3..28cfe33 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -35,7 +35,7 @@ wireguard-CA220: ENC[AES256_GCM,data:rNy/IMKqAOsgMUu5r8BZsjTCu0L5fDDDV3/g+pkhW1y wireguard-CA358: ENC[AES256_GCM,data:/VewmiNfRc9/wSE7TT+z1F9LLIvr/5wPsQZ/zBwAh3dEi9yswOGyde2b/XQ=,iv:7U5dmqFiwhCoL1moGSfHprv85o5TdMr6T2sNk5gH82I=,tag:T1hqh8CiO2iBa+ksaiKCtA==,type:str] wireguard-CA627: ENC[AES256_GCM,data:chmDsH2nE0nagjFRZWuxX08/Ykt+rIgCHYkMHd+7nIqihK5SebF7MJlrp84=,iv:NVOlGE7W70nQ0UM/i5WixJvDULO3Y4cLf8h+OAGHhQQ=,tag:L123ShCnr9+kIg1itIoqBA==,type:str] glance-jellyfin: ENC[AES256_GCM,data:ozdDKgAWkA88J2j8RtiOP/aQPAt/neUOSlAZF20g510=,iv:x+VhYlnA9F/VPrzVcma4/oPelCc8kjWoTZvOs4L9Uqo=,tag:crdSDjr8Y5GH/JAF6t8Yeg==,type:str] -nextcloud-smtp: ENC[AES256_GCM,data:rRElgpQWXYdP1Ec44qLBrg==,iv:0yAvqBJnqOOvDR1JOmqhW46TQfJvVU4ipp+GKd1z3IQ=,tag:17QgXH9pEJp5dYbWiv4IhQ==,type:str] +nextcloud-smtp: ENC[AES256_GCM,data:LdEx/jWmjxa3+ryyVNc1Ew==,iv:h4LbcNXXb0fTh3Wm4VwU0NG4n1PVJxisCrVW2q95otE=,tag:aQNR3Da9RbqsvhrT4lMq5A==,type:str] sops: age: - recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0 @@ -47,7 +47,7 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-09T08:21:52Z" - mac: ENC[AES256_GCM,data:gUobrhkkRdrCvQcMIRwoXjsDD1t6xL+3UUWxqj43DM6a2X1p8uMTEjco1OT8B+LtDvh0+KJvwbXNB1xOBa29DtnwQZM5wSbVIYShmJuO92QMr/AF6dWQso0Ekvr4H/UO64Dc9Jrhda3S7wpAzdHn6hqLacFg8dANF7r4Fcb0h98=,iv:HkKMaRTBi1eJpmRGpCwG1xLuOUocDkFMzU9pjv/7JnA=,tag:1Y6IrqK+Urzwy3KQJhVrBQ==,type:str] + lastmodified: "2025-06-09T09:34:53Z" + mac: ENC[AES256_GCM,data:qlwEHxVKfi9Lc3j+1E0c4gRNq/lD4A+KO+ybmPomtRXnUNRv+9FqhU9k4WSvKRZd2izwW8vQpvXMSgtVrLWf3JW5OMO7jJG9hkFP2078k/nxQqtyUGdh/q0QBd65WKmubvIV6g65ljPNORl0YSNGddx2ecOhaz/NVgfMAAhpAnk=,iv:IfkZKV1R3tQ+KAjeYvmQVLjdyYiRV0h1uKBJGz6h0aA=,tag:I/7tfIVFQ5eItI6ya91AUQ==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From 3d7deb2d160cd7c3efd0b1b44c02b852808769eb Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:37:54 -0500 Subject: [PATCH 39/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- secrets/secrets.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index ff6e18a..2ace0a1 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -57,7 +57,7 @@ in mail_smtpsecure = ""; mail_smtptimeout = 30; mail_smtpauth = true; - mail_smtpname = "noreply@uprootnutrition.com"; + mail_smtpname = service.email.address0; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; overwriteprotocol = "https"; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 28cfe33..857746f 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -35,7 +35,7 @@ wireguard-CA220: ENC[AES256_GCM,data:rNy/IMKqAOsgMUu5r8BZsjTCu0L5fDDDV3/g+pkhW1y wireguard-CA358: ENC[AES256_GCM,data:/VewmiNfRc9/wSE7TT+z1F9LLIvr/5wPsQZ/zBwAh3dEi9yswOGyde2b/XQ=,iv:7U5dmqFiwhCoL1moGSfHprv85o5TdMr6T2sNk5gH82I=,tag:T1hqh8CiO2iBa+ksaiKCtA==,type:str] wireguard-CA627: ENC[AES256_GCM,data:chmDsH2nE0nagjFRZWuxX08/Ykt+rIgCHYkMHd+7nIqihK5SebF7MJlrp84=,iv:NVOlGE7W70nQ0UM/i5WixJvDULO3Y4cLf8h+OAGHhQQ=,tag:L123ShCnr9+kIg1itIoqBA==,type:str] glance-jellyfin: ENC[AES256_GCM,data:ozdDKgAWkA88J2j8RtiOP/aQPAt/neUOSlAZF20g510=,iv:x+VhYlnA9F/VPrzVcma4/oPelCc8kjWoTZvOs4L9Uqo=,tag:crdSDjr8Y5GH/JAF6t8Yeg==,type:str] -nextcloud-smtp: ENC[AES256_GCM,data:LdEx/jWmjxa3+ryyVNc1Ew==,iv:h4LbcNXXb0fTh3Wm4VwU0NG4n1PVJxisCrVW2q95otE=,tag:aQNR3Da9RbqsvhrT4lMq5A==,type:str] +nextcloud-smtp: ENC[AES256_GCM,data:GbNv/pHAtPru00m5OCER8g==,iv:Q1WYLKe34VsCvP1trk6IXm46RbVFMnsq4Eb5e2MBVgk=,tag:dwmimioRlHKbZeDv3THfzQ==,type:str] sops: age: - recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0 @@ -47,7 +47,7 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-09T09:34:53Z" - mac: ENC[AES256_GCM,data:qlwEHxVKfi9Lc3j+1E0c4gRNq/lD4A+KO+ybmPomtRXnUNRv+9FqhU9k4WSvKRZd2izwW8vQpvXMSgtVrLWf3JW5OMO7jJG9hkFP2078k/nxQqtyUGdh/q0QBd65WKmubvIV6g65ljPNORl0YSNGddx2ecOhaz/NVgfMAAhpAnk=,iv:IfkZKV1R3tQ+KAjeYvmQVLjdyYiRV0h1uKBJGz6h0aA=,tag:I/7tfIVFQ5eItI6ya91AUQ==,type:str] + lastmodified: "2025-06-09T09:37:48Z" + mac: ENC[AES256_GCM,data:gBEfsR718Hn+GJ1wzxS3T1HOrNL659TUUq3l3nUNxbY2SxXWnnHxzdMhf2xP1/tm3Vst2MC/SjPszdbqVnVKIS1k+iwT+WSLH7OlbASku62cx9J9RKqm4PJd/2KtKR7Yaj4dU9+F7RnKtCA4N/m4ZA+BiD0oib76/Aa64tjVtDo=,iv:rJ+WfAFR8Un/u66Y2554BjDzJifQLdXNDexpl4GGClw=,tag:tY2biwFl7ywaHe3aTKjCMA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From 54c7207931779c4bc3fdf18ca0c53ac4e5528cf8 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:53:18 -0500 Subject: [PATCH 40/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 2ace0a1..bb9e6b2 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -54,8 +54,8 @@ in mail_smtpmode = "smtp"; mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; - mail_smtpsecure = ""; - mail_smtptimeout = 30; + mail_smtpsecure = "ssl"; + mail_smtptimeout = "30"; mail_smtpauth = true; mail_smtpname = service.email.address0; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; From 63abc7b765363740b0f48efbff4710cc183c9918 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:54:32 -0500 Subject: [PATCH 41/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index bb9e6b2..4490bb5 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -55,8 +55,8 @@ in mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; mail_smtpsecure = "ssl"; - mail_smtptimeout = "30"; - mail_smtpauth = true; + mail_smtptimeout = 30; + mail_smtpauth = 1; mail_smtpname = service.email.address0; mail_smtppassword = config.sops.secrets."${service.name}-smtp".path; maintenance_window_start = 4; From ba7b722d33e28b8c843dc7777a25afa7fb740f2b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Jun 2025 04:55:43 -0500 Subject: [PATCH 42/42] feat: nextcloud test --- modules/nixos/services/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 4490bb5..7439560 100755 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -54,7 +54,7 @@ in mail_smtpmode = "smtp"; mail_smtphost = smtp.hostname; mail_smtpport = smtp.ports.port0; - mail_smtpsecure = "ssl"; + mail_smtpsecure = ""; mail_smtptimeout = 30; mail_smtpauth = 1; mail_smtpname = service.email.address0;