diff options
| -rw-r--r-- | files/publishing/llp-apache.conf | 6 | ||||
| -rw-r--r-- | host_vars/releases-ap.linaro.org | 1 | ||||
| -rw-r--r-- | host_vars/releases-us.linaro.org | 1 | ||||
| -rw-r--r-- | roles/apache-site/defaults/main.yml | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/files/publishing/llp-apache.conf b/files/publishing/llp-apache.conf index c6d6d46..997bf35 100644 --- a/files/publishing/llp-apache.conf +++ b/files/publishing/llp-apache.conf @@ -1,7 +1,8 @@ <VirtualHost *:80> Alias /static/ {{django_app_root}}/static/ DocumentRoot /srv/{{ hostname }}/www - ServerName {{ hostname }} + ServerName {{ publishing_host }} + ServerAlias {{ hostname }} ServerAdmin webmaster@linaro.org CustomLog /var/log/apache2/{{ hostname }}-access.log combined env=!dontlog ErrorLog /var/log/apache2/{{ hostname }}-error.log @@ -58,7 +59,8 @@ <VirtualHost *:443> Alias /static/ {{django_app_root}}/static/ DocumentRoot /srv/{{ hostname }}/www - ServerName {{ hostname }} + ServerName {{ publishing_host }} + ServerAlias {{ hostname }} ServerAdmin webmaster@linaro.org CustomLog /var/log/apache2/{{ hostname }}-access.log combined env=!dontlog ErrorLog /var/log/apache2/{{ hostname }}-error.log diff --git a/host_vars/releases-ap.linaro.org b/host_vars/releases-ap.linaro.org index 2d153c7..3dc5ff2 100644 --- a/host_vars/releases-ap.linaro.org +++ b/host_vars/releases-ap.linaro.org @@ -1,4 +1,5 @@ sitename: Linaro Releases secrets_file: releases-ap-secrets.py +publishing_host: releases.linaro.org process_report: true diff --git a/host_vars/releases-us.linaro.org b/host_vars/releases-us.linaro.org index ad49d6b..8b1bf57 100644 --- a/host_vars/releases-us.linaro.org +++ b/host_vars/releases-us.linaro.org @@ -1,5 +1,6 @@ sitename: Linaro Releases secrets_file: releases-us-secrets.py +publishing_host: releases.linaro.org process_report: true s3_sanity: true diff --git a/roles/apache-site/defaults/main.yml b/roles/apache-site/defaults/main.yml new file mode 100644 index 0000000..083989b --- /dev/null +++ b/roles/apache-site/defaults/main.yml @@ -0,0 +1,2 @@ +--- +publishing_host: "{{ hostname }}" |