Fix #18: Specify apache vhost.conf location

Author: Wtower

README.md

@@ -33,6 +33,7 @@ Required Configuration variables
 - `conf.dev_path`: The local path of the project, eg ~/workspace/python/myproject.
 - `conf.host_path`: The remote path, where the wsgi index script lies, eg /var/www/vhosts/subscription/domain.
 - `conf.host_user`: The remote user to whom to transfer ownership after operations.
+- `conf.vhost_conf_path`: The remote path, where the apache configuration override (`vhost.conf`) is located.
 
 Optional Configuration variables
 --------------------------------

examples/django_deploy.yml

@@ -12,6 +12,7 @@
 
   vars_files:
     - ../conf/django_sites.yml
+    - "{{ secret_file|default('secret') }}"
 
   vars:
     conf: "{{ django_sites[project] }}"

examples/django_sites.yml

@@ -7,6 +7,7 @@ django_sites:
     domain_name: myproject.com
     dev_path: ~/workspace/python/project
     host_path: /var/www/vhosts/mysite.com/myproject.com
+    vhost_conf_path: /var/www/vhosts/system/myproject.com/conf
     host_user: username
     wsgi_script: ninedev/wsgi_mod.py
     wsgi_threads: 3

meta/main.yml

@@ -20,6 +20,9 @@ galaxy_info:
       - utopic
       - vivid
       - wily
+      - xenial
+      - yakkety
+      - zesty
   galaxy_tags:
     - system
     - development

tasks/main.yml

@@ -128,15 +128,15 @@
     state: touch
 
 - name: Configure Apache
-  template: src="vhost.conf.j2" dest="/var/www/vhosts/{{ conf.domain_name }}/conf/vhost.conf" backup=yes
+  template: src="vhost.conf.j2" dest="{{ conf.vhost_conf_path }}/vhost.conf" backup=yes
   become: true
   when: conf.domain_name is defined
   notify:
     - Reconfigure Plesk domain
     - Restart Apache
 
 - name: Configure Apache SSL
-  template: src="vhost_ssl.conf.j2" dest="/var/www/vhosts/{{ conf.domain_name }}/conf/vhost_ssl.conf" backup=yes
+  template: src="vhost_ssl.conf.j2" dest="{{ conf.vhost_conf_path }}/vhost_ssl.conf" backup=yes
   become: true
   when: conf.domain_name is defined
   notify: