formatting

roles/caddy/tasks/main.yml

@@ -6,7 +6,7 @@
       - debian-keyring
       - debian-archive-keyring
       - apt-transport-https
-    update_cache: yes
+    update_cache: true
 
 - name: Add caddy repo signing key
   apt_key:
@@ -30,7 +30,7 @@
     marker_end: '# https://caddyserver.com/docs/caddyfile'
     state: absent
     validate: 'caddy validate --config %s --adapter caddyfile'
-    backup: yes
+    backup: true
 
 - name: Put caddy general config in place
   blockinfile:
@@ -41,5 +41,5 @@
         email {{ admin_email }}
       }
     validate: 'caddy validate --config %s --adapter caddyfile'
-    backup: yes
+    backup: true
   notify: reload caddy

roles/locale/defaults/main.yml

@@ -3,8 +3,7 @@
 gen_locales:
   - en_US.UTF-8
   - en_GB.UTF-8
-  
+ 
 lang: en_US.UTF-8
 lc_messages: "{{ lang }}"
 language: "en_US:en"
-

roles/locale/tasks/main.yml

@@ -17,4 +17,4 @@
   template:
     src: locale.j2
     dest: "{{ locale_config }}"
-
+    mode: 0644

roles/packages/tasks/apt.yml

@@ -4,20 +4,17 @@
   apt:
     name: "{{ install_packages }}"
     state: present
-    update_cache: yes
+    update_cache: true
 
 - block:
+    - name: Enable backports
+      apt_repository:
+        repo: "deb http://deb.debian.org/debian {{ ansible_distribution_release }}-backports main"
+        filename: backports
 
-  - name: Enable backports
+    - name: Install backports packages
-    apt_repository:
+      apt:
-      repo: "deb http://deb.debian.org/debian {{ ansible_distribution_release }}-backports main"
+        name: "{{ backports_packages }}"
-      filename: backports
+        state: present
-
+        default_release: "{{ ansible_distribution_release }}-backports"
-  - name: Install backports packages
-    apt:
-      name: "{{ backports_packages }}"
-      state: present
-      default_release: "{{ ansible_distribution_release }}-backports"
-
   when: backports_packages is defined
-

roles/packages/tasks/main.yml

@@ -13,4 +13,3 @@
     name: "{{ delete_packages }}"
     state: absent
   when: delete_packages is defined
-

roles/packages/tasks/other.yml

@@ -4,4 +4,3 @@
   package:
     name: "{{ install_packages }}"
     state: present
-

roles/reverse_proxy/tasks/main.yml

@@ -5,25 +5,25 @@
     msg: "uumas.general.reverse_proxy is deprecated. You should switch to uumas.general.vhost with vhost_type: reverse_proxy"
 
 - block:
-  - name: Split legacy proxy_target to protocol, host and port
+    - name: Split legacy proxy_target to protocol and target
-    set_fact:
+      set_fact:
-      proxy_target_split_protocol: "{{ proxy_target.split('://') }}"
+        proxy_target_split_protocol: "{{ proxy_target.split('://') }}"
-  - set_fact:
+    - name: Split target further to host and port
-      proxy_target_split_host: "{{ (proxy_target_split_protocol | last).split(':') }}"
+        set_fact:
-  - set_fact:
+        proxy_target_split_host: "{{ (proxy_target_split_protocol | last).split(':') }}"
-      proxy_target_host: "{{ proxy_target_split_host[0] }}"
+    - name: Set host and port variables
-      proxy_target_port: "{{ proxy_target_split_host[1] }}"
+      set_fact:
-
+        proxy_target_host: "{{ proxy_target_split_host[0] }}"
-  - name: Set proxy_target_protocol based on proxy_target
+        proxy_target_port: "{{ proxy_target_split_host[1] }}"
-    set_fact:
-      proxy_target_protocol: "{{ proxy_target_split_protocol[0] }}"
-    when: proxy_target_split_protocol | length == 2
 
+    - name: Set proxy_target_protocol based on proxy_target
+      set_fact:
+        proxy_target_protocol: "{{ proxy_target_split_protocol[0] }}"
+      when: proxy_target_split_protocol | length == 2
   when: proxy_target is defined and proxy_target_port is not defined
 
 - name: configure vhost for reverse proxy
-  include_role: 
+  include_role:
     name: vhost
   vars:
     vhost_type: reverse_proxy
-

roles/reverse_proxy/vars/main.yml

@@ -2,4 +2,3 @@
 
 reverse_proxy_type: caddy
 web_server: "{{ reverse_proxy_type }}"
-

roles/ssh/tasks/main.yml

@@ -12,4 +12,3 @@
     PermitRootLogin: 'prohibit-password'
     PasswordAuthentication: "{{ 'yes' if sshd_password_auth else 'no' }}"
     X11Forwarding: "{{ 'yes' if sshd_x11_forwarding else 'no' }}"
-

roles/vhost/meta/argument_specs.yml

@@ -49,4 +49,3 @@ argument_specs:
         choices:
           - temporary
           - permanent
-

roles/vhost/meta/main.yml

@@ -3,4 +3,3 @@
 dependencies:
   - role: caddy
     when: web_server == 'caddy'
-

roles/vhost/tasks/caddy.yml

@@ -22,4 +22,3 @@
     validate: 'caddy validate --config %s --adapter caddyfile'
     backup: true
   notify: reload caddy
-