feat: make site's basedir configurable

Merge branch 'LarsKollstedt-allow_changing_docroot_basedirectory'
weareinteractive · Feb 5, 2020 · 8b4a8e0 · 8b4a8e0
2 parents 2546efd + 7eaddd8
commit 8b4a8e0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -85,6 +85,8 @@ Here is a list of all the default variables for this role, which are also availa
 # packages (versions)
 apache2_packages:
   - apache2
+# where do we have our document roots (Default /var/www means /var/www/<SiteId>/htdocs)
+apache2_docroot_basedir: /var/www
 # ports to listen to
 apache2_ports: [80]
 # ssl ports to listen to

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -45,6 +45,8 @@ apache2_modules: []
 apache2_confs: []
 # enabled/disabled sites
 apache2_sites: []
+# where do we have our document roots (default /var/www means /var/www/<SiteId>/htdocs)
+apache2_sites_basedir: /var/www
 # default site template file
 apache2_sites_template: etc/apache2/sites-available/site.j2
 # remove the default host

diff --git a/tasks/manage_sites.yml b/tasks/manage_sites.yml
@@ -2,7 +2,7 @@
 
 - name: Creating webroots
   file:
-    dest: "/var/www/{{ item.id }}/htdocs"
+    dest: "{{ apache2_sites_basedir }}/{{ item.id }}/htdocs"
     state: directory
   when: item.add_webroot is defined and item.add_webroot
   with_items: "{{ apache2_sites }}"

diff --git a/templates/etc/apache2/sites-available/site/body.j2 b/templates/etc/apache2/sites-available/site/body.j2
@@ -1,5 +1,5 @@
   ServerName {{ item.name }}
-  DocumentRoot /var/www/{{ item.id }}/htdocs
+  DocumentRoot {{ apache2_sites_basedir }}/{{ item.id }}/htdocs
   {% for value in item.aliases|default([]) %}
   ServerAlias {{ value }}
   {% endfor %}
@@ -12,7 +12,7 @@
 
   # --- directories -----------------------------------------------------------
 
-  <Directory /var/www/{{ item.id }}/htdocs>
+  <Directory {{ apache2_sites_basedir }}/{{ item.id }}/htdocs>
     AllowOverride All
     Options FollowSymLinks
     Require all granted

diff --git a/templates/etc/apache2/sites-available/site/htpasswd.j2 b/templates/etc/apache2/sites-available/site/htpasswd.j2
@@ -1,4 +1,4 @@
-<Directory /var/www/{{ item.id }}/htdocs>
+<Directory {{ apache2_sites_basedir }}/{{ item.id }}/htdocs>
   AuthType Basic
   AuthBasicProvider file
   AuthUserFile /etc/htpasswd/{{ item.auth.file }}