From ef9109b6e68824eb9d51d03fe231c8fc4f7a06c6 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Tue, 24 Nov 2015 12:16:34 -0800 Subject: [PATCH] Use APP_DOMAIN instead of hostname -f --- app.ini.template | 2 +- start.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app.ini.template b/app.ini.template index d0f9b69..2a957f2 100644 --- a/app.ini.template +++ b/app.ini.template @@ -17,7 +17,7 @@ SCRIPT_TYPE = bash [server] PROTOCOL = http -DOMAIN = ##HOSTNAME +DOMAIN = ##DOMAIN ROOT_URL = https://%(DOMAIN)s/ HTTP_ADDR = HTTP_PORT = 3000 diff --git a/start.sh b/start.sh index 7794ea7..070be25 100755 --- a/start.sh +++ b/start.sh @@ -2,8 +2,6 @@ set -eu -o pipefail -readonly fqdn=$(hostname -f) - setup_ldap_source() { set -eu @@ -27,7 +25,7 @@ sed -e "s/^Port .*/Port ${SSH_PORT}/" \ -e "s/^#ListenAddress .*/ListenAddress 0.0.0.0/" \ /etc/ssh/sshd_config > /run/gogs/sshd_config -sed -e "s/##HOSTNAME/${fqdn}/g" \ +sed -e "s/##DOMAIN/${APP_DOMAIN}/g" \ -e "s/##SSH_PORT/${SSH_PORT}/g" \ -e "s/##MYSQL_HOST/${MYSQL_HOST}/g" \ -e "s/##MYSQL_PORT/${MYSQL_PORT}/g" \