diff options
| author | Tim Flink <tflink@fedoraproject.org> | 2016-04-07 15:00:52 +0000 |
|---|---|---|
| committer | Tim Flink <tflink@fedoraproject.org> | 2016-04-07 15:01:02 +0000 |
| commit | 9e7af9bdad44dcf25e04367e8d42bf6d138d97a1 (patch) | |
| tree | bbd3b4ebff4c72b8781daf140cbcdcd3c0616e42 | |
| parent | 2377467d3a1366ac796f5e2dea217269eef661f7 (diff) | |
| download | ansible-9e7af9bdad44dcf25e04367e8d42bf6d138d97a1.tar.gz ansible-9e7af9bdad44dcf25e04367e8d42bf6d138d97a1.tar.xz ansible-9e7af9bdad44dcf25e04367e8d42bf6d138d97a1.zip | |
stop using virthosts for qadevel static files
| -rw-r--r-- | files/httpd/qadevel-virtualhost.conf.j2 | 24 | ||||
| -rw-r--r-- | inventory/group_vars/qa-stg | 5 |
2 files changed, 9 insertions, 20 deletions
diff --git a/files/httpd/qadevel-virtualhost.conf.j2 b/files/httpd/qadevel-virtualhost.conf.j2 index cca7a7afa..bfa601cb8 100644 --- a/files/httpd/qadevel-virtualhost.conf.j2 +++ b/files/httpd/qadevel-virtualhost.conf.j2 @@ -1,22 +1,8 @@ # 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 }} +Alias {{ item.document_root }} /{{ item.name }} - DocumentRoot {{ item.document_root }} - - ErrorLog "/var/log/httpd/{{ item.name }}.error_log" - CustomLog "/var/log/httpd/{{ item.name }}.access_log" common - - <Directory "{{ item.document_root }}"> - Options Indexes FollowSymLinks - Require all granted - </Directory> - - <Location "/"> - Options +Indexes - DirectoryIndex default.html - </Location> - -</VirtualHost> +<Directory "{{ item.document_root }}"> + Options Indexes FollowSymLinks + Require all granted +</Directory> diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg index 6921e8081..e2679325a 100644 --- a/inventory/group_vars/qa-stg +++ b/inventory/group_vars/qa-stg @@ -78,8 +78,11 @@ tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 3306 ] # static sites static_sites: - - name: docs.{{ inventory_hostname }} + - name: docs document_root: /srv/content/docs + - name: releases + document_root: /srv/content/releases + sslonly: false freezes: false |