Merge gitea_apache2 into gitea role

roles/gitea/meta/main.yml

@@ -1,5 +1,6 @@
 ---
 dependencies:
   - role: setup_fail2ban
+  - role: setup_apache2
+  - role: certbot
   - role: gitea_mariadb
-  - role: gitea_apache2

roles/gitea/tasks/apache2.yml

@@ -12,7 +12,7 @@
 - name: Copy vHost conf
   become: true
   ansible.builtin.template:
-    src: git.tunuifranken.info.conf.j2
+    src: apache2/git.tunuifranken.info.conf.j2
     dest: /etc/apache2/sites-available/git.tunuifranken.info.conf
     mode: 0644
   notify: Reload apache2 service

roles/gitea/tasks/main.yml

@@ -2,6 +2,9 @@
 - name: Include vault variables
   ansible.builtin.include_vars: vault.yml
 
+- name: Include apache2 tasks
+  ansible.builtin.include_tasks: apache2.yml
+
 - name: Install needed packages
   become: true
   ansible.builtin.apt:

roles/gitea/vars/main.yml

@@ -1,4 +1,5 @@
 ---
+server_admin_email_gitea: tfranken@protonmail.com
 gitea_domain: git.tunuifranken.info
 gitea_jtw_secret: "{{ vault_gitea_jtw_secret }}"
 gitea_internal_token: "{{ vault_gitea_internal_token }}"

roles/gitea_apache2/meta/main.yml

@@ -1,4 +0,0 @@
----
-dependencies:
-  - role: setup_apache2
-  - role: certbot

roles/gitea_apache2/vars/main.yml

@@ -1,2 +0,0 @@
----
-server_admin_email_gitea: tfranken@protonmail.com