dev/dockerbox.yml

@@ -8,6 +8,7 @@
     - docker
     - traefik
     - nextcloud
+    - gitea
     - jenkins
     - prometheus
     - nginx

dev/host_vars/dockerbox.yml

@@ -13,7 +13,6 @@ traefik_domain: traefik.vm.krislamo.org
 traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
 #traefik_acme_email: realemail@example.com # Let's Encrypt settings
 #traefik_production: true
-traefik_http_only: true # if behind reverse-proxy
 
 # nextcloud
 nextcloud_version: stable

dev/host_vars/mediaserver.yml

@@ -1,37 +0,0 @@
-base_domain: vm.krislamo.org
-
-# base
-allow_reboot: false
-manage_network: false
-
-# proxy
-proxy:
-  #production: true
-  dns_cloudflare:
-    opts: --test-cert
-    #email: realemail@example.com
-    #api_token: CLOUDFLARE_DNS01_API_TOKEN
-    wildcard_domains:
-      - "{{ base_domain }}"
-  servers:
-    - domain: "{{ traefik_domain }}"
-      proxy_pass: "http://127.0.0.1:8000"
-    - domain: "{{ jellyfin_domain }}"
-      proxy_pass: "http://127.0.0.1:8000"
-
-# docker
-docker_users:
-  - vagrant
-
-# traefik
-traefik_version: latest
-traefik_dashboard: true
-traefik_domain: "traefik.{{ base_domain }}"
-traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
-#traefik_acme_email: realemail@example.com # Let's Encrypt settings
-#traefik_production: true
-traefik_http_only: true # if behind reverse-proxy
-
-# jellyfin
-jellyfin_domain: "jellyfin.{{ base_domain }}"
-jellyfin_version: latest

dev/mediaserver.yml

@@ -1,11 +0,0 @@
-- name: Install Media Server
-  hosts: all
-  become: true
-  vars_files:
-    - host_vars/mediaserver.yml
-  roles:
-    - base
-    - proxy
-    - docker
-    - traefik
-    - jellyfin

mediaserver.yml

@@ -1,9 +0,0 @@
-- name: Install Media Server
-  hosts: mediaservers
-  become: true
-  roles:
-    - base
-    - proxy
-    - docker
-    - traefik
-    - jellyfin

roles/.gitignore

@@ -0,0 +1,20 @@
+/*
+!.gitignore
+!requirements.yml
+!base*/
+!bitwarden*/
+!docker*/
+!gitea*/
+!jenkins*/
+!libvirt*/
+!mariadb*/
+!minecraft*/
+!nextcloud*/
+!nginx*/
+!postgresql*/
+!prometheus*/
+!proxy*/
+!rsnapshot*/
+!traefik*/
+!unifi*/
+!wordpress*/

roles/base/handlers/main.yml

@@ -1,24 +1,18 @@
 - name: Reboot host
-  ansible.builtin.reboot:
+  reboot:
     msg: "Reboot initiated by Ansible"
     connect_timeout: 5
   listen: reboot_host
   when: allow_reboot
 
 - name: Restart WireGuard
-  ansible.builtin.service:
+  service:
     name: wg-quick@wg0
     state: restarted
   listen: restart_wireguard
 
 - name: Restart Fail2ban
-  ansible.builtin.service:
+  service:
     name: fail2ban
     state: restarted
   listen: restart_fail2ban
-
-- name: Restart ddclient
-  ansible.builtin.service:
-    name: ddclient
-    state: restarted
-  listen: restart_ddclient

roles/base/tasks/ansible.yml

@@ -1,11 +1,11 @@
 - name: 'Install Ansible dependency: python3-apt'
-  ansible.builtin.shell: 'apt-get update && apt-get install python3-apt -y'
+  shell: 'apt-get update && apt-get install python3-apt -y'
   args:
     creates: /usr/lib/python3/dist-packages/apt
     warn: false
 
 - name: Install additional Ansible dependencies
-  ansible.builtin.apt:
+  apt:
     name: "{{ item }}"
     state: present
     force_apt_get: true
@@ -17,7 +17,7 @@
     - python3-psycopg2
 
 - name: Create Ansible's temporary remote directory
-  ansible.builtin.file:
+  file:
     path: "~/.ansible/tmp"
     state: directory
     mode: 0700

roles/base/tasks/ddclient.yml

@@ -1,17 +1,22 @@
 - name: Install ddclient
-  ansible.builtin.apt:
+  apt:
     name: ddclient
     state: present
 
 - name: Install ddclient settings
-  ansible.builtin.template:
+  template:
     src: ddclient.conf.j2
     dest: /etc/ddclient.conf
-    mode: 0600
   register: ddclient_settings
 
 - name: Start ddclient and enable on boot
-  ansible.builtin.service:
+  service:
     name: ddclient
     state: started
     enabled: true
+
+- name: Restart ddclient
+  service:
+    name: ddclient
+    state: restarted
+  when: ddclient_settings.changed

roles/base/tasks/firewall.yml

@@ -1,48 +1,46 @@
 - name: Install the Uncomplicated Firewall
-  ansible.builtin.apt:
+  apt:
     name: ufw
     state: present
 
 - name: Install Fail2ban
-  ansible.builtin.apt:
+  apt:
     name: fail2ban
     state: present
 
 - name: Deny incoming traffic by default
-  community.general.ufw:
+  ufw:
     default: deny
     direction: incoming
 
 - name: Allow outgoing traffic by default
-  community.general.ufw:
+  ufw:
     default: allow
     direction: outgoing
 
 - name: Allow OpenSSH with rate limiting
-  community.general.ufw:
+  ufw:
     name: ssh
     rule: limit
 
 - name: Remove Fail2ban defaults-debian.conf
-  ansible.builtin.file:
+  file:
     path: /etc/fail2ban/jail.d/defaults-debian.conf
     state: absent
 
 - name: Install OpenSSH's Fail2ban jail
-  ansible.builtin.template:
+  template:
     src: fail2ban-ssh.conf.j2
     dest: /etc/fail2ban/jail.d/sshd.conf
-    mode: 0640
   notify: restart_fail2ban
 
 - name: Install Fail2ban IP allow list
-  ansible.builtin.template:
+  template:
     src: fail2ban-allowlist.conf.j2
     dest: /etc/fail2ban/jail.d/allowlist.conf
-    mode: 0640
   when: fail2ban_ignoreip is defined
   notify: restart_fail2ban
 
 - name: Enable firewall
-  community.general.ufw:
+  ufw:
     state: enabled

roles/base/tasks/mail.yml

@@ -1,5 +1,5 @@
 - name: Install msmtp
-  ansible.builtin.apt:
+  apt:
     name: "{{ item }}"
     state: present
   loop:
@@ -8,13 +8,12 @@
     - mailutils
 
 - name: Install msmtp configuration
-  ansible.builtin.template:
+  template:
     src: msmtprc.j2
     dest: /root/.msmtprc
-    mode: 0600
+    mode: 0700
 
 - name: Install /etc/aliases
-  ansible.builtin.copy:
+  copy:
     dest: /etc/aliases
     content: "root: {{ mail.rootalias }}"
