formatting

galaxy.yml

@@ -2,9 +2,12 @@
 
 namespace: uumas
 name: general
-version: 0.5.9
+description: General roles
+version: 0.5.10
 readme: README.md
 authors:
   - uumas
 license_file: 'LICENSE'
 repository: 'https://git.uumas.fi/uumas/ansible-general'
+tags:
+  - linux

meta/runtime.yml

@@ -1,4 +1,3 @@
 ---
 
 requires_ansible: ">=2.10"
-

roles/apt_repository/molecule/default/converge.yml

@@ -2,8 +2,8 @@
 - name: Converge
   hosts: all
   tasks:
-    - name: "Include apt_repository"
-      ansible.builtin.import_role:
+    - name: Add docker apt repository
+      ansible.builtin.include_role:
         name: apt_repository
       vars:
         repo_name: docker
@@ -12,3 +12,14 @@
         repo_arch: "{{ apt_arch }}"
         repo_components:
           - stable
+
+    - name: Add caddy apt repository
+      ansible.builtin.include_role:
+        name: apt_repository
+      vars:
+        repo_name: caddy-stable
+        repo_url: https://dl.cloudsmith.io/public/caddy/stable/deb/debian
+        repo_key_url: https://dl.cloudsmith.io/public/caddy/stable/gpg.key
+        repo_suite: any-version
+        repo_components:
+          - main

roles/apt_repository/molecule/default/verify.yml

@@ -7,6 +7,10 @@
       ansible.builtin.slurp:
         src: /etc/apt/sources.list.d/docker.list
       register: docker_repo
+    - name: Get content of caddy source file
+      ansible.builtin.slurp:
+        src: /etc/apt/sources.list.d/caddy-stable.list
+      register: caddy_repo
 
     - name: Ensure docker repo file content is as expected
       ansible.builtin.assert:
@@ -19,3 +23,15 @@
           deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc]
           https://download.docker.com/linux/{{ ansible_distribution | lower }}
           {{ ansible_distribution_release }} stable but it contained {{ docker_repo.content | b64decode }} instead
+
+    - name: Ensure caddy repo file content is as expected
+      ansible.builtin.assert:
+        that: >
+          caddy_repo.content | b64decode == "deb [signed-by=/etc/apt/keyrings/caddy-stable.asc]
+          https://dl.cloudsmith.io/public/caddy/stable/deb/debian
+          any-version main\n"
+        msg: >
+          /etc/apt/sources.list.d/caddy-stable.list should contain
+          deb [signed-by=/etc/apt/keyrings/caddy-stable.asc]
+          https://dl.cloudsmith.io/public/caddy/stable/deb/debian
+          any-version main but it contained {{ docker_repo.content | b64decode }} instead

roles/apt_repository/tasks/main.yml

@@ -23,6 +23,13 @@
     state: directory
     mode: "0755"
 
+- name: Remove legacy repo {{ repo_name }}
+  ansible.builtin.apt_repository:
+    repo: >
+      deb {{ '[' + repo_options | join(' ') + '] ' if repo_options | length > 0 else '' }}{{ repo_url }} {{ repo_suite }} {{ repo_components | join(' ') }}
+    filename: "{{ repo_name }}"
+    state: absent
+
 - name: Get repo signing key
   ansible.builtin.get_url:
     url: "{{ repo_key_url }}"
@@ -37,5 +44,5 @@
 - name: Add repo {{ repo_name }}
   ansible.builtin.apt_repository:
     repo: "deb [{{ repo_options | join(' ') }}] {{ repo_url }} {{ repo_suite }} {{ repo_components | join(' ') }}"
-    filename: docker
+    filename: "{{ repo_name }}"
     mode: "0644"

roles/caddy/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: reload caddy
-  systemd:
+- name: Reload caddy
+  ansible.builtin.systemd:
     name: caddy
     state: reloaded

roles/caddy/tasks/main.yml

@@ -1,29 +1,22 @@
 ---
 
-- name: Install dependencies
-  apt:
-    name:
-      - debian-keyring
-      - debian-archive-keyring
-      - apt-transport-https
-    update_cache: true
-
-- name: Add caddy repo signing key
-  apt_key:
-    id: '65760C51EDEA2017CEA2CA15155B6D79CA56EA34'
-    url: 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key'
-- name: Add caddy repo
-  apt_repository:
-    repo: "deb https://dl.cloudsmith.io/public/caddy/stable/deb/debian any-version main"
-    filename: 'caddy-stable'
-    mode: '644'
+- name: Add caddy apt repository
+  ansible.builtin.import_role:
+    name: apt_repository
+  vars:
+    repo_name: caddy-stable
+    repo_url: https://dl.cloudsmith.io/public/caddy/stable/deb/debian
+    repo_key_url: https://dl.cloudsmith.io/public/caddy/stable/gpg.key
+    repo_suite: any-version
+    repo_components:
+      - main
 
 - name: Install caddy
