github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #310 from plietar/fqdn

Browse Source 
Use the FQDN to setup the HOSTNAME and VHOST files.
This commit is contained in:
rhy-jot
2013-11-14 22:56:05 -08:00
parent 59ef6510bc ea663d13d3
commit da11349e81
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/00_dokku-standard/install
View File

@@ -3,7 +3,7 @@ set -eo pipefail
sed -i 's/docker -d$/docker -d -r=true/' /etc/init/docker.conf 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 # temporary hack for https://github.com/progrium/dokku/issues/82

2
plugins/nginx-vhosts/install
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 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 /etc/init.d/nginx start

4
tests/ci/receiver
View File

@@ -11,8 +11,10 @@ if [[ $2 == *dokku* ]]; then
tar -xf - tar -xf -
echo "-----> Installing dependencies" echo "-----> Installing dependencies"
DEBIAN_FRONTEND=noninteractive apt-get install -y git make curl software-properties-common DEBIAN_FRONTEND=noninteractive apt-get install -y git make curl software-properties-common
echo "-----> Set hostname to dokku.me"
hostname dokku.me
echo "-----> Running make install" echo "-----> Running make install"
DEBIAN_FRONTEND=noninteractive HOSTNAME=dokku.me make install DEBIAN_FRONTEND=noninteractive make install
echo "-----> Generating keypair..." echo "-----> Generating keypair..."
echo -e "y\n" | ssh-keygen -f /root/.ssh/id_rsa -t rsa -N '' echo -e "y\n" | ssh-keygen -f /root/.ssh/id_rsa -t rsa -N ''
echo "-----> Installing SSH public key..." echo "-----> Installing SSH public key..."