Nextcloud: WIP: Optional create hiddenservice

tasks/apache.yml

@@ -8,7 +8,6 @@
 
 - name: "apache: {{ instance.alias }}: Alias einrichten"
   template:
-    src: apache_alias.j2
-    dest: "/etc/apache2/conf-available/{{ instance.name }}.alias.conf"
+    src: apache2/custom.conf.j2
+    dest: "{{ apache_custom_conf_path }}/{{ instance.name }}.conf"
   notify: reload apache
-  when: instance.alias is defined

tasks/main.yml

@@ -14,6 +14,16 @@
 - import_tasks: php.yml
   tags: php
 
+- name: Configure hiddenservices
+  ansible.builtin.import_role:
+    name: configure-hiddenservice
+  tags: hiddenservice
+  delegate_to: "{{ onion_host }}"
+  when: item.config.hiddenservice is defined and item.config.hiddenservice
+
+- import_tasks: user.yml
+  tags: user
+
 - import_tasks: apache.yml
   tags: apache
 

tasks/php.yml

@@ -11,23 +11,6 @@
     - stop php-fpm-service
     - start php-fpm-socket
 
-#- name: "php | Erstelle PHPPFM-override-Verzeichnis"
-#  ansible.builtin.file:
-#    path: "/etc/systemd/system/php-fpm@{{ instance.user }}.service.d"
-#    state: directory
-#    mode: 0755
-
-#- name: "php | Kopiere PHPFPM-override-Datei"
-#  ansible.builtin.template:
-#    src: systemd/php-fpm-override.conf
-#    dest: "/etc/systemd/system/php-fpm@{{ instance.user }}.service.d/override.conf"
-#    mode: 0644
-#  notify:
-#    - stop php-fpm-socket
-#    - stop php-fpm-service
-#    - Systemd daemon-reload
-#    - start php-fpm-socket
-
 - name: "php | {{ instance.name }} | Erstelle Log-Datei"
   file:
     path: "{{ php_fpm_log_dir }}/{{ instance.user }}.log"