update nginx config

diff --git a/etc/nginx/conf.d/git-http.conf b/etc/nginx/conf.d/git-http.conf
index 58bd8c3cbb75cd7c542ab8364782040bdc46e457..b681509740cb7b9cc956d1d59acc6f6ba94ca835 100644 (file)
--- a/etc/nginx/conf.d/git-http.conf
+++ b/etc/nginx/conf.d/git-http.conf
@@ -30,13 +30,6 @@ server {
         default_type text/html;
     }
 
-    # ----------------------------------------------------------------------
-    # Root Redirect -> v2
-    # ----------------------------------------------------------------------
-    location = / {
-        return 302 /v2;
-    }
-
     # ----------------------------------------------------------------------
     # Version 1: Original Gitweb (Basic)
     # ----------------------------------------------------------------------
@@ -68,7 +61,7 @@ server {
     }
 
     # ----------------------------------------------------------------------
-    # Version 2: Simple Frontend (Theme, Primary gitweb)
+    # Version 2: Styled Frontend (Theme, Static)
     # ----------------------------------------------------------------------
 
     # Custom Theme/Assets Aliases for v2
@@ -104,13 +97,17 @@ server {
     }
 
     # ----------------------------------------------------------------------
-    # Version 3: Gitea (Full Server with Backend)
+    # /v3/ redirect -> root
     # ----------------------------------------------------------------------
-    location = /admin {
-        return 302 /v3/admin;
+    location = /v3/ {
+        return 302 /;
     }
 
-    location ^~ /v3/ {
+    # ----------------------------------------------------------------------
+    # Version 3: Gitea (Full Server with Backend, Main)
+    # ----------------------------------------------------------------------
+
+    location / {
         proxy_pass http://localhost:3000/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -140,6 +137,6 @@ server {
     listen 80;
     listen [::]:80;
     server_name git.nutra.tk;
-    
+
     return 301 https://$host$request_uri;
 }

diff --git a/scripts/gitweb-simplefrontend/services.html b/scripts/gitweb-simplefrontend/services.html
index c6e0bc052279046c22ceae517c62f537e79c2bf9..6dcfb2fb63c52c5647b89f1e4d1cea40db9651df 100644 (file)
--- a/scripts/gitweb-simplefrontend/services.html
+++ b/scripts/gitweb-simplefrontend/services.html
@@ -26,11 +26,11 @@
     </div>
     <div class="service">
         <h2><a href="/v2">/v2</a></h2>
-        <div class="desc">Simple Frontend (Theme, Primary gitweb)</div>
+        <div class="desc">Styled Frontend (Theme, Static)</div>
     </div>
     <div class="service">
         <h2><a href="/v3">/v3</a></h2>
-        <div class="desc">Gitea (Full Server with Backend)</div>
+        <div class="desc">Gitea (Full Server with Backend, Main)</div>
     </div>
 
 </body>