-    mode: 0644

roles/base/tasks/main.yml

@@ -1,31 +1,24 @@
-- name: Import Ansible tasks
+- import_tasks: ansible.yml
-  ansible.builtin.import_tasks: ansible.yml
   tags: ansible
 
-- name: Import System tasks
+- import_tasks: system.yml
-  ansible.builtin.import_tasks: system.yml
   tags: system
 
-- name: Import Firewall tasks
+- import_tasks: firewall.yml
-  ansible.builtin.import_tasks: firewall.yml
   tags: firewall
 
-- name: Import Network tasks
+- import_tasks: network.yml
-  ansible.builtin.import_tasks: network.yml
   tags: network
   when: manage_network
 
-- name: Import Mail tasks
+- import_tasks: mail.yml
-  ansible.builtin.import_tasks: mail.yml
   tags: mail
   when: mail is defined
 
-- name: Import ddclient tasks
+- import_tasks: ddclient.yml
-  ansible.builtin.import_tasks: ddclient.yml
   tags: ddclient
   when: ddclient is defined
 
-- name: Import WireGuard tasks
+- import_tasks: wireguard.yml
-  ansible.builtin.import_tasks: wireguard.yml
   tags: wireguard
   when: wireguard is defined

roles/base/tasks/network.yml

@@ -1,5 +1,5 @@
 - name: Install network interfaces file
-  ansible.builtin.copy:
+  copy:
     src: network-interfaces.cfg
     dest: /etc/network/interfaces
     owner: root
@@ -7,9 +7,8 @@
     mode: '0644'
 
 - name: Install network interfaces
-  ansible.builtin.template:
+  template:
     src: "interface.j2"
     dest: "/etc/network/interfaces.d/{{ item.name }}"
-    mode: 0400
   loop: "{{ interfaces }}"
   notify: reboot_host

roles/base/tasks/system.yml

@@ -1,18 +1,17 @@
 - name: Install useful software
-  ansible.builtin.apt:
+  apt:
     name: "{{ packages }}"
     state: present
     update_cache: true
 
 - name: Manage root authorized_keys
-  ansible.builtin.template:
+  template:
     src: authorized_keys.j2
     dest: /root/.ssh/authorized_keys
-    mode: 0400
   when: authorized_keys is defined
 
 - name: Manage filesystem mounts
-  ansible.posix.mount:
+  mount:
     path: "{{ item.path }}"
     src: "UUID={{ item.uuid }}"
     fstype: "{{ item.fstype }}"

roles/base/tasks/wireguard.yml

@@ -1,37 +1,35 @@
 - name: Install WireGuard
-  ansible.builtin.apt:
+  apt:
     name: wireguard
     state: present
     update_cache: true
 
 - name: Generate WireGuard keys
-  ansible.builtin.shell: |
+  shell: wg genkey | tee privatekey | wg pubkey > publickey
-    set -o pipefail
-    wg genkey | tee privatekey | wg pubkey > publickey
   args:
     chdir: /etc/wireguard/
     creates: /etc/wireguard/privatekey
 
 - name: Grab WireGuard private key for configuration
-  ansible.builtin.slurp:
+  slurp:
     src: /etc/wireguard/privatekey
   register: wgkey
 
 - name: Install WireGuard configuration
-  ansible.builtin.template:
+  template:
     src: wireguard.j2
     dest: /etc/wireguard/wg0.conf
-    mode: 0400
+  notify:
-  notify: restart_wireguard
+    - restart_wireguard
 
 - name: Start WireGuard interface
-  ansible.builtin.service:
+  service:
     name: wg-quick@wg0
     state: started
     enabled: true
 
 - name: Add WireGuard firewall rule
-  community.general.ufw:
+  ufw:
     rule: allow
     port: "{{ wireguard.listenport }}"
     proto: tcp

roles/bitwarden/handlers/main.yml

@@ -1,15 +1,15 @@
 - name: Stop Bitwarden for rebuild
-  ansible.builtin.service:
+  service:
     name: "{{ bitwarden_name }}"
     state: stopped
   listen: rebuild_bitwarden
 
 - name: Rebuild Bitwarden
-  ansible.builtin.shell: "{{ bitwarden_root }}/bitwarden.sh rebuild"
+  shell: "{{ bitwarden_root }}/bitwarden.sh rebuild"
   listen: rebuild_bitwarden
 
 - name: Start Bitwarden after rebuild
-  ansible.builtin.service:
+  service:
     name: "{{ bitwarden_name }}"
     state: started
     enabled: true

roles/bitwarden/tasks/main.yml

@@ -1,40 +1,40 @@
 - name: Install expect
-  ansible.builtin.apt:
+  apt:
     name: expect
     state: present
 
 - name: Create Bitwarden directory
-  ansible.builtin.file:
+  file:
     path: "{{ bitwarden_root }}"
     state: directory
 
 - name: Download Bitwarden script
-  ansible.builtin.get_url:
+  get_url:
     url: "https://raw.githubusercontent.com/\
           bitwarden/self-host/master/bitwarden.sh"
     dest: "{{ bitwarden_root }}"
     mode: u+x
 
 - name: Install Bitwarden script wrapper
-  ansible.builtin.template:
+  template:
     src: bw_wrapper.j2
     dest: "{{ bitwarden_root }}/bw_wrapper"
     mode: u+x
 
 - name: Run Bitwarden installation script
-  ansible.builtin.shell: "{{ bitwarden_root }}/bw_wrapper"
+  shell: "{{ bitwarden_root }}/bw_wrapper"
   args:
     creates: "{{ bitwarden_root }}/bwdata/config.yml"
 
 - name: Install docker-compose override
-  ansible.builtin.template:
+  template:
     src: compose.override.yml.j2
     dest: "{{ bitwarden_root }}/bwdata/docker/docker-compose.override.yml"
   when: traefik_version is defined
   notify: rebuild_bitwarden
 
 - name: Disable bitwarden-nginx HTTP on 80
-  ansible.builtin.replace:
+  replace:
     path: "{{ bitwarden_root }}/bwdata/config.yml"
     regexp: "^http_port: 80$"
     replace: "http_port: 127.0.0.1:8080"
@@ -42,7 +42,7 @@
   notify: rebuild_bitwarden
 
 - name: Disable bitwarden-nginx HTTPS on 443
-  ansible.builtin.replace:
+  replace:
     path: "{{ bitwarden_root }}/bwdata/config.yml"
     regexp: "^https_port: 443$"
     replace: "https_port: 127.0.0.1:8443"
@@ -50,7 +50,7 @@
   notify: rebuild_bitwarden
 
 - name: Disable Bitwarden managed Lets Encrypt
-  ansible.builtin.replace:
+  replace:
     path: "{{ bitwarden_root }}/bwdata/config.yml"
     regexp: "^ssl_managed_lets_encrypt: true$"
     replace: "ssl_managed_lets_encrypt: false"
@@ -58,7 +58,7 @@
   notify: rebuild_bitwarden
 
 - name: Disable Bitwarden managed SSL
