diff --git a/services/git-bridge/conf/envsubst_template.json b/services/git-bridge/conf/envsubst_template.json index 2e024e2890..95c51126ba 100644 --- a/services/git-bridge/conf/envsubst_template.json +++ b/services/git-bridge/conf/envsubst_template.json @@ -1,30 +1,32 @@ { "port": ${GIT_BRIDGE_PORT:-8000}, - "rootGitDirectory": "${GIT_BRIDGE_ROOT_DIR:-/tmp/wlgb}", - "apiBaseUrl": "${GIT_BRIDGE_API_BASE_URL:-https://localhost/api/v0}", - "postbackBaseUrl": "${GIT_BRIDGE_POSTBACK_BASE_URL:-https://localhost}", - "serviceName": "${GIT_BRIDGE_SERVICE_NAME:-Overleaf}", - "oauth2": { - "oauth2ClientID": "${GIT_BRIDGE_OAUTH2_CLIENT_ID}", - "oauth2ClientSecret": "${GIT_BRIDGE_OAUTH2_CLIENT_SECRET}", - "oauth2Server": "${GIT_BRIDGE_OAUTH2_SERVER:-https://localhost}" - }, - "repoStore": { - "maxFileNum": ${GIT_BRIDGE_REPOSTORE_MAX_FILE_NUM:-2000}, - "maxFileSize": ${GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE:-52428800} - }, - "swapStore": { - "type": "${GIT_BRIDGE_SWAPSTORE_TYPE:-noop}", - "awsAccessKey": "${GIT_BRIDGE_SWAPSTORE_AWS_ACCESS_KEY}", - "awsSecret": "${GIT_BRIDGE_SWAPSTORE_AWS_SECRET}", - "s3BucketName": "${GIT_BRIDGE_SWAPSTORE_S3_BUCKET_NAME}", - "awsRegion": "${GIT_BRIDGE_SWAPSTORE_AWS_REGION:-us-east-1}" - }, - "swapJob": { - "minProjects": ${GIT_BRIDGE_SWAPJOB_MIN_PROJECTS:-50}, - "lowGiB": ${GIT_BRIDGE_SWAPJOB_LOW_GIB:-128}, - "highGiB": ${GIT_BRIDGE_SWAPJOB_HIGH_GIB:-256}, - "intervalMillis": ${GIT_BRIDGE_SWAPJOB_INTERVAL_MILLIS:-3600000}, - "compressionMethod": "${GIT_BRIDGE_SWAPJOB_COMPRESSION_METHOD:-gzip}" - } + "bindIp": "${GIT_BRIDGE_BIND_IP:-0.0.0.0}", + "idleTimeout": "${GIT_BRIDGE_IDLE_TIMEOUT:-600000", + "rootGitDirectory": "${GIT_BRIDGE_ROOT_DIR:-/tmp/wlgb}", + "apiBaseUrl": "${GIT_BRIDGE_API_BASE_URL:-https://localhost/api/v0}", + "postbackBaseUrl": "${GIT_BRIDGE_POSTBACK_BASE_URL:-https://localhost}", + "serviceName": "${GIT_BRIDGE_SERVICE_NAME:-Overleaf}", + "oauth2": { + "oauth2ClientID": "${GIT_BRIDGE_OAUTH2_CLIENT_ID}", + "oauth2ClientSecret": "${GIT_BRIDGE_OAUTH2_CLIENT_SECRET}", + "oauth2Server": "${GIT_BRIDGE_OAUTH2_SERVER:-https://localhost}" + }, + "repoStore": { + "maxFileNum": ${GIT_BRIDGE_REPOSTORE_MAX_FILE_NUM:-2000}, + "maxFileSize": ${GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE:-52428800} + }, + "swapStore": { + "type": "${GIT_BRIDGE_SWAPSTORE_TYPE:-noop}", + "awsAccessKey": "${GIT_BRIDGE_SWAPSTORE_AWS_ACCESS_KEY}", + "awsSecret": "${GIT_BRIDGE_SWAPSTORE_AWS_SECRET}", + "s3BucketName": "${GIT_BRIDGE_SWAPSTORE_S3_BUCKET_NAME}", + "awsRegion": "${GIT_BRIDGE_SWAPSTORE_AWS_REGION:-us-east-1}" + }, + "swapJob": { + "minProjects": ${GIT_BRIDGE_SWAPJOB_MIN_PROJECTS:-50}, + "lowGiB": ${GIT_BRIDGE_SWAPJOB_LOW_GIB:-128}, + "highGiB": ${GIT_BRIDGE_SWAPJOB_HIGH_GIB:-256}, + "intervalMillis": ${GIT_BRIDGE_SWAPJOB_INTERVAL_MILLIS:-3600000}, + "compressionMethod": "${GIT_BRIDGE_SWAPJOB_COMPRESSION_METHOD:-gzip}" + } } diff --git a/services/git-bridge/conf/example_config.json b/services/git-bridge/conf/example_config.json index b8901b57ad..d2d1e3803e 100644 --- a/services/git-bridge/conf/example_config.json +++ b/services/git-bridge/conf/example_config.json @@ -1,5 +1,7 @@ { "port": 8080, + "bindIp": "127.0.0.1", + "idleTimeout": 60000, "rootGitDirectory": "/tmp/wlgb", "apiBaseUrl": "https://localhost/api/v0", "postbackBaseUrl": "https://localhost", diff --git a/services/git-bridge/conf/local.json b/services/git-bridge/conf/local.json index 0b2e3e1241..73121ce6ef 100644 --- a/services/git-bridge/conf/local.json +++ b/services/git-bridge/conf/local.json @@ -1,5 +1,7 @@ { "port": 8000, + "bindIp": "0.0.0.0", + "idleTimeout": 600000, "rootGitDirectory": "/tmp/wlgb", "apiBaseUrl": "http://v2.overleaf.test:4000/api/v0", "postbackBaseUrl": "http://git-bridge:8000",