-  apt:
+  ansible.builtin.apt:
     name: caddy
 
 - name: Remove default settings from caddyfile
-  blockinfile:
+  ansible.builtin.blockinfile:
     path: /etc/caddy/Caddyfile
     marker: "{mark}"
     marker_begin: ':80 {'
@@ -33,7 +26,7 @@
     backup: true
 
 - name: Put caddy general config in place
-  blockinfile:
+  ansible.builtin.blockinfile:
     path: /etc/caddy/Caddyfile
     marker: "# {mark} ANSIBLE MANAGED BLOCK general"
     block: |
@@ -42,4 +35,4 @@
       }
     validate: 'caddy validate --config %s --adapter caddyfile'
     backup: true
-  notify: reload caddy
+  notify: Reload caddy

roles/locale/tasks/main.yml

@@ -1,20 +1,20 @@
 ---
 
-- name: Include variables for {{ ansible_os_family }} family
-  include_vars: "{{ ansible_os_family }}.yml"
+- name: Include variables for os family {{ ansible_os_family }}
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Install locales package
-  package:
+  ansible.builtin.package:
     name: "{{ locale_package }}"
   when: locale_package is defined
 
 - name: Generate locales
-  locale_gen:
+  community.general.locale_gen:
     name: "{{ item }}"
   loop: "{{ gen_locales }}"
 
 - name: Put default locale config in place
-  template:
+  ansible.builtin.template:
     src: locale.j2
     dest: "{{ locale_config }}"
-    mode: 0644
+    mode: '0644'

roles/packages/tasks/apt.yml

@@ -1,20 +1,21 @@
 ---
 
 - name: Ensure packages defined in install_packages are installed
-  apt:
+  ansible.builtin.apt:
     name: "{{ install_packages }}"
     state: present
     update_cache: true
 
-- block:
+- name: Ensure packages defined in backports_packages are installed
+  when: backports_packages is defined
+  block:
     - name: Enable backports
-      apt_repository:
+      ansible.builtin.apt_repository:
         repo: "deb http://deb.debian.org/debian {{ ansible_distribution_release }}-backports main"
         filename: backports
 
     - name: Install backports packages
-      apt:
+      ansible.builtin.apt:
         name: "{{ backports_packages }}"
         state: present
         default_release: "{{ ansible_distribution_release }}-backports"
-  when: backports_packages is defined

roles/packages/tasks/main.yml

@@ -1,15 +1,15 @@
 ---
 
 - name: Include tasks for apt as package manager
-  include_tasks: apt.yml
+  ansible.builtin.include_tasks: apt.yml
   when: ansible_pkg_mgr == 'apt'
 
 - name: Include tasks for other package manager
-  include_tasks: other.yml
+  ansible.builtin.include_tasks: other.yml
   when: ansible_pkg_mgr != 'apt'
 
 - name: Ensure packages defined in delete_packages not installed
-  package:
+  ansible.builtin.package:
     name: "{{ delete_packages }}"
     state: absent
   when: delete_packages is defined

roles/packages/tasks/other.yml

@@ -1,6 +1,6 @@
 ---
 
 - name: Ensure packages defined in install_packages are installed
-  package:
+  ansible.builtin.package:
     name: "{{ install_packages }}"
     state: present

roles/prometheus_node_exporter/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: restart prometheus-node-exporter
-  systemd:
+- name: Restart prometheus-node-exporter
+  ansible.builtin.systemd:
     name: prometheus-node-exporter
     state: restarted

roles/prometheus_node_exporter/tasks/main.yml

@@ -1,12 +1,12 @@
 ---
 
 - name: Install prometheus node exporter
-  apt:
+  ansible.builtin.apt:
     name: prometheus-node-exporter
 
 - name: Set prometheus options in /etc/default/prometheus-node-exporter
-  template:
+  ansible.builtin.template:
     src: templates/prometheus-node-exporter.j2
     dest: /etc/default/prometheus-node-exporter
-    mode: 0644
-  notify: restart prometheus-node-exporter
+    mode: '0644'
+  notify: Restart prometheus-node-exporter