-  ansible.builtin.replace:
+  replace:
     path: "{{ bitwarden_root }}/bwdata/config.yml"
     regexp: "^ssl: true$"
     replace: "ssl: false"
@@ -66,39 +66,39 @@
   notify: rebuild_bitwarden
 
 - name: Define reverse proxy servers
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: "{{ bitwarden_root }}/bwdata/config.yml"
     line: "- {{ bitwarden_realips }}"
     insertafter: "^real_ips"
   notify: rebuild_bitwarden
 
 - name: Install Bitwarden systemd service
-  ansible.builtin.template:
+  template:
     src: bitwarden.service.j2
     dest: "/etc/systemd/system/{{ bitwarden_name }}.service"
   register: bitwarden_systemd
   notify: rebuild_bitwarden
 
 - name: Create Bitwarden's initial logging directory
-  ansible.builtin.file:
+  file:
     path: "{{ bitwarden_logs_identity }}"
     state: directory
   register: bitwarden_logs
 
 - name: Create Bitwarden's initial log file
-  ansible.builtin.file:
+  file:
     path: "{{ bitwarden_logs_identity }}/{{ bitwarden_logs_identity_date }}.txt"
     state: touch
   when: bitwarden_logs.changed
 
 - name: Install Bitwarden's Fail2ban jail
-  ansible.builtin.template:
+  template:
     src: fail2ban-jail.conf.j2
     dest: /etc/fail2ban/jail.d/bitwarden.conf
   notify: restart_fail2ban
 
 - name: Reload systemd manager configuration
-  ansible.builtin.systemd:
+  systemd:
     daemon_reload: true
   when: bitwarden_systemd.changed
   notify: rebuild_bitwarden

roles/docker/handlers/main.yml

@@ -1,4 +0,0 @@
-- name: Reload systemd manager configuration
-  ansible.builtin.systemd:
-    daemon_reload: true
-  listen: compose_systemd

roles/docker/tasks/main.yml

@@ -1,24 +1,27 @@
 - name: Install Docker
-  ansible.builtin.apt:
+  apt:
     name: ['docker.io', 'docker-compose']
     state: present
     update_cache: true
 
 - name: Create docker-compose root
-  ansible.builtin.file:
+  file:
     path: "{{ docker_compose_root }}"
     state: directory
-    mode: 0500
 
 - name: Install docker-compose systemd service
-  ansible.builtin.template:
+  template:
     src: docker-compose.service.j2
     dest: "/etc/systemd/system/{{ docker_compose_service }}@.service"
-    mode: 0400
+  register: compose_systemd
-  notify: compose_systemd
+
+- name: Reload systemd manager configuration
+  systemd:
+    daemon_reload: true
+  when: compose_systemd.changed
 
 - name: Add users to docker group
-  ansible.builtin.user:
+  user:
     name: "{{ item }}"
     groups: docker
     append: true
@@ -26,7 +29,7 @@
   when: docker_users is defined
 
 - name: Start Docker and enable on boot
-  ansible.builtin.service:
+  service:
     name: docker
     state: started
     enabled: true

roles/gitea/handlers/main.yml

@@ -1,5 +1,5 @@
 - name: Restart Gitea
-  ansible.builtin.service:
+  service:
     name: "{{ docker_compose_service }}@{{ gitea_name }}"
     state: restarted
   listen: restart_gitea

roles/gitea/tasks/main.yml

@@ -1,16 +1,16 @@
 - name: Create Gitea directory
-  ansible.builtin.file:
+  file:
     path: "{{ gitea_root }}"
     state: directory
 
 - name: Create Gitea database
-  community.mysql.mysql_db:
+  mysql_db:
     name: "{{ gitea_dbname }}"
     state: present
     login_unix_socket: /var/run/mysqld/mysqld.sock
 
 - name: Create Gitea database user
-  community.mysql.mysql_user:
+  mysql_user:
     name: "{{ gitea_dbuser }}"
     password: "{{ gitea_dbpass }}"
     host: '%'
@@ -19,93 +19,93 @@
     login_unix_socket: /var/run/mysqld/mysqld.sock
 
 - name: Create git user
-  ansible.builtin.user:
+  user:
     name: git
     state: present
 
 - name: Git user uid
-  ansible.builtin.getent:
+  getent:
     database: passwd
     key: git
 
 - name: Git user gid
-  ansible.builtin.getent:
+  getent:
     database: group
     key: git
 
 - name: Create git's .ssh directory
-  ansible.builtin.file:
+  file:
     path: /home/git/.ssh
     state: directory
 
 - name: Generate git's SSH keys
-  community.crypto.openssh_keypair:
+  openssh_keypair:
     path: /home/git/.ssh/id_rsa
 
 - name: Find git's public SSH key
-  ansible.builtin.slurp:
+  slurp:
     src: /home/git/.ssh/id_rsa.pub
   register: git_rsapub
 
 - name: Get stats on git's authorized_keys file
-  ansible.builtin.stat:
+  stat:
     path: /home/git/.ssh/authorized_keys
   register: git_authkeys
 
 - name: Create git's authorized_keys file
-  ansible.builtin.file:
+  file:
     path: /home/git/.ssh/authorized_keys
     state: touch
   when: not git_authkeys.stat.exists
 
 - name: Add git's public SSH key to authorized_keys
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /home/git/.ssh/authorized_keys
     regex: "^ssh-rsa"
     line: "{{ git_rsapub['content'] | b64decode }}"
 
 - name: Create Gitea host script for SSH
-  ansible.builtin.template:
+  template:
     src: gitea.sh.j2
     dest: /usr/local/bin/gitea
     mode: 0755
 
 - name: Install Gitea's docker-compose file
-  ansible.builtin.template:
+  template:
     src: docker-compose.yml.j2
     dest: "{{ gitea_root }}/docker-compose.yml"
   notify: restart_gitea
 
 - name: Install Gitea's docker-compose variables
-  ansible.builtin.template:
+  template:
     src: compose-env.j2
     dest: "{{ gitea_root }}/.env"
   notify: restart_gitea
 
 - name: Create Gitea's logging directory
-  ansible.builtin.file:
+  file:
     name: /var/log/gitea
     state: directory
 
 - name: Create Gitea's initial log file
-  ansible.builtin.file:
+  file:
     name: /var/log/gitea/gitea.log
     state: touch
 
 - name: Install Gitea's Fail2ban filter
-  ansible.builtin.template:
+  template:
     src: fail2ban-filter.conf.j2
     dest: /etc/fail2ban/filter.d/gitea.conf
   notify: restart_fail2ban
 
 - name: Install Gitea's Fail2ban jail
-  ansible.builtin.template:
+  template:
     src: fail2ban-jail.conf.j2
     dest: /etc/fail2ban/jail.d/gitea.conf
   notify: restart_fail2ban
 
 - name: Start and enable Gitea service
-  ansible.builtin.service:
+  service:
     name: "{{ docker_compose_service }}@{{ gitea_name }}"
     state: started
     enabled: true

roles/jellyfin/defaults/main.yml

