Fixed remaining syntax errors and added example var files

Signed-off-by: Jim Martens <github@2martens.de>

roles/apache/tasks/main.yml

@@ -24,4 +24,4 @@
     - name: enable ssl
       command:
         cmd: a2enmod ssl
-  notify: restart apache
+      notify: restart apache

roles/collabora/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+nextcloud_domain: nextcloud.com

roles/collabora/tasks/apache.yml

@@ -14,7 +14,7 @@
     - name: enable collabora site
       command:
         cmd: a2ensite {{ ansible_domain }}.conf
-  notify: reload apache
+      notify: reload apache
 - name: run certbot
   command:
     cmd: certbot --apache --non-interactive --keep-until-expiring --no-eff-email --redirect --renew-with-new-domains --agree-tos -d {{ ansible_domain }}

roles/collabora/tasks/collabora.yml

@@ -6,9 +6,5 @@
     owner: root
     group: root
     mode: 0644
-  vars_prompt:
-    - name: nextcloud_domain
-      prompt: "Nextcloud domain"
-      private: no
 - name: start collabora docker container
   command: docker-compose --project-directory /etc/collabora up -d

roles/common/defaults/main.yml

@@ -2,4 +2,5 @@
 sshport: 22
 openports_list:
   - 22
+admin_mail: admin@example.com
 #blacklist_ip_list:

roles/common/tasks/apticron.yml

@@ -1,13 +1,10 @@
 ---
 - name: ensure apticron packages are installed
   apt:
-    pkg: "{{ packages }}"
+    name: apticron
     state: latest
     update_cache: yes
     cache_valid_time: 600
-  vars:
-    packages:
-      - apticron
 
 - name: configure apticron
   template:
@@ -16,8 +13,3 @@
     owner: root
     group: root
     mode: 0644
-  vars_prompt:
-    - name: admin_mail
-      prompt: "Mail of server admin"
-      private: no
-

roles/common/tasks/main.yml

@@ -1,17 +1,7 @@
 ---
 - include: apt.yml
-  tags:
-    - apt
 - include: apticron.yml
-  tags:
-    - apticron
 - include: disk-check.yml
-  tags:
-    - disk
 - include: ufw.yml
-  tags:
-    - firewall
 - include: fail2ban.yml
-  tags:
-    - firewall
 - include: tools.yml