roles/reverse_proxy/tasks/main.yml

@@ -1,29 +1,30 @@
 ---
 
 - name: Deprecation warning
-  debug:
+  ansible.builtin.debug:
     msg: "uumas.general.reverse_proxy is deprecated. You should switch to uumas.general.vhost with vhost_type: reverse_proxy"
 
-- block:
+- name: Legacy proxy_target handling
+  when: proxy_target is defined and proxy_target_port is not defined
+  block:
     - name: Split legacy proxy_target to protocol and target
-      set_fact:
+      ansible.builtin.set_fact:
         proxy_target_split_protocol: "{{ proxy_target.split('://') }}"
     - name: Split target further to host and port
-      set_fact:
+      ansible.builtin.set_fact:
         proxy_target_split_host: "{{ (proxy_target_split_protocol | last).split(':') }}"
     - name: Set host and port variables
-      set_fact:
+      ansible.builtin.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:
+      ansible.builtin.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:
+- name: Configure vhost for reverse proxy
+  ansible.builtin.include_role:
     name: vhost
   vars:
     vhost_type: reverse_proxy

roles/ssh/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: restart ssh
-  systemd:
+- name: Restart ssh
+  ansible.builtin.systemd:
     name: ssh
     state: restarted

roles/ssh/tasks/main.yml

@@ -1,13 +1,13 @@
 ---
 
 - name: Ensure sshd config options set correctly
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: /etc/ssh/sshd_config
     regexp: "^#?{{ item.key }} .*$"
     line: "{{ item.key }} {{ item.value }}"
     state: present
     validate: '/usr/sbin/sshd -t -f %s'
-  notify: restart ssh
+  notify: Restart ssh
   with_dict:
     PermitRootLogin: 'prohibit-password'
     PasswordAuthentication: "{{ 'yes' if sshd_password_auth else 'no' }}"

roles/users/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 
 - name: Ensure sudo is installed
-  package:
+  ansible.builtin.package:
     name: sudo
 
 - name: Fail if removing the current user
-  fail:
+  ansible.builtin.fail:
     msg: Refusing to delete the user used to run this play
   when:
     - item.name == ansible_user_id
@@ -15,7 +15,7 @@
   become: false
 
 - name: Ensure users in correct state
-  user:
+  ansible.builtin.user:
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     shell: "{{ item.shell | default('/bin/bash') }}"
@@ -25,14 +25,14 @@
   loop: "{{ users }}"
 
 - name: Set ssh authorized keys for users
-  authorized_key:
+  ansible.posix.authorized_key:
     user: "{{ item.name }}"
     key: "{{ item.ssh_pubkey }}"
   when: item.state | default('present') == 'present'
   loop: "{{ users }}"
 
 - name: Disable login as root with ssh key
-  file:
+  ansible.builtin.file:
     path: /root/.ssh/authorized_keys
     state: absent
   when: ansible_user | default('') != 'root'

roles/vhost/tasks/caddy.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Add caddy vhost config
-  blockinfile:
+  ansible.builtin.blockinfile:
     path: /etc/caddy/Caddyfile
     marker: "# {mark} ANSIBLE MANAGED BLOCK {{ vhost_id }}"
     block: |

roles/vhost/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Fail if redirect_target is a relative path and redirect_preserve_path is true
-  fail:
+  ansible.builtin.fail:
     msg: redirect_target must be an absolute url or absolute path if redirect_preserve_path is true
   when:
     - redirect_preserve_path
@@ -9,17 +9,17 @@
     - not redirect_target.startswith('/')
 
 - name: Fail if redirect_tartget ends with / and redirect_preserve_path is true
-  fail:
+  ansible.builtin.fail:
     msg: redirect_target must not end with / if redirect_preserve_path is true
   when:
     - redirect_preserve_path
     - redirect_target.endswith('/')
 
 - name: Reset vhost_locations_all
-  set_fact:
+  ansible.builtin.set_fact:
     vhost_locations_all: []
 - name: Set vhost_locations_all reverse proxies
-  set_fact:
+  ansible.builtin.set_fact:
     vhost_locations_all: >
       {{ vhost_locations_all + [{
       'path': item.path,
@@ -43,5 +43,5 @@
   loop: "{{ vhost_locations + [{'path': ''}] }}"
 
 - name: "Setup {{ vhost_id + ' vhost on ' + web_server }}"
-  include_tasks: "{{ web_server }}.yml"
+  ansible.builtin.include_tasks: "{{ web_server }}.yml"
   when: web_server != 'none'