@@ -1,5 +0,0 @@
-jellyfin_name: jellyfin
-jellyfin_volume: "{{ jellyfin_name }}"
-jellyfin_router: "{{ jellyfin_name }}"
-jellyfin_rooturl: "https://{{ jellyfin_domain }}"
-jellyfin_root: "{{ docker_compose_root }}/{{ jellyfin_name }}"

roles/jellyfin/handlers/main.yml

@@ -1,5 +0,0 @@
-- name: Restart Jellyfin
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ jellyfin_name }}"
-    state: restarted
-  listen: restart_jellyfin

roles/jellyfin/tasks/main.yml

@@ -1,40 +0,0 @@
-- name: Create Jellyfin directory
-  ansible.builtin.file:
-    path: "{{ jellyfin_root }}"
-    state: directory
-    mode: 0500
-
-- name: Create jellyfin user
-  ansible.builtin.user:
-    name: jellyfin
-    state: present
-
-- name: Get user jellyfin uid
-  ansible.builtin.getent:
-    database: passwd
-    key: jellyfin
-
-- name: Get user jellyfin gid
-  ansible.builtin.getent:
-    database: group
-    key: jellyfin
-
-- name: Install Jellyfin's docker-compose file
-  ansible.builtin.template:
-    src: docker-compose.yml.j2
-    dest: "{{ jellyfin_root }}/docker-compose.yml"
-    mode: 0400
-  notify: restart_jellyfin
-
-- name: Install Jellyfin's docker-compose variables
-  ansible.builtin.template:
-    src: compose-env.j2
-    dest: "{{ jellyfin_root }}/.env"
-    mode: 0400
-  notify: restart_jellyfin
-
-- name: Start and enable Jellyfin service
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ jellyfin_name }}"
-    state: started
-    enabled: true

roles/jellyfin/templates/compose-env.j2

@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-jellyfin_version={{ jellyfin_version }}
-jellyfin_name={{ jellyfin_name }}
-jellyfin_domain={{ jellyfin_domain }}
-jellyfin_rooturl={{ jellyfin_rooturl }}

roles/jellyfin/templates/docker-compose.yml.j2

@@ -1,29 +0,0 @@
-version: '3.7'
-
-volumes:
-  {{ jellyfin_volume }}:
-
-networks:
-  traefik:
-    external: true
-
-services:
-  jellyfin:
-    image: "jellyfin/jellyfin:${jellyfin_version}"
-    container_name: "${jellyfin_name}"
-    networks:
-      - traefik
-    labels:
-      - "traefik.http.routers.{{ jellyfin_router }}.rule=Host(`{{ jellyfin_domain }}`)"
-{% if traefik_http_only %}
-      - "traefik.http.routers.{{ jellyfin_router }}.entrypoints=web"
-{% else %}
-      - "traefik.http.routers.{{ jellyfin_router }}.entrypoints=websecure"
-{% endif %}
-      - "traefik.http.services.{{ jellyfin_router }}.loadbalancer.server.port=8096"
-      - "traefik.docker.network=traefik"
-      - "traefik.enable=true"
-    volumes:
-      - ./config:/config
-      - ./cache:/cache
-      - {{ jellyfin_volume }}:/media

roles/jenkins/tasks/agent.yml

@@ -1,5 +1,5 @@
 - name: Create Jenkins user
-  ansible.builtin.user:
+  user:
     name: "{{ jenkins_user }}"
     state: present
     shell: /bin/bash
@@ -7,25 +7,25 @@
     generate_ssh_key: true
 
 - name: Set Jenkins authorized key
-  ansible.posix.authorized_key:
+  authorized_key:
     user: jenkins
     state: present
     exclusive: true
     key: "{{ jenkins_sshkey }}"
 
 - name: Give Jenkins user passwordless sudo
-  ansible.builtin.template:
+  template:
     src: jenkins_sudoers.j2
     dest: /etc/sudoers.d/{{ jenkins_user }}
     validate: "visudo -cf %s"
     mode: 0440
 
 - name: Install Ansible
-  ansible.builtin.apt:
+  apt:
     name: ansible
     state: present
 
 - name: Install Java
-  ansible.builtin.apt:
+  apt:
     name: default-jre
     state: present

roles/jenkins/tasks/main.yml

@@ -1,5 +1,5 @@
-- ansible.builtin.import_tasks: agent.yml
+- import_tasks: agent.yml
   when: jenkins_sshkey is defined
 
-- ansible.builtin.import_tasks: server.yml
+- import_tasks: server.yml
   when: jenkins_domain is defined

roles/jenkins/tasks/server.yml

@@ -1,12 +1,12 @@
 - name: Create Jenkin's directory
-  ansible.builtin.file:
+  file:
     path: "{{ jenkins_root }}"
     state: directory
     owner: "1000"
     group: "1000"
 
 - name: Start Jenkins Container
-  community.general.docker_container:
+  docker_container:
     name: "{{ jenkins_name }}"
     image: jenkins/jenkins:{{ jenkins_version }}
     state: started

roles/libvirt/tasks/main.yml

@@ -1,15 +1,15 @@
 - name: Install QEMU/KVM
-  ansible.builtin.apt:
+  apt:
     name: qemu-kvm
     state: present
 
 - name: Install Libvirt
-  ansible.builtin.apt:
+  apt:
     name: ["libvirt-clients", "libvirt-daemon-system"]
     state: present
 
 - name: Add users to libvirt group
-  ansible.builtin.user:
+  user:
     name: "{{ item }}"
     groups: libvirt
     append: yes
@@ -17,12 +17,12 @@
   when: libvirt_users is defined
 
 - name: Check for NODOWNLOAD file
-  ansible.builtin.stat:
+  stat:
     path: /var/lib/libvirt/images/NODOWNLOAD
   register: NODOWNLOAD
 
 - name: Download GNU/Linux ISOs
-  ansible.builtin.get_url:
+  get_url:
     url: "{{ item.url }}"
     dest: /var/lib/libvirt/images
     checksum: "{{ item.hash }}"
@@ -34,7 +34,7 @@
 
 # Prevent downloaded ISOs from being rehashed every run
 - name: Create NODOWNLOAD file
-  ansible.builtin.file:
+  file:
     path: /var/lib/libvirt/images/NODOWNLOAD
     state: touch
   when: download_isos.changed

roles/mariadb/tasks/main.yml

@@ -1,23 +1,23 @@
 - name: Install MariaDB
-  ansible.builtin.apt:
+  apt:
     name: mariadb-server
     state: present
 
 - name: Change the bind-address to allow Docker
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/mysql/mariadb.conf.d/50-server.cnf
     regex: "^bind-address"
     line: "bind-address            = 0.0.0.0"
   register: mariadb_conf
 
 - name: Restart MariaDB
-  ansible.builtin.service:
+  service:
     name: mariadb
     state: restarted
   when: mariadb_conf.changed
 
 - name: Allow database connections
-  community.general.ufw:
+  ufw:
     rule: allow
     port: "3306"
     proto: tcp

roles/minecraft/tasks/java.yml

@@ -1,28 +1,28 @@
 - name: Install GPG
-  ansible.builtin.apt:
+  apt:
     name: gpg
     state: present
 
 - name: Add AdoptOpenJDK's signing key
