windows: Include the domain in the docroot

Author: derickr

roles/properties/windows/tasks/deploy.yml

@@ -1,11 +1,11 @@
 - name: Create local directory to store Windows content
   file:
     state: directory
-    dest: "{{ windows_docroot }}/{{ windows_domain }}"
+    dest: "{{ windows_docroot }}"
     mode: "755"
 
 - name: Put robots.txt in document root
   template:
     src: templates/robots.txt
-    dest: "{{ windows_docroot }}/{{ windows_domain }}/robots.txt"
+    dest: "{{ windows_docroot }}/robots.txt"
     mode: "644"

roles/properties/windows/templates/windows.php.net.conf

@@ -12,7 +12,7 @@
 	ServerName {{ windows_domain }}
 	ServerAlias {{ windows_domain_alias }}
 
-	DocumentRoot {{ windows_docroot }}/{{ windows_domain }}
+	DocumentRoot {{ windows_docroot }}
 
 	RewriteEngine on
 
@@ -36,7 +36,7 @@
 	RewriteCond %{REQUEST_URI} !^/robots.txt
 	RewriteRule ^/ - [F]
 
-	<Directory {{ windows_docroot }}/{{ windows_domain }}/>
+	<Directory {{ windows_docroot }}/>
 		Options FollowSymLinks 
 		AllowOverride None
 		Order allow,deny

roles/properties/windows/vars/main.yml

@@ -3,5 +3,5 @@ property: "windows"
 windows_domain: "{{ property }}.{{ domain }}"
 windows_domain_alias: "{{ property }}.{{ internal_domain }}"
 
-windows_docroot: "{{ common_doc_root }}"
+windows_docroot: "{{ common_doc_root }}/{{ windows_domain }}"
 windows_config_file: "{{ property }}.{{ domain }}.conf"