From 5c5eff0370bb5467dedaf917416722a574cc967d Mon Sep 17 00:00:00 2001 From: uumas Date: Fri, 18 Nov 2022 06:07:36 +0200 Subject: [PATCH] formatting --- roles/caddy/tasks/main.yml | 6 +++--- roles/locale/defaults/main.yml | 3 +-- roles/locale/tasks/main.yml | 2 +- roles/packages/tasks/apt.yml | 23 ++++++++++------------ roles/packages/tasks/main.yml | 1 - roles/packages/tasks/other.yml | 1 - roles/reverse_proxy/tasks/main.yml | 30 ++++++++++++++--------------- roles/reverse_proxy/vars/main.yml | 1 - roles/ssh/tasks/main.yml | 1 - roles/vhost/meta/argument_specs.yml | 1 - roles/vhost/meta/main.yml | 1 - roles/vhost/tasks/caddy.yml | 1 - 12 files changed, 30 insertions(+), 41 deletions(-) diff --git a/roles/caddy/tasks/main.yml b/roles/caddy/tasks/main.yml index 68eb30f..c8a5151 100644 --- a/roles/caddy/tasks/main.yml +++ b/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 diff --git a/roles/locale/defaults/main.yml b/roles/locale/defaults/main.yml index 55ba036..dc03799 100644 --- a/roles/locale/defaults/main.yml +++ b/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" - diff --git a/roles/locale/tasks/main.yml b/roles/locale/tasks/main.yml index 2ec530d..9d71900 100644 --- a/roles/locale/tasks/main.yml +++ b/roles/locale/tasks/main.yml @@ -17,4 +17,4 @@ template: src: locale.j2 dest: "{{ locale_config }}" - + mode: 0644 diff --git a/roles/packages/tasks/apt.yml b/roles/packages/tasks/apt.yml index c732f0d..196e662 100644 --- a/roles/packages/tasks/apt.yml +++ b/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 - apt_repository: - repo: "deb http://deb.debian.org/debian {{ ansible_distribution_release }}-backports main" - filename: backports - - - name: Install backports packages - apt: - name: "{{ backports_packages }}" - 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 - diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index 958a83f..63cbfbb 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -13,4 +13,3 @@ name: "{{ delete_packages }}" state: absent when: delete_packages is defined - diff --git a/roles/packages/tasks/other.yml b/roles/packages/tasks/other.yml index 5abdea2..14c691a 100644 --- a/roles/packages/tasks/other.yml +++ b/roles/packages/tasks/other.yml @@ -4,4 +4,3 @@ package: name: "{{ install_packages }}" state: present - diff --git a/roles/reverse_proxy/tasks/main.yml b/roles/reverse_proxy/tasks/main.yml index be25b6f..a1c3c67 100644 --- a/roles/reverse_proxy/tasks/main.yml +++ b/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 - set_fact: - proxy_target_split_protocol: "{{ proxy_target.split('://') }}" - - set_fact: - proxy_target_split_host: "{{ (proxy_target_split_protocol | last).split(':') }}" - - set_fact: - proxy_target_host: "{{ proxy_target_split_host[0] }}" - proxy_target_port: "{{ proxy_target_split_host[1] }}" - - - 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 + - name: Split legacy proxy_target to protocol and target + set_fact: + proxy_target_split_protocol: "{{ proxy_target.split('://') }}" + - name: Split target further to host and port + set_fact: + proxy_target_split_host: "{{ (proxy_target_split_protocol | last).split(':') }}" + - name: Set host and port variables + set_fact: + proxy_target_host: "{{ proxy_target_split_host[0] }}" + proxy_target_port: "{{ proxy_target_split_host[1] }}" + - 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 - diff --git a/roles/reverse_proxy/vars/main.yml b/roles/reverse_proxy/vars/main.yml index 3b43055..e73065f 100644 --- a/roles/reverse_proxy/vars/main.yml +++ b/roles/reverse_proxy/vars/main.yml @@ -2,4 +2,3 @@ reverse_proxy_type: caddy web_server: "{{ reverse_proxy_type }}" - diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml index 205b6bf..de8c5af 100644 --- a/roles/ssh/tasks/main.yml +++ b/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' }}" - diff --git a/roles/vhost/meta/argument_specs.yml b/roles/vhost/meta/argument_specs.yml index d411a79..978903e 100644 --- a/roles/vhost/meta/argument_specs.yml +++ b/roles/vhost/meta/argument_specs.yml @@ -49,4 +49,3 @@ argument_specs: choices: - temporary - permanent - diff --git a/roles/vhost/meta/main.yml b/roles/vhost/meta/main.yml index 01f623c..a08de7f 100644 --- a/roles/vhost/meta/main.yml +++ b/roles/vhost/meta/main.yml @@ -3,4 +3,3 @@ dependencies: - role: caddy when: web_server == 'caddy' - diff --git a/roles/vhost/tasks/caddy.yml b/roles/vhost/tasks/caddy.yml index 1a89aa4..e24b7ff 100644 --- a/roles/vhost/tasks/caddy.yml +++ b/roles/vhost/tasks/caddy.yml @@ -22,4 +22,3 @@ validate: 'caddy validate --config %s --adapter caddyfile' backup: true notify: reload caddy -