-  ansible.builtin.apt_key:
+  apt_key:
     id: 8ED17AF5D7E675EB3EE3BCE98AC3B29174885C03
     url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
 
 - name: Install AdoptOpenJDK repository
-  ansible.builtin.apt_repository:
+  apt_repository:
     repo: deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main
     mode: 0644
     state: present
 
 - name: Install Java
-  ansible.builtin.apt:
+  apt:
     name: "adoptopenjdk-{{ item.java.version }}-hotspot"
     state: present
   when: item.java.version is defined
   loop: "{{ minecraft }}"
 
 - name: "Install default Java, version {{ minecraft_java }}"
-  ansible.builtin.apt:
+  apt:
     name: "{{ minecraft_java_pkg }}"
     state: present
   when: item.java.version is not defined
@@ -30,7 +30,7 @@
   register: minecraft_java_default
 
 - name: "Activate default Java, version {{ minecraft_java }}"
-  community.general.alternatives:
+  alternatives:
     name: java
     path: "/usr/lib/jvm/{{ minecraft_java_pkg }}-amd64/bin/java"
   when: minecraft_java_default.changed

roles/minecraft/tasks/main.yml

@@ -1,14 +1,14 @@
-- ansible.builtin.import_tasks: system.yml
+- import_tasks: system.yml
   when: minecraft_eula
 
-- ansible.builtin.import_tasks: java.yml
+- import_tasks: java.yml
   when: minecraft_eula
 
-- ansible.builtin.import_tasks: vanilla.yml
+- import_tasks: vanilla.yml
   when: minecraft_eula
 
-- ansible.builtin.import_tasks: modpacks.yml
+- import_tasks: modpacks.yml
   when: minecraft_eula
 
-- ansible.builtin.import_tasks: service.yml
+- import_tasks: service.yml
   when: minecraft_eula

roles/minecraft/tasks/modpacks.yml

@@ -1,5 +1,5 @@
 - name: Download Minecraft modpack installer
-  ansible.builtin.get_url:
+  get_url:
     url: "{{ minecraft_modpack_url }}"
     dest: "{{ minecraft_home }}/{{ item.name }}/serverinstall_{{ item.modpack | replace ('/', '_') }}"
     owner: "{{ minecraft_user }}"
@@ -9,7 +9,7 @@
   when: item.modpack is defined and item.sha1 is not defined
 
 - name: Run Minecraft modpack installer
-  ansible.builtin.command: "sudo -u {{ minecraft_user }} ./serverinstall_{{ item.modpack | replace ('/', '_') }} --auto"
+  command: "sudo -u {{ minecraft_user }} ./serverinstall_{{ item.modpack | replace ('/', '_') }} --auto"
   args:
     creates: "{{ minecraft_home }}/{{ item.name }}/mods"
     chdir: "{{ minecraft_home }}/{{ item.name }}"
@@ -17,7 +17,7 @@
   when: item.modpack is defined and item.sha1 is not defined
 
 - name: Find Minecraft Forge
-  ansible.builtin.find:
+  find:
     paths: "{{ minecraft_home }}/{{ item.name }}"
     patterns: "forge*.jar"
   register: minecraft_forge
@@ -25,7 +25,7 @@
   when: item.modpack is defined and item.sha1 is not defined
 
 - name: Link to Minecraft Forge
-  ansible.builtin.file:
+  file:
     src: "{{ item.files[0].path }}"
     dest: "{{ minecraft_home }}/{{ item.item.name }}/minecraft_server.jar"
     owner: "{{ minecraft_user }}"

roles/minecraft/tasks/service.yml

@@ -1,11 +1,11 @@
 - name: Deploy Minecraft systemd service
-  ansible.builtin.template:
+  template:
     src: minecraft.service.j2
     dest: "/etc/systemd/system/minecraft@.service"
   register: minecraft_systemd
 
 - name: Deploy service environmental variables
-  ansible.builtin.template:
+  template:
     src: environment.conf.j2
     dest: "{{ minecraft_home }}/{{ item.name }}/environment.conf"
     owner: "{{ minecraft_user }}"
@@ -13,25 +13,25 @@
   loop: "{{ minecraft }}"
 
 - name: Reload systemd manager configuration
-  ansible.builtin.systemd:
+  systemd:
     daemon_reload: true
   when: minecraft_systemd.changed
 
 - name: Disable non-default service instances
-  ansible.builtin.service:
+  service:
     name: "minecraft@{{ item.name }}"
     enabled: false
   loop: "{{ minecraft }}"
   when: item.name != minecraft_onboot
 
 - name: Enable default service instance
-  ansible.builtin.service:
+  service:
     name: "minecraft@{{ minecraft_onboot }}"
     enabled: true
   when: minecraft_eula and minecraft_onboot is defined
 
 - name: Run default service instance
-  ansible.builtin.service:
+  service:
     name: "minecraft@{{ minecraft_onboot }}"
     state: started
   when: minecraft_eula and minecraft_onboot is defined and minecraft_onboot_run

roles/minecraft/tasks/system.yml

@@ -1,16 +1,16 @@
 - name: Install Screen
-  ansible.builtin.apt:
+  apt:
     name: screen
     state: present
 
 - name: Create Minecraft user
-  ansible.builtin.user:
+  user:
     name: "{{ minecraft_user }}"
     state: present
-    ansible.builtin.shell: /bin/bash
+    shell: /bin/bash
 
 - name: Create Minecraft directory
-  ansible.builtin.file:
+  file:
     path: "{{ minecraft_home }}/{{ item.name }}"
     state: directory
     owner: "{{ minecraft_user }}"
@@ -18,7 +18,7 @@
   loop: "{{ minecraft }}"
 
 - name: Answer to Mojang's EULA
-  ansible.builtin.template:
+  template:
     src: eula.txt.j2
     dest: "{{ minecraft_home }}/{{ item.name }}/eula.txt"
     owner: "{{ minecraft_user }}"

roles/minecraft/tasks/vanilla.yml

@@ -1,5 +1,5 @@
 - name: Download Minecraft
-  ansible.builtin.get_url:
+  get_url:
     url: "{{ minecraft_url }}"
     dest: "{{ minecraft_home }}/{{ item.name }}/minecraft_server.jar"
     checksum: "sha1:{{ item.sha1 }}"

roles/nextcloud/tasks/main.yml

@@ -1,9 +1,9 @@
 - name: Create Nextcloud network
-  community.general.docker_network:
+  docker_network:
     name: "{{ nextcloud_container }}"
 
 - name: Start Nextcloud's database container
-  community.general.docker_container:
+  docker_container:
     name: "{{ nextcloud_dbcontainer }}"
     image: mariadb:{{ nextcloud_dbversion }}
     state: started
@@ -19,7 +19,7 @@
       MYSQL_PASSWORD: "{{ nextcloud_dbpass }}"
 
 - name: Start Nextcloud container
-  community.general.docker_container:
+  docker_container:
     name: "{{ nextcloud_container }}"
     image: nextcloud:{{ nextcloud_version }}
     state: started
