From cf4269d4eec0edc77cd0eb14663fdb34c32f0d18 Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <mans0954@users.noreply.github.com>
Date: Tue, 11 Jan 2022 16:05:14 +0000
Subject: [PATCH] Merge pull request #6221 from overleaf/ae-web-port

Change web port to 3000 in dev environment

GitOrigin-RevId: 8e9af8fa5e1a35c2c9089d4e9cbf744634cc4e85
---
 docker-compose.debug.yml            |  2 +-
 server-ce/runit/web-sharelatex/run  |  2 +-
 services/git-bridge/conf/local.json | 52 ++++++++++++++---------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml
index f6f5657c19..bdcaa6fff6 100644
--- a/docker-compose.debug.yml
+++ b/docker-compose.debug.yml
@@ -2,7 +2,7 @@ version: '2.2'
 services:
     sharelatex:
         ports:
-            - 40000:40000
+            - 30000:30000
             - 30150:30150
             - 30120:30120
             - 30050:30050
diff --git a/server-ce/runit/web-sharelatex/run b/server-ce/runit/web-sharelatex/run
index 15fba8f806..00531b5f05 100755
--- a/server-ce/runit/web-sharelatex/run
+++ b/server-ce/runit/web-sharelatex/run
@@ -3,7 +3,7 @@
 NODE_PARAMS=""
 if [ "$DEBUG_NODE" == "true" ]; then
     echo "running debug - web"
-    NODE_PARAMS="--inspect=0.0.0.0:40000"
+    NODE_PARAMS="--inspect=0.0.0.0:30000"
 fi
 
 exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/web/app.js >> /var/log/sharelatex/web.log 2>&1
diff --git a/services/git-bridge/conf/local.json b/services/git-bridge/conf/local.json
index 9ced5cb053..03ce4febe4 100644
--- a/services/git-bridge/conf/local.json
+++ b/services/git-bridge/conf/local.json
@@ -1,28 +1,28 @@
 {
-    "port": 8000,
-    "bindIp": "0.0.0.0",
-    "idleTimeout": 30000,
-    "rootGitDirectory": "/tmp/wlgb",
-    "apiBaseUrl": "http://v2.overleaf.test:4000/api/v0",
-    "postbackBaseUrl": "http://git-bridge:8000",
-    "serviceName": "Overleaf",
-    "oauth2": {
-        "oauth2ClientID": "264c723c925c13590880751f861f13084934030c13b4452901e73bdfab226edc",
-        "oauth2ClientSecret": "e6b2e9eee7ae2bb653823250bb69594a91db0547fe3790a7135acb497108e62d",
-        "oauth2Server": "http://v2.overleaf.test:4000"
-    },
-    "repoStore": {
-        "maxFileNum": 2000,
-        "maxFileSize": 52428800
-    },
-    "swapStore": {
-        "type": "noop"
-    },
-    "swapJob": {
-        "minProjects": 50,
-        "lowGiB": 128,
-        "highGiB": 256,
-        "intervalMillis": 3600000,
-        "compressionMethod": "gzip"
-    }
+  "port": 8000,
+  "bindIp": "0.0.0.0",
+  "idleTimeout": 30000,
+  "rootGitDirectory": "/tmp/wlgb",
+  "apiBaseUrl": "http://v2.overleaf.test:3000/api/v0",
+  "postbackBaseUrl": "http://git-bridge:8000",
+  "serviceName": "Overleaf",
+  "oauth2": {
+    "oauth2ClientID": "264c723c925c13590880751f861f13084934030c13b4452901e73bdfab226edc",
+    "oauth2ClientSecret": "e6b2e9eee7ae2bb653823250bb69594a91db0547fe3790a7135acb497108e62d",
+    "oauth2Server": "http://v2.overleaf.test:3000"
+  },
+  "repoStore": {
+    "maxFileNum": 2000,
+    "maxFileSize": 52428800
+  },
+  "swapStore": {
+    "type": "noop"
+  },
+  "swapJob": {
+    "minProjects": 50,
+    "lowGiB": 128,
+    "highGiB": 256,
+    "intervalMillis": 3600000,
+    "compressionMethod": "gzip"
+  }
 }