reworking qa-stg static sites to work better with proxy setup

This commit is contained in:
Tim Flink 2016-04-04 16:38:08 +00:00
parent f1069c8a67
commit 91c913e569
2 changed files with 10 additions and 8 deletions

View file

@ -0,0 +1,9 @@
# this is meant for proxied stuff only, hence the lack of ssl
<VirtualHost *:80>
# Change this to the domain which points to your host.
ServerName {{ item.name }}
Options Indexes FollowSymLinks
DocumentRoot {{ item.document_root }}
</VirtualHost>

View file

@ -83,13 +83,6 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
tasks:
- name: ensure ServerName is set in ssl.conf
replace: dest=/etc/httpd/conf.d/ssl.conf regexp='^#ServerName .*$' replace='ServerName {{ external_hostname }}:443'
notify:
- reload httpd
tags:
- qastaticsites
- name: ensure ServerName is set in httpd.conf
replace: dest=/etc/httpd/conf/httpd.conf regexp='^#ServerName .*$' replace='ServerName {{ external_hostname }}:443'
notify:
@ -104,7 +97,7 @@
- qastaticsites
- name: generate virtualhosts for static sites
template: src={{ files }}/httpd/newvirtualhost.conf.j2 dest=/etc/httpd/conf.d/{{ item.name }}.conf owner=root group=root mode=0644
template: src={{ files }}/httpd/qadevel-virtualhost.conf.j2 dest=/etc/httpd/conf.d/{{ item.name }}.conf owner=root group=root mode=0644
with_items: "{{ static_sites }}"
notify:
- reload httpd