@@ -41,34 +41,34 @@
       traefik.enable: "true"
 
 - name: Grab Nextcloud database container information
-  community.general.docker_container_info:
+  docker_container_info:
     name: "{{ nextcloud_dbcontainer }}"
   register: nextcloud_dbinfo
 
 - name: Grab Nextcloud container information
-  community.general.docker_container_info:
+  docker_container_info:
     name: "{{ nextcloud_container }}"
   register: nextcloud_info
 
 - name: Wait for Nextcloud to become available
-  ansible.builtin.wait_for:
+  wait_for:
     host: "{{ nextcloud_info.container.NetworkSettings.Networks.traefik.IPAddress }}"
     port: 80
 
 - name: Check Nextcloud status
-  ansible.builtin.command: "docker exec --user www-data {{ nextcloud_container }}
+  command: "docker exec --user www-data {{ nextcloud_container }}
             php occ status"
   register: nextcloud_status
   args:
     removes: "{{ nextcloud_root }}/config/CAN_INSTALL"
 
 - name: Wait for Nextcloud database to become available
-  ansible.builtin.wait_for:
+  wait_for:
     host: "{{ nextcloud_dbinfo.container.NetworkSettings.Networks.nextcloud.IPAddress }}"
     port: 3306
 
 - name: Install Nextcloud
-  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}
+  command: 'docker exec --user www-data {{ nextcloud_container }}
             php occ maintenance:install
               --database "mysql"
               --database-host "{{ nextcloud_dbcontainer }}"
@@ -83,19 +83,19 @@
     - nextcloud_domain is defined
 
 - name: Set Nextcloud's Trusted Proxy
-  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}
+  command: 'docker exec --user www-data {{ nextcloud_container }}
             php occ config:system:set trusted_proxies 0
               --value="{{ traefik_name }}"'
   when: nextcloud_install.changed
 
 - name: Set Nextcloud's Trusted Domain
-  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}
+  command: 'docker exec --user www-data {{ nextcloud_container }}
             php occ config:system:set trusted_domains 0
               --value="{{ nextcloud_domain }}"'
   when: nextcloud_install.changed
 
 - name: Preform Nextcloud database maintenance
-  ansible.builtin.command: "docker exec --user www-data {{ nextcloud_container }} {{ item }}"
+  command: "docker exec --user www-data {{ nextcloud_container }} {{ item }}"
   loop:
     - "php occ maintenance:mode --on"
     - "php occ db:add-missing-indices"
@@ -104,6 +104,6 @@
   when: nextcloud_install.changed
 
 - name: Remove Nextcloud's CAN_INSTALL file
-  ansible.builtin.file:
+  file:
     path: "{{ nextcloud_root }}/config/CAN_INSTALL"
     state: absent

roles/nginx/tasks/main.yml

@@ -1,15 +1,15 @@
 - name: Create nginx root
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_root }}"
     state: directory
 
 - name: Generate deploy keys
-  community.crypto.openssh_keypair:
+  openssh_keypair:
     path: "{{ nginx_repo_key }}"
     state: present
 
 - name: Clone static website files
-  ansible.builtin.git:
+  git:
     repo: "{{ nginx_repo_url }}"
     dest: "{{ nginx_html }}"
     version: "{{ nginx_repo_branch }}"
@@ -17,7 +17,7 @@
     separate_git_dir: "{{ nginx_repo_dest }}"
 
 - name: Start nginx container
-  community.general.docker_container:
+  docker_container:
     name: "{{ nginx_name }}"
     image: nginx:{{ nginx_version }}
     state: started

roles/postgresql/tasks/main.yml

@@ -1,10 +1,10 @@
 - name: Install PostgreSQL
-  ansible.builtin.apt:
+  apt:
     name: postgresql
     state: present
 
 - name: Trust connections to PostgreSQL
-  community.general.postgresql_pg_hba:
+  postgresql_pg_hba:
     dest: "{{ postgresql_config }}"
     contype: host
     databases: all
@@ -15,7 +15,7 @@
   loop: "{{ postgresql_trust }}"
 
 - name: Change PostgreSQL listen addresses
-  community.general.postgresql_set:
+  postgresql_set:
     name: listen_addresses
     value: "{{ postgresql_listen }}"
   become: true
@@ -23,19 +23,19 @@
   register: postgresql_config
 
 - name: Reload PostgreSQL
-  ansible.builtin.service:
+  service:
     name: postgresql
     state: reloaded
   when: postgresql_hba.changed and not postgresql_config.changed
 
 - name: Restart PostgreSQL
-  ansible.builtin.service:
+  service:
     name: postgresql
     state: restarted
   when: postgresql_config.changed
 
 - name: Allow database connections
-  community.general.ufw:
+  ufw:
     rule: allow
     port: "5432"
     proto: tcp

roles/prometheus/tasks/main.yml

@@ -1,35 +1,35 @@
 - name: Install Prometheus node exporter
-  ansible.builtin.apt:
+  apt:
     name: prometheus-node-exporter
     state: present
 
 - name: Run Prometheus node exporter
-  ansible.builtin.service:
+  service:
     name: prometheus-node-exporter
     state: started
 
 - name: Create Prometheus data directory
-  ansible.builtin.file:
+  file:
     path: "{{ prom_root }}/prometheus"
     state: directory
     owner: nobody
 
 - name: Create Prometheus config directory
-  ansible.builtin.file:
+  file:
     path: "{{ prom_root }}/config"
     state: directory
 
 - name: Install Prometheus configuration
-  ansible.builtin.template:
+  template:
     src: prometheus.yml.j2
     dest: "{{ prom_root }}/config/prometheus.yml"
 
 - name: Create Prometheus network
-  community.general.docker_network:
+  docker_network:
     name: "{{ prom_name }}"
 
 - name: Start Prometheus container
-  community.general.docker_container:
+  docker_container:
     name: "{{ prom_name }}"
     image: prom/prometheus:{{ prom_version }}
     state: started
@@ -51,7 +51,7 @@
       traefik.enable: "true"
 
 - name: Start Grafana container
-  community.general.docker_container:
+  docker_container:
     name: "{{ grafana_name }}"
     image: grafana/grafana:{{ grafana_version }}
     state: started

roles/proxy/handlers/main.yml

@@ -1,5 +1,5 @@
 - name: Reload nginx
-  ansible.builtin.service:
+  service:
     name: nginx
     state: reloaded
   listen: reload_nginx

roles/proxy/tasks/main.yml

@@ -1,29 +1,29 @@
 - name: Install nginx
-  ansible.builtin.apt:
+  apt:
     name: nginx
     state: present
     update_cache: true
 
 - name: Start nginx and enable on boot
-  ansible.builtin.service:
+  service:
     name: nginx
     state: started
     enabled: true
 
 - name: Generate DH Parameters
-  community.crypto.openssl_dhparam:
+  openssl_dhparam:
     path: /etc/ssl/dhparams.pem
     size: 4096
 
 - name: Install nginx base configuration
-  ansible.builtin.template:
+  template:
     src: nginx.conf.j2
     dest: /etc/nginx/nginx.conf
     mode: '0644'
   notify: reload_nginx
 
 - name: Install nginx sites configuration
