Removed option for directory-based Apache2 configuration

defaults/main.yaml

@@ -14,9 +14,6 @@ nextcloud_ssl_key_path: "/etc/ssl/nginx/{{ nextcloud_subdomain }}.{{ domain_name
 
 # Apache configuration
 
-# Configure with virtualhost rather than directory-based Apache site
-nextcloud_apache2_virtualhost: false
-
 # If using mod_fcgi rather than the standard mod_php, we should also enable mod_setenvif
 nextcloud_apache2_fcgi: false
 

tasks/apache2_modules.yaml

@@ -1,9 +1,11 @@
 ---
 - name: Enable Apache2 modules
   community.general.apache2_module:
-    name: rewrite
+    name: "{{ item }}"
     state: present
   with_items:
+    - alias
+    - proxy
     - rewrite
     - headers
     - env
@@ -11,3 +13,9 @@
     - mime
   notify:
     - Restart Apache
+
+- name: Enable Apache2 module SSL
+  community.general.apache2_module:
+    name: ssl
+    state: present
+  when: nextcloud_ssl

tasks/apache2_template.yaml

@@ -1,20 +1,9 @@
 ---
-- name: Write directory-based nextcloud.conf file
+- name: Write Apache2 nextcloud.conf file
   ansible.builtin.template:
-    src: apache2_directory_nextcloud.conf.j2
+    src: apache2_nextcloud.conf.j2
     dest: "{{ nextcloud_apache2_config_path }}"
     mode: '0644'
   become: true
-  when: not nextcloud_apache2_virtualhost
-  notify:
-    - Enable Nextcloud site
-
-- name: Write virtualhost nextcloud.conf file
-  ansible.builtin.template:
-    src: apache2_virtualhost_nextcloud.conf.j2
-    dest: "{{ nextcloud_apache2_config_path }}"
-    mode: '0644'
-  become: true
-  when: nextcloud_apache2_virtualhost
   notify:
     - Enable Nextcloud site

tasks/nginx_template.yaml

@@ -4,6 +4,7 @@
     src: nginx.conf.j2
     dest: "{{ nextcloud_nginx_config_path }}"
     mode: '0644'
+    backup: true
   become: true
   notify:
     - Restart nginx

templates/apache2_directory_nextcloud.conf.j2

@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-
-Alias /nextcloud "{{ nextcloud_www_path }}"
-
-<Directory {{ nextcloud_www_path }}>
-  Require all granted
-  AllowOverride All
-  Options FollowSymLinks MultiViews
-
-  <IfModule mod_dav.c>
-    Dav off
-  </IfModule>
-</Directory>