From 2730b695e7cc274989ae125c3c54d0ee083cdc4b Mon Sep 17 00:00:00 2001
From: admin <admin@sondell.org>
Date: Sun, 24 Mar 2024 22:51:46 +0100
Subject: [PATCH] feat: git, jelly file up again

---
 audiobooks.nix  | 1 -
 filebrowser.nix | 5 -----
 flake.nix       | 6 +++---
 forgejo.nix     | 6 ------
 jellyfin.nix    | 5 -----
 matrix.nix      | 8 ++++----
 nextcloud.nix   | 4 ++--
 tunnel.nix      | 1 +
 8 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/audiobooks.nix b/audiobooks.nix
index 090d809..7c6574d 100644
--- a/audiobooks.nix
+++ b/audiobooks.nix
@@ -10,7 +10,6 @@ in
     port = 8000;
   };
 
-  services.nginx.enable = true;
 
   services.nginx.virtualHosts.${domain} = {
     default = true;
diff --git a/filebrowser.nix b/filebrowser.nix
index 5cf3325..e6fba73 100644
--- a/filebrowser.nix
+++ b/filebrowser.nix
@@ -20,14 +20,9 @@ in
 
 
   services.nginx.virtualHosts.${domain} = {
-    enableACME = true;
-    forceSSL = true;
     locations."/" = {
       proxyPass = "http://localhost:8080/";
       proxyWebsockets = true;
-      # extraConfig = ''
-      #   access_log /var/log/nginx/access.log main if=$forgejo_access_log;
-      # '';
     };
   };
 }
diff --git a/flake.nix b/flake.nix
index b411e45..9ebf30f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,10 +10,10 @@
         ./configuration.nix 
         ./audiobooks.nix 
         ./tunnel.nix
-        # ./forgejo.nix 
+        ./forgejo.nix 
         # ./nextcloud.nix 
-        # ./jellyfin.nix 
-        # ./filebrowser.nix
+        ./jellyfin.nix 
+        ./filebrowser.nix
         # ./matrix.nix
         # ./tail.nix
         # ./coturn.nix
diff --git a/forgejo.nix b/forgejo.nix
index 123bbc7..bc93c06 100644
--- a/forgejo.nix
+++ b/forgejo.nix
@@ -19,7 +19,6 @@ in
   };
 
   services.nginx = {
-    enable = true;
     appendHttpConfig = ''
       map $uri $forgejo_access_log {
         default 1;
@@ -29,13 +28,8 @@ in
   };
 
   services.nginx.virtualHosts.${domain} = {
-    enableACME = true;
-    forceSSL = true;
     locations."/" = {
       proxyPass = "http://localhost:3000/";
-      # extraConfig = ''
-      #   access_log /var/log/nginx/access.log main if=$forgejo_access_log;
-      # '';
     };
   };
 }
diff --git a/jellyfin.nix b/jellyfin.nix
index 0675dcb..a214af7 100644
--- a/jellyfin.nix
+++ b/jellyfin.nix
@@ -12,14 +12,9 @@ in
 
 
   services.nginx.virtualHosts.${domain} = {
-    enableACME = true;
-    forceSSL = true;
     locations."/" = {
       proxyPass = "http://localhost:8096/";
       proxyWebsockets = true;
-      # extraConfig = ''
-      #   access_log /var/log/nginx/access.log main if=$forgejo_access_log;
-      # '';
     };
   };
 }
diff --git a/matrix.nix b/matrix.nix
index cc2d4c5..2b19a33 100644
--- a/matrix.nix
+++ b/matrix.nix
@@ -52,8 +52,8 @@ services.postgresql = {
 
   services.nginx.virtualHosts = {
     ${fqdn} = {
-      enableACME = true;
-      forceSSL = true;
+      # enableACME = true;
+      # forceSSL = true;
       locations."/".extraConfig = ''
         return 404;
       '';
@@ -65,8 +65,8 @@ services.postgresql = {
     };
 
     ${domain} = {
-      enableACME = true;
-      forceSSL = true;
+      # enableACME = true;
+      # forceSSL = true;
       locations."/" = {
         proxyPass = "http://localhost:8008";
       };
diff --git a/nextcloud.nix b/nextcloud.nix
index 02d9610..e3b8382 100644
--- a/nextcloud.nix
+++ b/nextcloud.nix
@@ -17,8 +17,8 @@ in
   services = {
     nginx.virtualHosts = {
       ${domain} = {
-        forceSSL = true;
-        enableACME = true;
+        # forceSSL = true;
+        # enableACME = true;
         # Use DNS Challenege.
         # acmeRoot = null;
       };
diff --git a/tunnel.nix b/tunnel.nix
index 963a0a9..8591e7c 100644
--- a/tunnel.nix
+++ b/tunnel.nix
@@ -1,5 +1,6 @@
 {...}:
 {
+  services.nginx.enable = true;
  services.cloudflared = {
   enable = true;
   tunnels = {