Use the FQDN to setup the HOSTNAME and VHOST files.

The HOSTNAME environment var only contains the first part of the domain
name. Use the fqdn to have it entirely.
This commit is contained in:
Paul Lietar
2013-11-15 01:06:58 +00:00
parent 59ef6510bc
commit a06d27ab45
2 changed files with 2 additions and 2 deletions

View File

@@ -3,7 +3,7 @@ set -eo pipefail
sed -i 's/docker -d$/docker -d -r=true/' /etc/init/docker.conf
echo $HOSTNAME > $DOKKU_ROOT/HOSTNAME
echo $(hostname -f) > $DOKKU_ROOT/HOSTNAME
# temporary hack for https://github.com/progrium/dokku/issues/82

View File

@@ -18,6 +18,6 @@ echo "include $DOKKU_ROOT/*/nginx.conf;" > /etc/nginx/conf.d/dokku.conf
sed -i 's/# server_names_hash_bucket_size/server_names_hash_bucket_size/' /etc/nginx/nginx.conf
[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME > $DOKKU_ROOT/VHOST
[[ $(dig +short $(< "$DOKKU_ROOT/HOSTNAME")) ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST"
/etc/init.d/nginx start