atlas: configure nginx with upstream services

3 files changed, 19 insertions, 20 deletions

diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix
index 6ed10b8..a2abce8 100644
--- a/systems/atlas/default.nix
+++ b/systems/atlas/default.nix
@@ -6,7 +6,6 @@
     ./forgejo.nix
     ./miniflux.nix
     ./moyai.nix
-    ./nginx.nix
     ./nixpkgs-tracker-bot.nix
 
     inputs.self.nixosModules.default
diff --git a/systems/atlas/miniflux.nix b/systems/atlas/miniflux.nix
index ec5bd3a..a83c4cd 100644
--- a/systems/atlas/miniflux.nix
+++ b/systems/atlas/miniflux.nix
@@ -1,13 +1,26 @@
 { config, secretsDir, ... }:
+
 {
   age.secrets.miniflux.file = secretsDir + "/miniflux.age";
 
-  services.miniflux = {
-    enable = true;
-    adminCredentialsFile = config.age.secrets.miniflux.path;
-    config = {
-      BASE_URL = "https://miniflux.${config.networking.domain}";
-      LISTEN_ADDR = "localhost:7000";
+  services = {
+    miniflux = {
+      enable = true;
+      adminCredentialsFile = config.age.secrets.miniflux.path;
+      config = {
+        BASE_URL = "https://miniflux.${config.networking.domain}";
+        LISTEN_ADDR = "localhost:7000";
+      };
+    };
+
+    nginx = {
+      virtualHosts = {
+        "miniflux.getchoo.com" = {
+          locations."/" = {
+            proxyPass = "http://${config.services.miniflux.config.LISTEN_ADDR}";
+          };
+        };
+      };
     };
   };
 }
diff --git a/systems/atlas/nginx.nix b/systems/atlas/nginx.nix
deleted file mode 100644
index 57c2b0f..0000000
--- a/systems/atlas/nginx.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, ... }:
-
-{
-  services.nginx = {
-    virtualHosts = {
-      "miniflux.getchoo.com" = {
-        locations."/" = {
-          proxyPass = "http://${config.services.miniflux.config.LISTEN_ADDR}";
-        };
-      };
-    };
-  };
-}