-  ansible.builtin.template:
+  template:
     src: server-nginx.conf.j2
     dest: "/etc/nginx/sites-available/{{ item.domain }}.conf"
     mode: '0644'
@@ -32,17 +32,16 @@
   register: nginx_sites
 
 - name: Enable nginx sites configuration
-  ansible.builtin.file:
+  file:
     src: "/etc/nginx/sites-available/{{ item.item.domain }}.conf"
     dest: "/etc/nginx/sites-enabled/{{ item.item.domain }}.conf"
     state: link
-    mode: 0400
   loop: "{{ nginx_sites.results }}"
   when: item.changed
   notify: reload_nginx
 
 - name: Generate self-signed certificate
-  ansible.builtin.command: 'openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes \
+  shell: 'openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes \
           -subj   "/C=US/ST=Local/L=Local/O=Org/OU=IT/CN=example.com" \
           -keyout /etc/ssl/private/nginx-selfsigned.key \
           -out    /etc/ssl/certs/nginx-selfsigned.crt'
@@ -52,34 +51,33 @@
   notify: reload_nginx
 
 - name: Install LE's certbot
-  ansible.builtin.apt:
+  apt:
     name: ['certbot', 'python3-certbot-dns-cloudflare']
     state: present
   when: proxy.production is defined and proxy.production
 
 - name: Install Cloudflare API token
-  ansible.builtin.template:
+  template:
     src: cloudflare.ini.j2
     dest: /root/.cloudflare.ini
-    mode: 0400
+    mode: '0600'
   when: proxy.production is defined and proxy.production and proxy.dns_cloudflare is defined
 
 - name: Create nginx post renewal hook directory
-  ansible.builtin.file:
+  file:
     path: /etc/letsencrypt/renewal-hooks/post
     state: directory
-    mode: 0500
   when: proxy.production is defined and proxy.production
 
 - name: Install nginx post renewal hook
-  ansible.builtin.copy:
+  copy:
     src: reload-nginx.sh
     dest: /etc/letsencrypt/renewal-hooks/post/reload-nginx.sh
     mode: '0755'
   when: proxy.production is defined and proxy.production
 
 - name: Run Cloudflare DNS-01 challenges on wildcard domains
-  ansible.builtin.shell: '/usr/bin/certbot certonly \
+  shell: '/usr/bin/certbot certonly \
             --non-interactive \
             --agree-tos \
             --email "{{ proxy.dns_cloudflare.email }}" \
@@ -95,7 +93,7 @@
   notify: reload_nginx
 
 - name: Add HTTP and HTTPS firewall rule
-  community.general.ufw:
+  ufw:
     rule: allow
     port: "{{ item }}"
     proto: tcp

roles/rsnapshot/tasks/main.yml

@@ -13,12 +13,12 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 - name: Install rsnapshot
-  ansible.builtin.apt:
+  apt:
     name: rsnapshot
     state: present
 
 - name: Create rsnapshot system directories
-  ansible.builtin.file:
+  file:
     path: "{{ item }}"
     state: directory
   loop:
@@ -26,19 +26,19 @@
     - "{{ rsnapshot_logdir }}"
 
 - name: Create snapshot_root directories
-  ansible.builtin.file:
+  file:
     path: "{{ item.root | default(rsnapshot_root) }}"
     state: directory
   loop: "{{ rsnapshot }}"
 
 - name: Install rsnapshot configuration
-  ansible.builtin.template:
+  template:
     src: rsnapshot.conf.j2
     dest: "{{ rsnapshot_confdir }}/{{ item.name }}.conf"
   loop: "{{ rsnapshot }}"
 
 - name: Install rsnapshot crons
-  ansible.builtin.cron:
+  cron:
     name: "{{ item.1.interval }} rsnapshot of {{ item.0.name }}"
     job: "/usr/bin/rsnapshot -c {{ rsnapshot_confdir }}/{{ item.0.name }}.conf {{ item.1.interval }} >/dev/null"
     user: "root"
@@ -53,13 +53,13 @@
     - cron
 
 - name: Install rsnapshot report script
-  ansible.builtin.template:
+  template:
     src: rsnapshot-report.sh.j2
     dest: /usr/local/bin/rsnapshot-report
     mode: '0750'
 
 - name: Install rsnapshot report crons
-  ansible.builtin.cron:
+  cron:
     name: "{{ item.name }} rsnapshot report email"
     job: "/usr/local/bin/rsnapshot-report {{ rsnapshot_reportlog }}
           | mail -s '{{ item.report.subject | default('Backup Report') }}' {{ item.report.to }}"

roles/traefik/defaults/main.yml

@@ -1,18 +1,12 @@
-# Container settings
 traefik_name: traefik
-traefik_standalone: true
+traefik_dashboard: false
-traefik_http_only: false
+traefik_root: "/opt/{{ traefik_name }}"
-traefik_debug: false
-traefik_web_entry: "127.0.0.1:8000"
-traefik_websecure_entry: "127.0.0.1:8443"
 traefik_localonly: "10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8"
-
-# HTTPS settings
 traefik_production: false
 traefik_hsts_enable: false
 traefik_hsts_preload: false
 traefik_hsts_seconds: 0
-traefik_http_redirect: true
+traefik_http_redirect: false
-
+traefik_ports:
-# Host settings
+  - "80:80"
-traefik_root: "{{ docker_compose_root }}/{{ traefik_name }}"
+  - "443:443"

roles/traefik/handlers/main.yml

@@ -1,12 +1,14 @@
 - name: Reload Traefik container
-  ansible.builtin.file:
+  file:
     path: "{{ traefik_root }}/config/dynamic"
     state: touch
-    mode: 0500
   listen: reload_traefik
 
-- name: Restart Traefik
+- name: Restart Traefik container
-  ansible.builtin.service:
+  docker_container:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
+    name: "{{ traefik_name }}"
-    state: restarted
+    image: traefik:{{ traefik_version }}
+    state: started
+    container_default_behavior: "no_defaults"
+    restart: yes
   listen: restart_traefik

roles/traefik/tasks/main.yml

@@ -1,49 +1,56 @@
-- name: Create Traefik directories
+- name: Create Traefik configuration directories
-  ansible.builtin.file:
+  file:
     path: "{{ traefik_root }}/config/dynamic"
-    mode: 0500
     state: directory
 
+- name: Install static Traefik configuration
+  template:
+    src: traefik.yml.j2
+    dest: "{{ traefik_root }}/config/traefik.yml"
+  notify: restart_traefik
+
 - name: Install dynamic security configuration
-  ansible.builtin.template:
+  template:
     src: security.yml.j2
     dest: "{{ traefik_root }}/config/dynamic/security.yml"
     owner: root
     group: root
-    mode: 0400
+    mode: 0600
   notify: reload_traefik
 
 - name: Install dynamic non-docker configuration
-  ansible.builtin.template:
+  template:
     src: "external.yml.j2"
     dest: "{{ traefik_root }}/config/dynamic/{{ item.name }}.yml"
