Use APP_DOMAIN instead of hostname -f

This commit is contained in:
Girish Ramakrishnan 2015-11-24 12:16:34 -08:00
parent f617a52ca3
commit ef9109b6e6
2 changed files with 2 additions and 4 deletions

View file

@ -17,7 +17,7 @@ SCRIPT_TYPE = bash
[server] [server]
PROTOCOL = http PROTOCOL = http
DOMAIN = ##HOSTNAME DOMAIN = ##DOMAIN
ROOT_URL = https://%(DOMAIN)s/ ROOT_URL = https://%(DOMAIN)s/
HTTP_ADDR = HTTP_ADDR =
HTTP_PORT = 3000 HTTP_PORT = 3000

View file

@ -2,8 +2,6 @@
set -eu -o pipefail set -eu -o pipefail
readonly fqdn=$(hostname -f)
setup_ldap_source() { setup_ldap_source() {
set -eu set -eu
@ -27,7 +25,7 @@ sed -e "s/^Port .*/Port ${SSH_PORT}/" \
-e "s/^#ListenAddress .*/ListenAddress 0.0.0.0/" \ -e "s/^#ListenAddress .*/ListenAddress 0.0.0.0/" \
/etc/ssh/sshd_config > /run/gogs/sshd_config /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/##SSH_PORT/${SSH_PORT}/g" \
-e "s/##MYSQL_HOST/${MYSQL_HOST}/g" \ -e "s/##MYSQL_HOST/${MYSQL_HOST}/g" \
-e "s/##MYSQL_PORT/${MYSQL_PORT}/g" \ -e "s/##MYSQL_PORT/${MYSQL_PORT}/g" \