commit 87161c284c27cb43583103d85782277870536922
author Luca Milanesio <luca.milanesio@gmail.com> Sat Jan 04 22:10:35 2020 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Sat Jan 04 22:10:35 2020 +0000
tree b076ac75aa7ccbabea6736605c758df7a3ab0b67
parent eb2e57d856d6c37c1a8fc74255ab8ef00269b1af
parent 52dacb6ccd513c96513bf064ee8b1bc8a9d3ce3b

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Disable HTTPS by default in local environment

Change-Id: I88d51b4c7242ad1d41ac12b3df479ad1884a1273

setup_local_env/setup.sh

diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh
index 5ff28e4..c920c66 100755
--- a/setup_local_env/setup.sh
+++ b/setup_local_env/setup.sh
@@ -288,7 +288,7 @@
 REPLICATION_SSH_USER=${REPLICATION_SSH_USER:-$(whoami)}
 export REPLICATION_DELAY_SEC=${REPLICATION_DELAY_SEC:-"5"}
 export SSH_ADVERTISED_PORT=${SSH_ADVERTISED_PORT:-"29418"}
-HTTPS_ENABLED=${HTTPS_ENABLED:-"true"}
+HTTPS_ENABLED=${HTTPS_ENABLED:-"false"}
 
 COMMON_LOCATION=$DEPLOYMENT_LOCATION/gerrit_setup
 LOCATION_TEST_SITE_1=$COMMON_LOCATION/instance-1