-    mode: 0400
   loop: "{{ traefik_external }}"
   when: traefik_external is defined
 
-- name: Install Traefik's docker-compose file
+- name: Create Traefik network
-  ansible.builtin.template:
+  docker_network:
-    src: docker-compose.yml.j2
+    name: traefik
-    dest: "{{ traefik_root }}/docker-compose.yml"
-    mode: 0400
-  notify: restart_traefik
 
-- name: Install Traefik's docker-compose variables
+- name: Start Traefik container
-  ansible.builtin.template:
+  docker_container:
-    src: compose-env.j2
+    name: "{{ traefik_name }}"
-    dest: "{{ traefik_root }}/.env"
+    image: traefik:{{ traefik_version }}
-    mode: 0400
-  notify: restart_traefik
-
-- name: Install static Traefik configuration
-  ansible.builtin.template:
-    src: traefik.yml.j2
-    dest: "{{ traefik_root }}/config/traefik.yml"
-    mode: 0400
-  notify: restart_traefik
-
-- name: Start and enable Traefik service
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
     state: started
-    enabled: true
+    restart_policy: always
+    ports: "{{ traefik_ports }}"
+    container_default_behavior: "no_defaults"
+    networks_cli_compatible: "false"
+    networks:
+      - name: traefik
+    labels:
+      traefik.http.routers.traefik.rule: "Host(`{{ traefik_domain }}`)"
+      #traefik.http.middlewares.auth.basicauth.users: "{{ traefik_auth }}"
+      #traefik.http.middlewares.localonly.ipwhitelist.sourcerange: "{{ traefik_localonly }}"
+      #traefik.http.routers.traefik.tls.certresolver: letsencrypt
+      #traefik.http.routers.traefik.middlewares: "securehttps@file,auth@docker,localonly"
+      traefik.http.routers.traefik.service: "api@internal"
+      traefik.http.routers.traefik.entrypoints: websecure
+      traefik.http.routers.traefik.tls: "true"
+      traefik.docker.network: traefik
+      traefik.enable: "{{ traefik_dashboard | string }}"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - "{{ traefik_root }}/config:/etc/traefik"

roles/traefik/templates/compose-env.j2

@@ -1,8 +0,0 @@
-# {{ ansible_managed }}
-traefik_version={{ traefik_version }}
-traefik_name={{ traefik_name }}
-traefik_domain={{ traefik_domain }}
-traefik_dashboard={{ traefik_dashboard | string | lower }}
-traefik_debug={{ traefik_debug | string | lower }}
-traefik_web_entry={{ traefik_web_entry }}
-traefik_websecure_entry={{ traefik_websecure_entry }}

roles/traefik/templates/docker-compose.yml.j2

@@ -1,25 +0,0 @@
-version: '3.7'
-
-networks:
-  traefik:
-    name: traefik
-
-services:
-  traefik:
-    image: "traefik:${traefik_version}"
-    container_name: "${traefik_name}"
-    ports:
-      - "${traefik_web_entry}:80"
-{% if traefik_standalone and not traefik_http_only %}
-      - "${traefik_websecure_entry}:443"
-{% endif %}
-    networks:
-      - traefik
-    labels:
-      - "traefik.http.routers.traefik.rule=Host(`{{ traefik_domain }}`)"
-      - "traefik.http.routers.traefik.service=api@internal"
-      - "traefik.docker.network=traefik"
-      - "traefik.enable=${traefik_dashboard}"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - "{{ traefik_root }}/config:/etc/traefik"

roles/traefik/templates/traefik.yml.j2

@@ -10,7 +10,7 @@ providers:
 entrypoints:
   web:
     address: ':80'
-{% if traefik_http_redirect is defined and traefik_http_redirect and not traefik_http_only %}
+{% if traefik_http_redirect is defined and traefik_http_redirect %}
     http:
       redirections:
         entrypoint:
@@ -18,12 +18,10 @@ entrypoints:
           scheme: https
           permanent: true
 {% endif %}
-{% if not traefik_http_only is defined or not traefik_http_only %}
   websecure:
     address: ':443'
     http:
       tls: {}
-{% endif %}
 
 {% if traefik_acme_email is defined %}
 certificatesResolvers:

roles/unifi/tasks/main.yml

@@ -1,52 +1,52 @@
 - name: Install GnuPG
-  ansible.builtin.apt:
+  apt:
     name: gnupg
     state: present
 
 - name: Add AdoptOpenJDK's signing key
-  ansible.builtin.apt_key:
+  apt_key:
     id: 8ED17AF5D7E675EB3EE3BCE98AC3B29174885C03
     url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
 
 - name: Add MongoDB 3.6's signing key
-  ansible.builtin.apt_key:
+  apt_key:
     id: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
     url: https://www.mongodb.org/static/pgp/server-3.6.asc
 
 - name: Add UniFi's signing key
-  ansible.builtin.apt_key:
+  apt_key:
     id: 4A228B2D358A5094178285BE06E85760C0A52C50
     keyserver: keyserver.ubuntu.com
 
 - name: Install AdoptOpenJDK repository
-  ansible.builtin.apt_repository:
+  apt_repository:
     repo: deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main
     mode: 0644
     state: present
 
 - name: Install MongoDB 3.6 repository
-  ansible.builtin.apt_repository:
+  apt_repository:
     repo: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/3.6 main
     mode: 0644
     state: present
 
 - name: Install UniFi repository
-  ansible.builtin.apt_repository:
+  apt_repository:
     repo: deb https://www.ui.com/downloads/unifi/debian stable ubiquiti
     mode: 0644
     state: present
 
 - name: Install MongoDB 3.6
-  ansible.builtin.apt:
+  apt:
     name: mongodb-org
     state: present
 
 - name: Install OpenJDK 8 LTS
-  ansible.builtin.apt:
+  apt:
     name: adoptopenjdk-8-hotspot
     state: present
 
 - name: Install UniFi
-  ansible.builtin.apt:
+  apt:
     name: unifi
     state: present

roles/wordpress/tasks/main.yml

@@ -1,5 +1,5 @@
 - name: Start WordPress database container
-  community.general.docker_container:
+  docker_container:
     name: "{{ wordpress_dbcontainer }}"
     image: mariadb:{{ wordpress_dbversion }}
     restart_policy: always
@@ -11,7 +11,7 @@
       MYSQL_PASSWORD: "{{ wordpress_dbpass }}"
 
 - name: Start WordPress container
-  community.general.docker_container:
+  docker_container:
     name: "{{ wordpress_container }}"
     image: wordpress:{{ wordpress_version }}
     restart_policy: always

update-hosts.sh

@@ -14,7 +14,6 @@ HOST[8]="wordpress.${DOMAIN}"
 HOST[9]="site1.wordpress.${DOMAIN}"
 HOST[10]="site2.wordpress.${DOMAIN}"
 HOST[11]="unifi.${DOMAIN}"
-HOST[12]="jellyfin.${DOMAIN}"
 
 # Get Vagrantbox guest IP
 VAGRANT_OUTPUT=$(vagrant ssh -c "hostname -I | cut -d' ' -f2" 2>/dev/null)