From 8f3d1b38dbaff759d69a7da1ca7526f2e6580fdb Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Sat, 23 Nov 2019 00:00:47 +0100
Subject: [PATCH] Change gitea location to the root of the domain

---
 modules/devops.nix   |  4 ++--
 modules/webstack.nix | 18 ++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/modules/devops.nix b/modules/devops.nix
index 6142c40..b4443e8 100644
--- a/modules/devops.nix
+++ b/modules/devops.nix
@@ -8,8 +8,8 @@
   # Gitea setup with daily backup
   services.gitea = {
     enable = true;
-    domain = "https://coolneng.duckdns.org";
-    rootUrl = "https://coolneng.duckdns.org/gitea";
+    domain = "coolneng.duckdns.org";
+    rootUrl = "https://coolneng.duckdns.org/";
     database = {
       type = "postgres";
       passwordFile = "/var/keys/gitea/db";
diff --git a/modules/webstack.nix b/modules/webstack.nix
index 9a0118f..9276de4 100644
--- a/modules/webstack.nix
+++ b/modules/webstack.nix
@@ -64,28 +64,14 @@
         locations."/syncthing/" = {
           proxyPass = "http://localhost:8384/";
         };
-        locations."/gitea/" = {
+        locations."/" = {
           proxyPass = "http://localhost:3000/";
         };
         locations."/miniflux/" = {
           proxyPass = "http://localhost:8080/miniflux/";
         };
         locations."/wallabag/" = {
-            root = "/var/lib/wallabag/web";
-            tryFiles = "try_files $uri /app.php$is_args$args";
-            extraConfig = ''
-              location ~ ^/app\.php(/|$) {
-                      fastcgi_pass unix:/var/run/php-fpm.sock;
-                      fastcgi_split_path_info ^(.+\.php)(/.*)$;
-                      fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
-                      fastcgi_param DOCUMENT_ROOT $realpath_root;
-                      internal;
-              }
-
-              location ~ \.php$ {
-                      return 404;
-              }
-            '';
+          proxyPass = "http://localhost:8081/";
         };
       };
     };