From 8629d55d4a8cb576d073dbf6865bdd59fdaac7a2 Mon Sep 17 00:00:00 2001 From: Trevor Fitzgerald Date: Wed, 15 Nov 2023 18:09:05 -0500 Subject: [PATCH] https for gitpod --- conf/lila-ws.conf | 2 +- conf/lila.conf | 6 +++--- docker-compose.yml | 2 ++ lila-docker | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/conf/lila-ws.conf b/conf/lila-ws.conf index f44d6df5..291d2b3f 100644 --- a/conf/lila-ws.conf +++ b/conf/lila-ws.conf @@ -3,4 +3,4 @@ include "application" mongo.uri = "mongodb://mongodb:27017/lichess?appName=lila-ws" redis.uri = "redis://redis" -csrf.origin = "http://"${?LILA_DOMAIN} +csrf.origin = ${?SCHEME}"://"${?LILA_DOMAIN} diff --git a/conf/lila.conf b/conf/lila.conf index 56a271a0..b8ccba1d 100644 --- a/conf/lila.conf +++ b/conf/lila.conf @@ -6,9 +6,9 @@ user.password.bpass.secret = "9qEYN0ThHer1KWLNekA76Q==" net.site.name = "lila" net.domain = ${?LILA_DOMAIN} net.socket.domains = [ ${?LILA_DOMAIN} ] -net.asset.base_url = "http://"${?LILA_DOMAIN} +net.asset.base_url = ${?SCHEME}"://"${?LILA_DOMAIN} net.asset.base_url_internal = "http://nginx" -net.base_url = "http://"${?LILA_DOMAIN} +net.base_url = ${?SCHEME}"://"${?LILA_DOMAIN} mongodb.uri = "mongodb://mongodb?appName=lila" redis.uri = "redis://redis" @@ -18,7 +18,7 @@ game.gifUrl = "http://lila_gif:6175" search.enabled = true search.endpoint = "http://lila_search:9673" -memo.picfit.endpointGet = "http://"${?PICFIT_DOMAIN} +memo.picfit.endpointGet = ${?SCHEME}"://"${?PICFIT_DOMAIN} memo.picfit.endpointPost = "http://picfit:3001" mailer.primary.mock = false diff --git a/docker-compose.yml b/docker-compose.yml index 0466dd11..5ac59104 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,6 +22,7 @@ services: networks: - lila-network environment: + - SCHEME=${SCHEME:-http} - LILA_DOMAIN=${LILA_DOMAIN:-localhost:8080} - PICFIT_DOMAIN=${PICFIT_DOMAIN:-localhost:3001} volumes: @@ -40,6 +41,7 @@ services: networks: - lila-network environment: + - SCHEME=${SCHEME:-http} - LILA_DOMAIN=${LILA_DOMAIN:-localhost:8080} volumes: - ./repos/lila-ws:/lila-ws diff --git a/lila-docker b/lila-docker index 053d1e49..232c4bd1 100755 --- a/lila-docker +++ b/lila-docker @@ -2,6 +2,7 @@ set -e if [ ! -z "$GITPOD_WORKSPACE_ID" ]; then + export SCHEME=https export LILA_DOMAIN=$(gp url 8080 | cut -c9-) export PICFIT_DOMAIN=$(gp url 3001 | cut -c9-) fi