testing

.github/workflows/vagrant.yml

@@ -1,40 +0,0 @@
-name: homelab-ci
-
-on:
-  push:
-    branches:
-      - github_actions
-      # - main
-      # - testing
-
-jobs:
-  homelab-ci:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v3
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
-
-      - name: Install Ansible
-        run: brew install ansible@7
-
-      - name: Software Versions
-        run: |
-          printf "VirtualBox "
-          vboxmanage --version
-          vagrant --version
-          export PATH="/usr/local/opt/ansible@7/bin:$PATH"
-          ansible --version
-
-      - name: Vagrant Up with Dockerbox Playbook
-        run: |
-          export PATH="/usr/local/opt/ansible@7/bin:$PATH"
-          PLAYBOOK=dockerbox vagrant up
-          vagrant ssh -c "docker ps"

.gitignore

@@ -1,4 +1,13 @@
+.vagrant
 .playbook
-.vagrant*
-.vscode
+/*.yml
+/*.yaml
+!backup.yml
+!moxie.yml
+!docker.yml
+!dockerbox.yml
+!hypervisor.yml
+!minecraft.yml
+!proxy.yml
+!unifi.yml
 /environments/

Makefile

@@ -1,10 +0,0 @@
-.PHONY: clean install
-
-all: install
-
-install:
-	vagrant up --no-destroy-on-error
-	sudo ./forward-ssh.sh
-
-clean:
-	vagrant destroy -f && rm -rf .vagrant

README.md

@@ -1,76 +1,41 @@
-# Homelab
+# Project Moxie
 
-This project is my personal IT homelab initiative for self-hosting and
-exploring Free and Open Source Software (FOSS) infrastructure. As a technology
-enthusiast and professional, this project is primarily a practical tool for
-hosting services. It serves as a playground for engaging with systems
-technology in functional, intriguing, and gratifying ways. Self-hosting
-empowers individuals to govern their digital space, ensuring that their online
-environments reflect personal ethics rather than centralized entities' opaque
-policies.
-
-Built on Debian Stable, this project utilizes Ansible and Vagrant, providing
-relatively easy-to-use reproducible ephemeral environments to test
-infrastructure automation before pushing to live systems.
+Project Moxie is a personal IT homelab project written in Ansible and executed by Jenkins. It is a growing collection of infrastructure as code (IaC) I write out of curiosity and for reference purposes, keeping a handful of beneficial projects managed and secured.
 
 ## Quick Start
 
 To configure a local virtual machine for testing, follow these simple steps.
 
+### Prerequisites
+
+Vagrant and VirtualBox are used to develop Project Moxie. You will need to install these before continuing.
+
 ### Installation
 
 1. Clone this repository
    ```
-   git clone https://git.krislamo.org/kris/homelab
-   ```
-   Optionally clone from the GitHub mirror instead:
-   ```
-   git clone https://github.com/krislamo/homelab
+   git clone https://github.com/krislamo/moxie
    ```
 2. Set the `PLAYBOOK` environmental variable to a development playbook name in the `dev/` directory
 
-   To list available options in the `dev/` directory and choose a suitable PLAYBOOK, run:
-   ```
-   ls dev/*.yml | xargs -n 1 basename -s .yml
-   ```
-   Export the `PLAYBOOK` variable
+   The following `PLAYBOOK` names are available: `dockerbox`, `hypervisor`, `minecraft`, `bitwarden`, `nextcloud`, `nginx`
+
    ```
    export PLAYBOOK=dockerbox
    ```
-3. Clean up any previous provision and build the VM
+3. Bring the Vagrant box up
    ```
-   make clean && make
+   vagrant up
    ```
 
-## Vagrant Settings
-The Vagrantfile configures the environment based on settings from `.vagrant.yml`,
-with default values including:
-
-- PLAYBOOK: `default`
-   - Runs a `default` playbook that does nothing.
-   - You can set this by an environmental variable with the same name.
-- VAGRANT_BOX: `debian/bookworm64`
-   - Current Debian Stable codename
-- VAGRANT_CPUS: `2`
-   - Threads or cores per node, depending on CPU architecture
-- VAGRANT_MEM: `2048`
-   - Specifies the amount of memory (in MB) allocated
-- SSH_FORWARD: `false`
-   - Enable this if you need to forward SSH agents to the Vagrant machine
-
-
-## Copyright and License
-Copyright (C) 2019-2023  Kris Lamoureux
+#### Copyright and License
+Copyright (C) 2020-2021  Kris Lamoureux
 
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
-This program is free software: you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation, version 3 of the License.
 
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3 of the License.
 
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <https://www.gnu.org/licenses/>.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.

Vagrantfile

@@ -1,41 +1,43 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require 'yaml'
-settings_path = '.vagrant.yml'
-settings = {}
-
-if File.exist?(settings_path)
-  settings = YAML.load_file(settings_path)
+SSH_FORWARD=ENV["SSH_FORWARD"]
+if !(SSH_FORWARD == "true")
+  SSH_FORWARD = false
 end
 
-VAGRANT_BOX  = settings['VAGRANT_BOX']  || 'debian/bookworm64'
-VAGRANT_CPUS = settings['VAGRANT_CPUS'] || 2
-VAGRANT_MEM  = settings['VAGRANT_MEM']  || 2048
-SSH_FORWARD  = settings['SSH_FORWARD']  || false
-
-# Default to shell environment variable: PLAYBOOK (priority #1)
 PLAYBOOK=ENV["PLAYBOOK"]
-if !PLAYBOOK || PLAYBOOK.empty?
-  # PLAYBOOK setting in .vagrant.yml (priority #2)
-  PLAYBOOK = settings['PLAYBOOK'] || 'default'
+if !PLAYBOOK
+  if File.exist?('.playbook')
+    PLAYBOOK = IO.read('.playbook').split("\n")[0]
+  end
+
+  if !PLAYBOOK || PLAYBOOK.empty?
+    PLAYBOOK = "\nERROR: Set env PLAYBOOK"
+  end
+else
+  File.write(".playbook", PLAYBOOK)
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = VAGRANT_BOX
+  config.vm.box = "debian/bullseye64"
   config.vm.network "private_network", type: "dhcp"
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.synced_folder "./scratch", "/vagrant/scratch"
   config.ssh.forward_agent = SSH_FORWARD
 
-  # Libvrit provider
-  config.vm.provider :libvirt do |libvirt|
-    libvirt.cpus   = VAGRANT_CPUS
-    libvirt.memory = VAGRANT_MEM
+  # Machine Name
+  config.vm.define :moxie do |moxie| #
   end
 
-  # Virtualbox provider
-  config.vm.provider :virtualbox do |vbox|
-    vbox.cpus   = VAGRANT_CPUS
-    vbox.memory = VAGRANT_MEM
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.cpus = 2
+    libvirt.memory = 4096
+    libvirt.default_prefix = ""
+  end
+
+  config.vm.provider "virtualbox" do |vbox|
+    vbox.memory = 4096
   end
 
   # Provision with Ansible
@@ -43,6 +45,6 @@ Vagrant.configure("2") do |config|
     ENV['ANSIBLE_ROLES_PATH'] = File.dirname(__FILE__) + "/roles"
     ansible.compatibility_mode = "2.0"
     ansible.playbook = "dev/" + PLAYBOOK + ".yml"
-    ansible.raw_arguments = ["--diff"]
   end
+
 end

ansible.cfg

@@ -1,7 +1,6 @@
 [defaults]
 inventory = ./environments/development
 interpreter_python = /usr/bin/python3
-roles_path = ./roles
 
 [connection]
 pipelining = true

dev/default.yml

@@ -1,4 +0,0 @@
-- name: Install 'default' aka nothing
-  hosts: all
-  become: true
-  tasks: []

dev/docker.yml

@@ -1,8 +0,0 @@
-- name: Install Docker Server
-  hosts: all
-  become: true
-  vars_files:
-    - host_vars/docker.yml
-  roles:
-    - base
-    - docker

dev/dockerbox.yml

@@ -1,4 +1,4 @@
-- name: Install Dockerbox Server
+- name: Install Docker Box Server
   hosts: all
   become: true
   vars_files:
@@ -6,7 +6,9 @@
   roles:
     - base
     - docker
-    - mariadb
     - traefik
     - nextcloud
-    - proxy
+    - gitea
+    - jenkins
+    - prometheus
+    - nginx

dev/gitea.yml

@@ -1,10 +0,0 @@
-- name: Install Gitea Server
-  hosts: all
-  become: true
-  vars_files:
-    - host_vars/gitea.yml
-  roles:
-    - base
-    - docker
-    - mariadb
-    - gitea

dev/host_vars/bitwarden.yml

@@ -9,14 +9,14 @@ docker_users:
 # traefik
 traefik_version: latest
 traefik_dashboard: true
-traefik_domain: traefik.local.krislamo.org
+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
 
 # bitwarden
 # Get Installation ID & Key at https://bitwarden.com/host/
-bitwarden_domain: vault.local.krislamo.org
+bitwarden_domain: vault.vm.krislamo.org
 bitwarden_dbpass: password
 bitwarden_install_id: 4ea840a3-532e-4cb6-a472-abd900728b23
 bitwarden_install_key: 1yB3Z2gRI0KnnH90C6p

dev/host_vars/docker.yml

@@ -1,48 +0,0 @@
-# base
-allow_reboot: false
-manage_network: false
-
-# Import my GPG key for git signature verification
-root_gpgkeys:
-  - name: kris@lamoureux.io
-    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-
-# docker
-docker_users:
-  - vagrant
-
-#docker_login_url: https://myregistry.example.com
-#docker_login_user: myuser
-#docker_login_pass: YOUR_PASSWD
-
-docker_compose_env_nolog: false # dev only setting
-docker_compose_deploy:
-  # Traefik
-  - name: traefik
-    url: https://github.com/krislamo/traefik
-    version: 31ee724feebc1d5f91cb17ffd6892c352537f194
-    enabled: true
-    accept_newhostkey: true # Consider verifying manually instead
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      ENABLE: true
-
-  # Traefik 2 (no other external compose to test currently)
-  - name: traefik2
-    url: https://github.com/krislamo/traefik
-    version: 31ee724feebc1d5f91cb17ffd6892c352537f194
-    enabled: true
-    accept_newhostkey: true # Consider verifying manually instead
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      ENABLE: true
-      VERSION: "2.10"
-      DOMAIN: traefik2.local.krislamo.org
-      NAME: traefik2
-      ROUTER: traefik2
-      NETWORK: traefik2
-      WEB_PORT: 127.0.0.1:8000:80
-      WEBSECURE_PORT: 127.0.0.1:4443:443
-      LOCAL_PORT: 127.0.0.1:8444:8443

dev/host_vars/dockerbox.yml

@@ -2,47 +2,47 @@
 allow_reboot: false
 manage_network: false
 
-# Import my GPG key for git signature verification
-root_gpgkeys:
-  - name: kris@lamoureux.io
-    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-
-# proxy
-proxy:
-  servers:
-    - domain: cloud.local.krislamo.org
-      proxy_pass: http://127.0.0.1:8000
-
 # docker
-docker_official: true # docker's apt repos
 docker_users:
   - vagrant
 
-docker_compose_env_nolog: false # dev only setting
-docker_compose_deploy:
-  # Traefik
-  - name: traefik
-    url: https://github.com/krislamo/traefik
-    version: d62bd06b37ecf0993962b0449a9d708373f9e381
-    enabled: true
-    accept_newhostkey: true # Consider verifying manually instead
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      DASHBOARD: true
-  # Nextcloud
-  - name: nextcloud
-    url: https://github.com/krislamo/nextcloud
-    version: fe6d349749f178e91ae7ff726d557f48ebf84356
-    env:
-      DATA: ./data
-
 # traefik
-traefik:
-  ENABLE: true
+traefik_version: latest
+traefik_dashboard: true
+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
 
 # nextcloud
-nextcloud:
-  DOMAIN: cloud.local.krislamo.org
-  DB_PASSWD: password
-  ADMIN_PASSWD: password
+nextcloud_version: stable
+nextcloud_admin: admin
+nextcloud_pass: password
+nextcloud_domain: cloud.vm.krislamo.org
+
+nextcloud_dbversion: latest
+nextcloud_dbpass: password
+
+# gitea
+gitea_domain: git.vm.krislamo.org
+gitea_version: 1
+gitea_dbversion: latest
+gitea_dbpass: password
+
+# jenkins
+jenkins_version: lts
+jenkins_domain: jenkins.vm.krislamo.org
+
+# prometheus (includes grafana)
+prom_version: latest
+prom_domain: prom.vm.krislamo.org
+grafana_version: latest
+grafana_domain: grafana.vm.krislamo.org
+prom_targets: "['10.0.2.15:9100']"
+
+# nginx
+nginx_domain: nginx.vm.krislamo.org
+nginx_name: staticsite
+nginx_repo_url: https://git.krislamo.org/kris/example-website/
+nginx_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
+nginx_version: latest

dev/host_vars/gitea.yml

@@ -1,50 +0,0 @@
-# base
-allow_reboot: false
-manage_network: false
-
-users:
-  git:
-    uid: 1001
-    gid: 1001
-    home: true
-    system: true
-
-# Import my GPG key for git signature verification
-root_gpgkeys:
-  - name: kris@lamoureux.io
-    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-
-# docker
-docker_official: true # docker's apt repos
-docker_users:
-  - vagrant
-
-docker_compose_env_nolog: false # dev only setting
-docker_compose_deploy:
-  # Traefik
-  - name: traefik
-    url: https://github.com/krislamo/traefik
-    version: 398eb48d311db78b86abf783f903af4a1658d773
-    enabled: true
-    accept_newhostkey: true
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      ENABLE: true
-  # Gitea
-  - name: gitea
-    url: https://github.com/krislamo/gitea
-    version: b0ce66f6a1ab074172eed79eeeb36d7e9011ef8f
-    enabled: true
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      USER_UID: "{{ users.git.uid }}"
-      USER_GID: "{{ users.git.gid }}"
-      DB_PASSWD: "{{ gitea.DB_PASSWD }}"
-
-# gitea
-gitea:
-  DB_NAME: gitea
-  DB_USER: gitea
-  DB_PASSWD: password

dev/host_vars/mediaserver.yml

@@ -1,61 +0,0 @@
-base_domain: local.krislamo.org
-
-# base
-allow_reboot: false
-manage_network: false
-
-users:
-  jellyfin:
-    uid: 1001
-    gid: 1001
-    shell: /usr/sbin/nologin
-    home: false
-    system: true
-
-samba:
-  users:
-    - name: jellyfin
-      password: jellyfin
-  shares:
-    - name: jellyfin
-      path: /srv/jellyfin
-      owner: jellyfin
-      group: jellyfin
-      valid_users: jellyfin
-  firewall:
-    - 10.0.0.0/8
-    - 172.16.0.0/12
-    - 192.168.0.0/16
-
-# 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
-jellyfin_media: /srv/jellyfin

dev/host_vars/nextcloud.yml

@@ -5,14 +5,14 @@ docker_users:
 # traefik
 traefik_version: latest
 traefik_dashboard: true
-traefik_domain: traefik.local.krislamo.org
+traefik_domain: traefik.vm.krislamo.org
 traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
 
 # container settings
 nextcloud_version: stable
 nextcloud_admin: admin
 nextcloud_pass: password
-nextcloud_domain: cloud.local.krislamo.org
+nextcloud_domain: cloud.vm.krislamo.org
 
 # database settings
 nextcloud_dbversion: latest

dev/host_vars/nginx.yml

@@ -9,13 +9,13 @@ docker_users:
 # traefik
 traefik_version: latest
 traefik_dashboard: true
-traefik_domain: traefik.local.krislamo.org
+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
 
 # nginx
-nginx_domain: nginx.local.krislamo.org
+nginx_domain: nginx.vm.krislamo.org
 nginx_name: staticsite
 nginx_repo_url: https://git.krislamo.org/kris/example-website/
 nginx_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin

dev/host_vars/proxy.yml

@@ -1,21 +1,9 @@
-base_domain: local.krislamo.org
+base_domain: vm.krislamo.org
 
 # base
 allow_reboot: false
 manage_network: false
 
-users:
-  git:
-    uid: 1001
-    gid: 1001
-    home: true
-    system: true
-
-# Import my GPG key for git signature verification
-root_gpgkeys:
-  - name: kris@lamoureux.io
-    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-
 # proxy
 proxy:
   #production: true
@@ -27,49 +15,16 @@ proxy:
       - "{{ base_domain }}"
   servers:
     - domain: "{{ bitwarden_domain }}"
-      proxy_pass: "http://127.0.0.1"
+      proxy_pass: "http://127.0.0.1:8080"
     - domain: "{{ gitea_domain }}"
-      proxy_pass: "http://127.0.0.1"
+      proxy_pass: "http://127.0.0.1:3000"
+    - domain: "{{ kutt_domain }}"
+      proxy_pass: "http://127.0.0.1:3030"
 
 # docker
-docker_official: true # docker's apt repos
 docker_users:
   - vagrant
 
-docker_compose_env_nolog: false # dev only setting
-docker_compose_deploy:
-  # Traefik
-  - name: traefik
-    url: https://github.com/krislamo/traefik
-    version: e97db75e2e214582fac5f5e495687ab5cdf855ad
-    path: docker-compose.web.yml
-    enabled: true
-    accept_newhostkey: true
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      ENABLE: true
-  # Gitea
-  - name: gitea
-    url: https://github.com/krislamo/gitea
-    version: b0ce66f6a1ab074172eed79eeeb36d7e9011ef8f
-    enabled: true
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      ENTRYPOINT: web
-      ENABLE_TLS: false
-      USER_UID: "{{ users.git.uid }}"
-      USER_GID: "{{ users.git.gid }}"
-      DB_PASSWD: "{{ gitea.DB_PASSWD }}"
-
-# gitea
-gitea_domain: "git.{{ base_domain }}"
-gitea:
-  DB_NAME: gitea
-  DB_USER: gitea
-  DB_PASSWD: password
-
 # bitwarden
 # Get Installation ID & Key at https://bitwarden.com/host/
 bitwarden_domain: "vault.{{ base_domain }}"
@@ -77,3 +32,21 @@ bitwarden_dbpass: password
 bitwarden_install_id: 4ea840a3-532e-4cb6-a472-abd900728b23
 bitwarden_install_key: 1yB3Z2gRI0KnnH90C6p
 #bitwarden_prodution: true
+
+# gitea
+gitea_domain: "git.{{ base_domain }}"
+gitea_version: 1
+gitea_dbpass: password
+
+# kutt
+kutt_version: latest
+kutt_redis_version: 6
+kutt_postgres_version: 12
+kutt_domain: "kutt.{{ base_domain }}"
+kutt_dbpass: password
+kutt_jwt_secret: long&random
+kutt_mail_user: kutt-noreply@example.com
+kutt_mail_host: smtp.example.com
+kutt_mail_password: realpassword
+kutt_report_email: realemail@example.com
+kutt_admin_emails: realemail@example.com

dev/host_vars/wordpress.yml

@@ -9,14 +9,14 @@ docker_users:
 # traefik
 traefik_version: latest
 traefik_dashboard: true
-traefik_domain: traefik.local.krislamo.org
+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
 
 # container settings
 wordpress_version: latest
-wordpress_domain: wordpress.local.krislamo.org
+wordpress_domain: wordpress.vm.krislamo.org
 wordpress_multisite: true
 
 # database settings

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

dev/proxy.yml

@@ -5,8 +5,9 @@
     - host_vars/proxy.yml
   roles:
     - base
+    - mariadb
     - proxy
     - docker
-    - mariadb
     - gitea
     - bitwarden
+    - kutt

docker.yml

@@ -0,0 +1,21 @@
+# Copyright (C) 2020  Kris Lamoureux
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+- name: Install Docker Server
+  hosts: dockerhosts
+  become: true
+  roles:
+    - base
+    - docker
+    - jenkins

dockerbox.yml

@@ -0,0 +1,25 @@
+# Copyright (C) 2020  Kris Lamoureux
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+- name: Install Docker Box Server
+  hosts: dockerhosts
+  become: true
+  roles:
+    - base
+    - docker
+    - traefik
+    - nextcloud
+    - jenkins
+    - prometheus
+    - nginx

forward-ssh.sh

@@ -1,125 +0,0 @@
-#!/bin/bash
-
-# Finds the SSH private key under ./.vagrant and connects to
-# the Vagrant box, port forwarding localhost ports: 8443, 443, 80, 22
-#
-# Download the latest script:
-# https://git.krislamo.org/kris/homelab/raw/branch/main/forward-ssh.sh
-#
-# Copyright (C) 2023  Kris Lamoureux
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# Root check
-if [ "$EUID" -ne 0 ]; then
-  echo "[ERROR]: Please run this script as root"
-  exit 1
-fi
-
-# Clean environment
-unset PRIVATE_KEY
-unset HOST_IP
-unset MATCH_PATTERN
-unset PKILL_ANSWER
-
-# Function to create the SSH tunnel
-function ssh_connect {
-  read -rp "Start a new vagrant SSH tunnel? [y/N] " PSTART_ANSWER
-  echo
-  case "$PSTART_ANSWER" in
-    [yY])
-      printf "[INFO]: Starting new vagrant SSH tunnel on PID "
-      sudo -u "$USER" ssh -fNT -i "$PRIVATE_KEY" \
-        -L 22:localhost:22 \
-        -L 80:"$HOST_IP":80 \
-        -L 443:"$HOST_IP":443 \
-        -L 8443:localhost:8443 \
-        -o UserKnownHostsFile=/dev/null \
-        -o StrictHostKeyChecking=no \
-        vagrant@"$HOST_IP" 2>/dev/null
-      sleep 2
-      pgrep -f "$MATCH_PATTERN"
-      ;;
-    *)
-      echo "[INFO]: Declined to start a new vagrant SSH tunnel"
-      exit 0
-      ;;
-  esac
-}
-
-# Check for valid PRIVATE_KEY location
-PRIVATE_KEY="$(find .vagrant -name "private_key" 2>/dev/null | sort)"
-
-# Single vagrant machine or multiple
-if [ "$(echo "$PRIVATE_KEY" | wc -l)" -gt 1 ]; then
-  while IFS= read -r KEYFILE; do
-    if ! ssh-keygen -l -f "$KEYFILE" &>/dev/null; then
-      echo "[ERROR]: The SSH key '$KEYFILE' is not valid. Are your virtual machines running?"
-      exit 1
-    fi
-    echo "[CHECK]: Valid key at $KEYFILE"
-  done < <(echo "$PRIVATE_KEY")
-  PRIVATE_KEY="$(echo "$PRIVATE_KEY" | grep -m1 "${1:-default}")"
-elif ! ssh-keygen -l -f "$PRIVATE_KEY" &>/dev/null; then
-  echo "[ERROR]: The SSH key '$PRIVATE_KEY' is not valid. Is your virtual machine running?"
-  exit 1
-else
-  echo "[CHECK]: Valid key at $PRIVATE_KEY"
-fi
-
-# Grab first IP or use whatever HOST_IP_FIELD is set to and check that the guest is up
-HOST_IP="$(sudo -u "$SUDO_USER" vagrant ssh -c "hostname -I | cut -d' ' -f${HOST_IP_FIELD:-1}" "${1:-default}" 2>/dev/null)"
-if [ -z "$HOST_IP" ]; then
-  echo "[ERROR]: Failed to find ${1:-default}'s IP"
-  exit 1
-fi
-HOST_IP="${HOST_IP::-1}" # trim
-
-if ! ping -c 1 "$HOST_IP" &>/dev/null; then
-  echo "[ERROR]: Cannot ping the host IP '$HOST_IP'"
-  exit 1
-fi
-echo "[CHECK]: Host at $HOST_IP (${1:-default}) is up"
-
-# Pattern for matching processes running
-MATCH_PATTERN="ssh -fNT -i ${PRIVATE_KEY}.*vagrant@"
-
-# Check amount of processes that match the pattern
-if [ "$(pgrep -afc "$MATCH_PATTERN")" -eq 0 ]; then
-  ssh_connect
-else
-  # Processes found, so prompt to kill remaining ones then start tunnel
-  printf "\n[WARNING]: Found processes running:\n"
-  pgrep -fa "$MATCH_PATTERN"
-  printf '\n'
-  read -rp "Would you like to kill these processes? [y/N] " PKILL_ANSWER
-  echo
-  case "$PKILL_ANSWER" in
-    [yY])
-      echo "[WARNING]: Killing old vagrant SSH tunnel(s): "
-      pgrep -f "$MATCH_PATTERN" | tee >(xargs kill -15)
-      echo
-      if [ "$(pgrep -afc "$MATCH_PATTERN")" -eq 0 ]; then
-        ssh_connect
-      else
-        echo "[ERROR]: Unable to kill processes:"
-        pgrep -f "$MATCH_PATTERN"
-        exit 1
-      fi
-      ;;
-    *)
-      echo "[INFO]: Declined to kill existing processes"
-      exit 0
-      ;;
-  esac
-fi

playbooks/docker.yml

@@ -1,8 +0,0 @@
-- name: Install Docker Server
-  hosts: "{{ PLAYBOOK_HOST | default('none') }}"
-  become: true
-  roles:
-    - base
-    - jenkins
-    - proxy
-    - docker

playbooks/dockerbox.yml

@@ -1,11 +0,0 @@
-- name: Install Dockerbox Server
-  hosts: "{{ PLAYBOOK_HOST | default('none') }}"
-  become: true
-  roles:
-    - base
-    - docker
-    - traefik
-    - nextcloud
-    - jenkins
-    - prometheus
-    - nginx

playbooks/mediaserver.yml

@@ -1,10 +0,0 @@
-- name: Install Media Server
-  hosts: "{{ PLAYBOOK_HOST | default('none') }}"
-  become: true
-  roles:
-    - base
-    - jenkins
-    - proxy
-    - docker
-    - traefik
-    - jellyfin

roles/.gitignore

@@ -0,0 +1,23 @@
+# Sort roles: tail -n +6 roles/.gitignore | sort
+/*
+!.gitignore
+!requirements.yml
+# roles
+!base*/
+!bitwarden*/
+!docker*/
+!gitea*/
+!jenkins*/
+!kutt*/
+!libvirt*/
+!mariadb*/
+!minecraft*/
+!nextcloud*/
+!nginx*/
+!postgresql*/
+!prometheus*/
+!proxy*/
+!rsnapshot*/
+!traefik*/
+!unifi*/
+!wordpress*/

roles/base/defaults/main.yml

@@ -1,8 +1,6 @@
-allow_reboot: true
-manage_firewall: true
 manage_network: false
 network_type: static
-locale_default: en_US.UTF-8
+allow_reboot: true
 
 packages:
   - apache2-utils

roles/base/handlers/main.yml

@@ -1,34 +1,18 @@
 - name: Reboot host
-  ansible.builtin.reboot:
+  reboot:
     msg: "Reboot initiated by Ansible"
     connect_timeout: 5
   listen: reboot_host
   when: allow_reboot
 
-- name: Reconfigure locales
-  ansible.builtin.command: dpkg-reconfigure -f noninteractive locales
-  listen: reconfigure_locales
-
 - 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
-
-- name: Restart Samba
-  ansible.builtin.service:
-    name: smbd
-    state: restarted
-  listen: restart_samba

roles/base/tasks/ansible.yml

@@ -1,5 +1,23 @@
+- name: 'Install Ansible dependency: python3-apt'
+  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
+  apt:
+    name: "{{ item }}"
+    state: present
+    force_apt_get: true
+    update_cache: true
+  loop:
+    - aptitude
+    - python3-docker
+    - python3-pymysql
+    - python3-psycopg2
+
 - name: Create Ansible's temporary remote directory
-  ansible.builtin.file:
+  file:
     path: "~/.ansible/tmp"
     state: directory
-    mode: "700"
+    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: "600"
   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: "640"
   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: "640"
   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: "600"
+    mode: 0700
 
 - name: Install /etc/aliases
-  ansible.builtin.copy:
+  copy:
     dest: /etc/aliases
     content: "root: {{ mail.rootalias }}"
-    mode: "644"

roles/base/tasks/main.yml

@@ -1,37 +1,24 @@
-- name: Import Ansible tasks
-  ansible.builtin.import_tasks: ansible.yml
+- import_tasks: ansible.yml
   tags: ansible
 
-- name: Import System tasks
-  ansible.builtin.import_tasks: system.yml
+- import_tasks: system.yml
   tags: system
 
-- name: Import Firewall tasks
-  ansible.builtin.import_tasks: firewall.yml
+- import_tasks: firewall.yml
   tags: firewall
-  when: manage_firewall
 
-- name: Import Network tasks
-  ansible.builtin.import_tasks: network.yml
+- import_tasks: network.yml
   tags: network
   when: manage_network
 
-- name: Import Mail tasks
-  ansible.builtin.import_tasks: mail.yml
+- import_tasks: mail.yml
   tags: mail
   when: mail is defined
 
-- name: Import ddclient tasks
-  ansible.builtin.import_tasks: ddclient.yml
+- import_tasks: ddclient.yml
   tags: ddclient
   when: ddclient is defined
 
-- name: Import WireGuard tasks
-  ansible.builtin.import_tasks: wireguard.yml
+- import_tasks: wireguard.yml
   tags: wireguard
   when: wireguard is defined
-
-- name: Import Samba tasks
-  ansible.builtin.import_tasks: samba.yml
-  tags: samba
-  when: samba 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: "400"
   loop: "{{ interfaces }}"
   notify: reboot_host

roles/base/tasks/samba.yml

@@ -1,46 +0,0 @@
-- name: Install Samba
-  ansible.builtin.apt:
-    name: samba
-    state: present
-
-- name: Create Samba users
-  ansible.builtin.command: "smbpasswd -a {{ item.name }}"
-  args:
-    stdin: "{{ item.password }}\n{{ item.password }}"
-  loop: "{{ samba.users }}"
-  loop_control:
-    label: "{{ item.name }}"
-  register: samba_users
-  changed_when: "'Added user' in samba_users.stdout"
-
-- name: Ensure share directories exist
-  ansible.builtin.file:
-    path: "{{ item.path }}"
-    owner: "{{ item.owner }}"
-    group: "{{ item.group }}"
-    state: directory
-    mode: "755"
-  loop: "{{ samba.shares }}"
-
-- name: Configure Samba shares
-  ansible.builtin.template:
-    src: smb.conf.j2
-    dest: /etc/samba/smb.conf
-    mode: "644"
-  notify: restart_samba
-
-- name: Start smbd and enable on boot
-  ansible.builtin.service:
-    name: smbd
-    state: started
-    enabled: true
-
-- name: Allow SMB connections
-  community.general.ufw:
-    rule: allow
-    port: 445
-    proto: tcp
-    from: "{{ item }}"
-    state: enabled
-  loop: "{{ samba.firewall }}"
-  when: manage_firewall

roles/base/tasks/system.yml

@@ -1,105 +1,17 @@
 - name: Install useful software
-  ansible.builtin.apt:
+  apt:
     name: "{{ packages }}"
     state: present
     update_cache: true
 
-- name: Install GPG
-  ansible.builtin.apt:
-    name: gpg
-    state: present
-
-- name: Check for existing GPG keys
-  ansible.builtin.command: "gpg --list-keys {{ item.id }} 2>/dev/null"
-  register: gpg_check
-  loop: "{{ root_gpgkeys }}"
-  failed_when: false
-  changed_when: false
-  when: root_gpgkeys is defined
-
-- name: Import GPG keys
-  ansible.builtin.command:
-    "gpg --keyserver {{ item.item.server | default('keys.openpgp.org') }} --recv-key {{ item.item.id }}"
-  register: gpg_check_import
-  loop: "{{ gpg_check.results }}"
-  loop_control:
-    label: "{{ item.item }}"
-  changed_when: false
-  when: root_gpgkeys is defined and item.rc != 0
-
-- name: Check GPG key imports
-  ansible.builtin.fail:
-    msg: "{{ item.stderr }}"
-  loop: "{{ gpg_check_import.results }}"
-  loop_control:
-    label: "{{ item.item.item }}"
-  when: root_gpgkeys is defined and (not item.skipped | default(false)) and ('imported' not in item.stderr)
-
-- name: Install NTPsec
-  ansible.builtin.apt:
-    name: ntpsec
-    state: present
-
-- name: Install locales
-  ansible.builtin.apt:
-    name: locales
-    state: present
-
-- name: Generate locale
-  community.general.locale_gen:
-    name: "{{ locale_default }}"
-    state: present
-  notify: reconfigure_locales
-
-- name: Set the default locale
-  ansible.builtin.lineinfile:
-    path: /etc/default/locale
-    regexp: "^LANG="
-    line: "LANG={{ locale_default }}"
-
 - name: Manage root authorized_keys
-  ansible.builtin.template:
+  template:
     src: authorized_keys.j2
     dest: /root/.ssh/authorized_keys
-    mode: "400"
   when: authorized_keys is defined
 
-- name: Create system user groups
-  ansible.builtin.group:
-    name: "{{ item.key }}"
-    gid: "{{ item.value.gid }}"
-    state: present
-  loop: "{{ users | dict2items }}"
-  loop_control:
-    label: "{{ item.key }}"
-  when: users is defined
-
-- name: Create system users
-  ansible.builtin.user:
-    name: "{{ item.key }}"
-    state: present
-    uid: "{{ item.value.uid }}"
-    group: "{{ item.value.gid }}"
-    shell: "{{ item.value.shell | default('/bin/bash') }}"
-    create_home: "{{ item.value.home | default(false) }}"
-    system: "{{ item.value.system | default(false) }}"
-  loop: "{{ users | dict2items }}"
-  loop_control:
-    label: "{{ item.key }}"
-  when: users is defined
-
-- name: Set authorized_keys for system users
-  ansible.posix.authorized_key:
-    user: "{{ item.key }}"
-    key: "{{ item.value.key }}"
-    state: present
-  loop: "{{ users | dict2items }}"
-  loop_control:
-    label: "{{ item.key }}"
-  when: users is defined and item.value.key 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,61 +1,36 @@
 - name: Install WireGuard
-  ansible.builtin.apt:
+  apt:
     name: wireguard
     state: present
     update_cache: true
 
 - name: Generate WireGuard keys
-  ansible.builtin.shell: |
-    set -o pipefail
-    wg genkey | tee privatekey | wg pubkey > publickey
+  shell: wg genkey | tee privatekey | wg pubkey > publickey
   args:
     chdir: /etc/wireguard/
     creates: /etc/wireguard/privatekey
-    executable: /usr/bin/bash
 
 - name: Grab WireGuard private key for configuration
-  ansible.builtin.slurp:
-    src: /etc/wireguard/privatekey
-  register: wgkey
-
-- name: Check if WireGuard preshared key file exists
-  ansible.builtin.stat:
-    path: /etc/wireguard/presharedkey-{{ item.name }}
-  loop: "{{ wireguard.peers }}"
-  loop_control:
-    label: "{{ item.name }}"
-  register: presharedkey_files
-
-- name: Grab WireGuard preshared key for configuration
-  ansible.builtin.slurp:
-    src: /etc/wireguard/presharedkey-{{ item.item.name }}
-  register: wgshared
-  loop: "{{ presharedkey_files.results }}"
-  loop_control:
-    label: "{{ item.item.name }}"
-  when: item.stat.exists
-
-- 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: "400"
-  notify: restart_wireguard
+  notify:
+    - 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: udp
+    proto: tcp
   when: wireguard.listenport is defined

roles/base/templates/smb.conf.j2

@@ -1,28 +0,0 @@
-[global]
-   workgroup = WORKGROUP
-   server string = Samba Server %v
-   netbios name = {{ ansible_hostname }}
-   security = user
-   map to guest = bad user
-   dns proxy = no
-{% for user in samba.users %}
-   smb encrypt = {{ 'mandatory' if user.encrypt | default(false) else 'disabled' }}
-{% endfor %}
-
-{% for share in samba.shares %}
-[{{ share.name }}]
-   path = {{ share.path }}
-   browsable = yes
-{% if share.guest_allow is defined and share.guest_allow %}
-   guest ok = yes
-{% else %}
-   guest ok = no
-{% endif %}
-   read only = {{ 'yes' if share.read_only | default(false) else 'no' }}
-{% if share.valid_users is defined %}
-   valid users = {{ share.valid_users }}
-{% endif %}
-{% if share.force_user is defined %}
-   force user = {{ share.force_user }}
-{% endif %}
-{% endfor %}

roles/base/templates/wireguard.j2

@@ -1,6 +1,4 @@
-# {{ ansible_managed }}
-
-[Interface] # {{ ansible_hostname }}
+[Interface]
 PrivateKey = {{ wgkey['content'] | b64decode | trim }}
 Address = {{ wireguard.address }}
 {% if wireguard.listenport is defined %}
@@ -8,26 +6,8 @@ ListenPort = {{ wireguard.listenport }}
 {% endif %}
 
 {% for peer in wireguard.peers %}
-{% if peer.name is defined %}
-[Peer] # {{ peer.name }}
-{% else %}
 [Peer]
-{% endif %}
 PublicKey = {{ peer.publickey }}
-{% if peer.presharedkey is defined %}
-PresharedKey = {{ peer.presharedkey }}
-{% else %}
-{% set preshared_key = (
-    wgshared.results
-    | selectattr('item.item.name', 'equalto', peer.name)
-    | first
-  ).content
-  | default(none)
-%}
-{% if preshared_key is not none %}
-PresharedKey = {{ preshared_key | b64decode | trim }}
-{% endif %}
-{% endif %}
 {% if peer.endpoint is defined %}
 Endpoint = {{ peer.endpoint }}
 {% endif %}

roles/bitwarden/handlers/main.yml

@@ -1,28 +1,16 @@
 - name: Stop Bitwarden for rebuild
-  ansible.builtin.service:
+  service:
     name: "{{ bitwarden_name }}"
     state: stopped
   listen: rebuild_bitwarden
 
 - name: Rebuild Bitwarden
-  ansible.builtin.command: "{{ bitwarden_root }}/bitwarden.sh rebuild"
-  listen: rebuild_bitwarden
-
-- name: Reload systemd manager configuration
-  ansible.builtin.systemd:
-    daemon_reload: true
+  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
   listen: rebuild_bitwarden
-
-- name: Create Bitwarden's initial log file
-  ansible.builtin.file:
-    path: "{{ bitwarden_logs_identity }}/{{ bitwarden_logs_identity_date }}.txt"
-    state: touch
-    mode: "644"
-  listen: touch_bitwarden

roles/bitwarden/tasks/main.yml

@@ -1,58 +1,56 @@
 - name: Install expect
-  ansible.builtin.apt:
+  apt:
     name: expect
     state: present
 
 - name: Create Bitwarden directory
-  ansible.builtin.file:
+  file:
     path: "{{ bitwarden_root }}"
     state: directory
-    mode: "755"
 
 - 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.command: "{{ bitwarden_root }}/bw_wrapper"
+  shell: "{{ bitwarden_root }}/bw_wrapper"
   args:
     creates: "{{ bitwarden_root }}/bwdata/config.yml"
 
-- name: Install compose override
-  ansible.builtin.template:
+- name: Install docker-compose override
+  template:
     src: compose.override.yml.j2
     dest: "{{ bitwarden_root }}/bwdata/docker/docker-compose.override.yml"
-    mode: "644"
-  when: bitwarden_override | default(true)
+  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: {{ bitwarden_http_port | default('127.0.0.1:9080') }}"
+    replace: "http_port: 127.0.0.1:8080"
   when: not bitwarden_standalone
   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: {{ bitwarden_https_port | default('127.0.0.1:9443') }}"
+    replace: "https_port: 127.0.0.1:8443"
   when: not bitwarden_standalone
   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"
@@ -60,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"
@@ -68,30 +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"
-    mode: "644"
   register: bitwarden_systemd
   notify: rebuild_bitwarden
 
 - name: Create Bitwarden's initial logging directory
-  ansible.builtin.file:
+  file:
     path: "{{ bitwarden_logs_identity }}"
     state: directory
-    mode: "755"
-  notify: touch_bitwarden
+  register: bitwarden_logs
+
+- name: Create Bitwarden's initial log 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
-    mode: "640"
   notify: restart_fail2ban
+
+- name: Reload systemd manager configuration
+  systemd:
+    daemon_reload: true
+  when: bitwarden_systemd.changed
+  notify: rebuild_bitwarden

roles/bitwarden/templates/bw_wrapper.j2

@@ -23,13 +23,10 @@ send "{{ bitwarden_install_id }}\r"
 expect "Enter your installation key:"
 send "{{ bitwarden_install_key }}\r"
 
-expect "Enter your region (US/EU) \\\[US\\\]:"
-send "US\r"
-
-expect "Do you have a SSL certificate to use? (y/N):"
+expect "Do you have a SSL certificate to use? (y/n):"
 send "n\r"
 
-expect "Do you want to generate a self-signed SSL certificate? (y/N):"
+expect "Do you want to generate a self-signed SSL certificate? (y/n):"
 {% if bitwarden_standalone and not bitwarden_production %}
 send "y\r"
 {% else %}

roles/bitwarden/templates/compose.override.yml.j2

@@ -6,11 +6,13 @@ services:
       - traefik
     labels:
       traefik.http.routers.bitwarden.rule: "Host(`{{ bitwarden_domain }}`)"
-      traefik.http.routers.bitwarden.entrypoints: {{ bitwarden_entrypoint | default('web') }}
-      traefik.http.routers.bitwarden.tls: {{ bitwarden_traefik_tls | default('false') }}
+      traefik.http.routers.bitwarden.entrypoints: websecure
+      traefik.http.routers.bitwarden.tls.certresolver: letsencrypt
+      traefik.http.routers.bitwarden.middlewares: "securehttps@file"
       traefik.http.services.bitwarden.loadbalancer.server.port: 8080
       traefik.docker.network: traefik
       traefik.enable: "true"
+
 networks:
   traefik:
     external: true

roles/docker/defaults/main.yml

@@ -1,11 +1,3 @@
-docker_apt_keyring: /etc/apt/keyrings/docker.asc
-docker_apt_keyring_hash: 1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570
-docker_apt_keyring_url: https://download.docker.com/linux/debian/gpg
-docker_apt_repo: https://download.docker.com/linux/debian
 docker_compose_root: /var/lib/compose
+docker_compose: /usr/bin/docker-compose
 docker_compose_service: compose
-docker_compose: "{{ (docker_official | bool) | ternary('/usr/bin/docker compose', '/usr/bin/docker-compose') }}"
-docker_official: false
-docker_repos_keys: "{{ docker_repos_path }}/.keys"
-docker_repos_keytype: rsa
-docker_repos_path: /srv/.compose_repos

roles/docker/handlers/main.yml

@@ -1,54 +0,0 @@
-- name: Reload systemd manager configuration
-  ansible.builtin.systemd:
-    daemon_reload: true
-  listen: compose_systemd
-
-- name: Find which services had a docker-compose.yml updated
-  ansible.builtin.set_fact:
-    compose_restart_list: "{{ (compose_restart_list | default([])) + [item.item.name] }}"
-  loop: "{{ compose_update.results }}"
-  loop_control:
-    label: "{{ item.item.name }}"
-  when: item.changed
-  listen: compose_restart
-
-- name: Find which services had their .env updated
-  ansible.builtin.set_fact:
-    compose_restart_list: "{{ (compose_restart_list | default([])) + [item.item.name] }}"
-  loop: "{{ compose_env_update.results }}"
-  loop_control:
-    label: "{{ item.item.name }}"
-  when: item.changed
-  listen: compose_restart
-
-- name: Restart MariaDB
-  ansible.builtin.service:
-    name: mariadb
-    state: restarted
-  when: not mariadb_restarted
-  listen: restart_mariadb # hijack handler for early restart
-
-- name: Set MariaDB as restarted
-  ansible.builtin.set_fact:
-    mariadb_restarted: true
-  when: not mariadb_restarted
-  listen: restart_mariadb
-
-- name: Restart compose services
-  ansible.builtin.systemd:
-    state: restarted
-    name: "{{ docker_compose_service }}@{{ item }}"
-  loop: "{{ compose_restart_list | default([]) | unique }}"
-  when: compose_restart_list is defined
-  listen: compose_restart
-
-- name: Start compose services and enable on boot
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ item.name }}"
-    state: started
-    enabled: true
-  loop: "{{ docker_compose_deploy }}"
-  loop_control:
-    label: "{{ docker_compose_service }}@{{ item.name }}"
-  when: item.enabled is defined and item.enabled is true
-  listen: compose_enable

roles/docker/tasks/main.yml

@@ -1,142 +1,27 @@
-- name: Add official Docker APT key
-  ansible.builtin.get_url:
-    url: "{{ docker_apt_keyring_url }}"
-    dest: "{{ docker_apt_keyring }}"
-    checksum: "sha256:{{ docker_apt_keyring_hash }}"
-    mode: "644"
-    owner: root
-    group: root
-  when: docker_official
-
-- name: Remove official Docker APT key
-  ansible.builtin.file:
-    path: "{{ docker_apt_keyring }}"
-    state: absent
-  when: not docker_official
-
-- name: Add/remove official Docker APT repository
-  ansible.builtin.apt_repository:
-    repo: >
-      deb [arch=amd64 signed-by={{ docker_apt_keyring }}]
-      {{ docker_apt_repo }} {{ ansible_distribution_release }} stable
-    state: "{{ 'present' if docker_official else 'absent' }}"
-    filename: "{{ docker_apt_keyring | regex_replace('^.*/', '') }}"
-
-- name: Install/uninstall Docker from Debian repositories
-  ansible.builtin.apt:
-    name: ['docker.io', 'docker-compose', 'containerd', 'runc']
-    state: "{{ 'absent' if docker_official else 'present' }}"
-    autoremove: true
+- name: Install Docker
+  apt:
+    name: ['docker.io', 'docker-compose']
+    state: present
     update_cache: true
 
-- name: Install/uninstall Docker from Docker repositories
-  ansible.builtin.apt:
-    name: ['docker-ce', 'docker-ce-cli', 'containerd.io',
-           'docker-buildx-plugin', 'docker-compose-plugin']
-    state: "{{ 'present' if docker_official else 'absent' }}"
-    autoremove: true
-    update_cache: true
-
-- name: Login to private registry
-  community.docker.docker_login:
-    registry_url: "{{ docker_login_url | default('') }}"
-    username: "{{ docker_login_user }}"
-    password: "{{ docker_login_pass }}"
-  when: docker_login_user is defined and docker_login_pass is defined
-
 - name: Create docker-compose root
-  ansible.builtin.file:
+  file:
     path: "{{ docker_compose_root }}"
     state: directory
-    mode: "500"
 
 - name: Install docker-compose systemd service
-  ansible.builtin.template:
+  template:
     src: docker-compose.service.j2
     dest: "/etc/systemd/system/{{ docker_compose_service }}@.service"
-    mode: "400"
-  notify: compose_systemd
+  register: compose_systemd
 
-- name: Create directories to clone docker-compose repositories
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-    mode: "400"
-  loop:
-    - "{{ docker_repos_path }}"
-    - "{{ docker_repos_keys }}"
-  when: docker_compose_deploy is defined
-
-- name: Generate OpenSSH deploy keys for docker-compose clones
-  community.crypto.openssh_keypair:
-    path: "{{ docker_repos_keys }}/id_{{ docker_repos_keytype }}"
-    type: "{{ docker_repos_keytype }}"
-    comment: "{{ ansible_hostname }}-deploy-key"
-    mode: "400"
-    state: present
-  when: docker_compose_deploy is defined
-
-- name: Check for git installation
-  ansible.builtin.apt:
-    name: git
-    state: present
-  when: docker_compose_deploy is defined
-
-- name: Clone external docker-compose projects
-  ansible.builtin.git:
-    repo: "{{ item.url }}"
-    dest: "{{ docker_repos_path }}/{{ item.name }}"
-    version: "{{ item.version }}"
-    accept_newhostkey: "{{ item.accept_newhostkey | default(false) }}"
-    gpg_whitelist: "{{ item.trusted_keys | default([]) }}"
-    verify_commit: "{{ true if (item.trusted_keys is defined and item.trusted_keys) else false }}"
-    key_file: "{{ docker_repos_keys }}/id_{{ docker_repos_keytype }}"
-  loop: "{{ docker_compose_deploy }}"
-  loop_control:
-    label: "{{ item.url }}"
-  when: docker_compose_deploy is defined
-
-- name: Create directories for docker-compose projects using the systemd service
-  ansible.builtin.file:
-    path: "{{ docker_compose_root }}/{{ item.name }}"
-    state: directory
-    mode: "400"
-  loop: "{{ docker_compose_deploy }}"
-  loop_control:
-    label: "{{ item.name }}"
-  when: docker_compose_deploy is defined
-
-- name: Synchronize docker-compose.yml
-  ansible.posix.synchronize:
-    src: "{{ docker_repos_path }}/{{ item.name }}/{{ item.path | default('docker-compose.yml') }}"
-    dest: "{{ docker_compose_root }}/{{ item.name }}/docker-compose.yml"
-  delegate_to: "{{ inventory_hostname }}"
-  register: compose_update
-  notify:
-    - compose_restart
-    - compose_enable
-  loop: "{{ docker_compose_deploy | default([]) }}"
-  loop_control:
-    label: "{{ item.name }}"
-  when: docker_compose_deploy is defined and docker_compose_deploy | length > 0
-
-- name: Set environment variables for docker-compose projects
-  ansible.builtin.template:
-    src: docker-compose-env.j2
-    dest: "{{ docker_compose_root }}/{{ item.name }}/.env"
-    mode: "400"
-  register: compose_env_update
-  notify:
-    - compose_restart
-    - compose_enable
-  no_log: "{{ docker_compose_env_nolog | default(true) }}"
-  loop: "{{ docker_compose_deploy }}"
-  loop_control:
-    label: "{{ item.name }}"
-  when: docker_compose_deploy is defined and item.env is defined
+- 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
@@ -144,8 +29,7 @@
   when: docker_users is defined
 
 - name: Start Docker and enable on boot
-  ansible.builtin.service:
+  service:
     name: docker
     state: started
     enabled: true
-  when: docker_managed | default(true)

roles/docker/templates/docker-compose-env.j2

@@ -1,10 +0,0 @@
-# {{ ansible_managed }}
-{% if item.env is defined %}
-{% for key, value in item.env.items() %}
-{% if value is boolean %}
-{{ key }}={{ value | lower }}
-{% else %}
-{{ key }}={{ value }}
-{% endif %}
-{% endfor %}
-{% endif %}

roles/docker/templates/docker-compose.service.j2

@@ -1,5 +1,5 @@
 [Unit]
-Description=%i {{ docker_compose_service }} service
+Description=%i docker-compose service
 PartOf=docker.service
 After=docker.service
 

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,78 +1,111 @@
-- name: Install MySQL module for Ansible
-  ansible.builtin.apt:
-    name: python3-pymysql
-    state: present
+- name: Create Gitea directory
+  file:
+    path: "{{ gitea_root }}"
+    state: directory
 
 - name: Create Gitea database
-  community.mysql.mysql_db:
-    name: "{{ gitea.DB_NAME }}"
+  mysql_db:
+    name: "{{ gitea_dbname }}"
     state: present
     login_unix_socket: /var/run/mysqld/mysqld.sock
 
 - name: Create Gitea database user
-  community.mysql.mysql_user:
-    name: "{{ gitea.DB_USER }}"
-    password: "{{ gitea.DB_PASSWD }}"
+  mysql_user:
+    name: "{{ gitea_dbuser }}"
+    password: "{{ gitea_dbpass }}"
     host: '%'
     state: present
-    priv: "{{ gitea.DB_NAME }}.*:ALL"
+    priv: "{{ gitea_dbname }}.*:ALL"
     login_unix_socket: /var/run/mysqld/mysqld.sock
 
+- name: Create git user
+  user:
+    name: git
+    state: present
+
+- name: Git user uid
+  getent:
+    database: passwd
+    key: git
+
+- name: Git user gid
+  getent:
+    database: group
+    key: git
+
 - name: Create git's .ssh directory
-  ansible.builtin.file:
+  file:
     path: /home/git/.ssh
-    mode: "700"
     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
-    mode: "600"
     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: "755"
+    mode: 0755
+
+- name: Install Gitea's docker-compose file
+  template:
+    src: docker-compose.yml.j2
+    dest: "{{ gitea_root }}/docker-compose.yml"
+  notify: restart_gitea
+
+- name: Install Gitea's docker-compose variables
+  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
-    mode: "755"
+
+- name: Create Gitea's initial log 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
-    mode: "644"
   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
-    mode: "640"
   notify: restart_fail2ban
+
+- name: Start and enable Gitea service
+  service:
+    name: "{{ docker_compose_service }}@{{ gitea_name }}"
+    state: started
+    enabled: true

roles/jellyfin/defaults/main.yml

@@ -1,4 +0,0 @@
-jellyfin_name: jellyfin
-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,35 +0,0 @@
-- name: Create Jellyfin directory
-  ansible.builtin.file:
-    path: "{{ jellyfin_root }}"
-    state: directory
-    mode: 0500
-
-- 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,30 +0,0 @@
-version: '3.7'
-
-volumes:
-  config:
-  cache:
-
-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_media }}:/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/kutt/defaults/main.yml

@@ -0,0 +1,16 @@
+# container settings
+kutt_name: kutt
+kutt_default_domain: "{{ kutt_domain }}"
+kutt_webport: 3030
+kutt_web: "127.0.0.1:{{ kutt_webport }}"
+
+# database settings
+kutt_dbname: "{{ kutt_name }}"
+kutt_dbuser: "{{ kutt_name }}"
+kutt_postgres_volume: postgres_data
+
+# redis
+kutt_redis_volume: redis_data
+
+# host
+kutt_root: "{{ docker_compose_root }}/{{ kutt_name }}"

roles/kutt/handlers/main.yml

@@ -0,0 +1,5 @@
+- name: Restart Kutt
+  service:
+    name: "{{ docker_compose_service }}@{{ kutt_name }}"
+    state: restarted
+  listen: restart_kutt

roles/kutt/tasks/main.yml

@@ -0,0 +1,22 @@
+- name: Create Kutt directory
+  file:
+    path: "{{ kutt_root }}"
+    state: directory
+
+- name: Install Kutt's docker-compose file
+  template:
+    src: docker-compose.yml.j2
+    dest: "{{ kutt_root }}/docker-compose.yml"
+  notify: restart_kutt
+
+- name: Install Kutt's docker-compose variables
+  template:
+    src: compose-env.j2
+    dest: "{{ kutt_root }}/.env"
+  notify: restart_kutt
+
+- name: Start and enable Gitea service
+  service:
+    name: "{{ docker_compose_service }}@{{ kutt_name }}"
+    state: started
+    enabled: true

roles/kutt/templates/compose-env.j2

@@ -0,0 +1,17 @@
+# {{ ansible_managed }}
+kutt_version={{ kutt_version }}
+kutt_web={{ kutt_web }}
+kutt_domain={{ kutt_domain }}
+kutt_default_domain={{ kutt_default_domain }}
+kutt_jwt_secret={{ kutt_jwt_secret }}
+kutt_dbname={{ kutt_dbname }}
+kutt_dbuser={{ kutt_dbuser }}
+kutt_dbpass={{ kutt_dbpass }}
+kutt_mail_user={{ kutt_mail_user }}
+kutt_mail_host={{ kutt_mail_host }}
+kutt_mail_password={{ kutt_mail_password }}
+kutt_report_email={{ kutt_report_email }}
+kutt_admin_emails={{ kutt_admin_emails }}
+kutt_redis_version={{ kutt_redis_version }}
+kutt_postgres_version={{ kutt_postgres_version }}
+kutt_postgres_volume={{ kutt_postgres_volume }}

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

@@ -0,0 +1,46 @@
+version: "3.7"
+
+services:
+  kutt:
+    image: kutt/kutt:${kutt_version}
+    depends_on:
+      - postgres
+      - redis
+    command: ["./wait-for-it.sh", "postgres:5432", "--", "npm", "start"]
+    ports:
+      - ${kutt_web}:3000
+    environment:
+      SITE_NAME: ${kutt_domain}
+      DEFAULT_DOMAIN: ${kutt_default_domain}
+      JWT_SECRET: ${kutt_jwt_secret}
+
+      DB_HOST: postgres
+      DB_NAME: ${kutt_dbname}
+      DB_USER: ${kutt_dbuser}
+      DB_PASSWORD: ${kutt_dbpass}
+      REDIS_HOST: redis
+
+      MAIL_USER: ${kutt_mail_user}
+      MAIL_HOST: ${kutt_mail_host}
+      MAIL_PORT: ${kutt_mail_port}
+      MAIL_PASSWORD: ${kutt_mail_password}
+      REPORT_EMAIL: ${kutt_report_email}
+      ADMIN_EMAILS: ${kutt_admin_emails}
+
+  redis:
+    image: redis:${kutt_redis_version}
+    volumes:
+      - {{ kutt_redis_volume }}:/data
+
+  postgres:
+    image: postgres:${kutt_postgres_version}
+    environment:
+      POSTGRES_USER: ${kutt_dbuser}
+      POSTGRES_PASSWORD: ${kutt_dbpass}
+      POSTGRES_DB: ${kutt_dbname}
+    volumes:
+      - {{ kutt_postgres_volume }}:/var/lib/postgresql/data
+
+volumes:
+  {{ kutt_redis_volume }}:
+  {{ kutt_postgres_volume }}:

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/defaults/main.yml

@@ -0,0 +1,3 @@
+mariadb_trust:
+  - "172.16.0.0/12"
+  - "192.168.0.0/16"

roles/mariadb/handlers/main.yml

@@ -1,12 +0,0 @@
-- name: Restart MariaDB
-  ansible.builtin.service:
-    name: mariadb
-    state: restarted
-  when: not mariadb_restarted
-  listen: restart_mariadb
-
-- name: Set MariaDB as restarted
-  ansible.builtin.set_fact:
-    mariadb_restarted: true
-  when: not mariadb_restarted
-  listen: restart_mariadb

roles/mariadb/tasks/main.yml

@@ -1,30 +1,25 @@
 - name: Install MariaDB
-  ansible.builtin.apt:
+  apt:
     name: mariadb-server
     state: present
 
-- name: Set MariaDB restarted fact
-  ansible.builtin.set_fact:
-    mariadb_restarted: false
-
-- name: Regather facts for the potentially new docker0 interface
-  ansible.builtin.setup:
-
-- name: Change the bind-address to allow from docker0
-  ansible.builtin.lineinfile:
+- name: Change the bind-address to allow Docker
+  lineinfile:
     path: /etc/mysql/mariadb.conf.d/50-server.cnf
     regex: "^bind-address"
-    line: "bind-address            = {{ ansible_facts.docker0.ipv4.address }}"
-  notify: restart_mariadb
+    line: "bind-address            = 0.0.0.0"
+  register: mariadb_conf
 
-- name: Flush handlers to ensure MariaDB restarts immediately
-  ansible.builtin.meta: flush_handlers
-  tags: restart_mariadb
+- name: Restart MariaDB
+  service:
+    name: mariadb
+    state: restarted
+  when: mariadb_conf.changed
 
-- name: Allow database connections from Docker
-  community.general.ufw:
+- name: Allow database connections
+  ufw:
     rule: allow
     port: "3306"
     proto: tcp
     src: "{{ item }}"
-  loop: "{{ mariadb_trust | default(['172.16.0.0/12']) }}"
+  loop: "{{ mariadb_trust }}"

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/defaults/main.yml

@@ -1 +1,11 @@
-nextcloud_name: nextcloud
+# container names
+nextcloud_container: nextcloud
+nextcloud_dbcontainer: "{{ nextcloud_container }}-db"
+
+# database settings
+nextcloud_dbname: "{{ nextcloud_container }}"
+nextcloud_dbuser: "{{ nextcloud_dbname }}"
+
+# host mounts
+nextcloud_root: "/opt/{{ nextcloud_container }}/public_html"
+nextcloud_dbroot: "/opt/{{ nextcloud_container }}/database"

roles/nextcloud/handlers/main.yml

@@ -1,25 +0,0 @@
-- name: Set Nextcloud's Trusted Proxy
-  ansible.builtin.command: >
-    docker exec --user www-data "{{ nextcloud_name }}"
-      php occ config:system:set trusted_proxies 0 --value="{{ traefik_name }}"
-  register: nextcloud_trusted_proxy
-  changed_when: "nextcloud_trusted_proxy.stdout == 'System config value trusted_proxies => 0 set to string ' ~ traefik_name"
-  listen: install_nextcloud
-
-- name: Set Nextcloud's Trusted Domain
-  ansible.builtin.command: >
-    docker exec --user www-data "{{ nextcloud_name }}"
-      php occ config:system:set trusted_domains 0 --value="{{ nextcloud.DOMAIN }}"
-  register: nextcloud_trusted_domains
-  changed_when: "nextcloud_trusted_domains.stdout == 'System config value trusted_domains => 0 set to string ' ~ nextcloud.DOMAIN"
-  listen: install_nextcloud
-
-- name: Preform Nextcloud database maintenance
-  ansible.builtin.command: >
-    docker exec --user www-data "{{ nextcloud_name }}" {{ item }}
-  loop:
-    - "php occ maintenance:mode --on"
-    - "php occ db:add-missing-indices"
-    - "php occ db:convert-filecache-bigint"
-    - "php occ maintenance:mode --off"
-  listen: install_nextcloud

roles/nextcloud/tasks/main.yml

@@ -1,66 +1,109 @@
-- name: Install MySQL module for Ansible
-  ansible.builtin.apt:
-    name: python3-pymysql
-    state: present
+- name: Create Nextcloud network
+  docker_network:
+    name: "{{ nextcloud_container }}"
 
-- name: Create Nextcloud database
-  community.mysql.mysql_db:
-    name: "{{ nextcloud.DB_NAME | default('nextcloud') }}"
-    state: present
-    login_unix_socket: /var/run/mysqld/mysqld.sock
-
-- name: Create Nextcloud database user
-  community.mysql.mysql_user:
-    name: "{{ nextcloud.DB_USER | default('nextcloud') }}"
-    password: "{{ nextcloud.DB_PASSWD }}"
-    host: '%'
-    state: present
-    priv: "{{ nextcloud.DB_NAME | default('nextcloud') }}.*:ALL"
-    login_unix_socket: /var/run/mysqld/mysqld.sock
-
-- name: Start Nextcloud service and enable on boot
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ nextcloud_name }}"
+- name: Start Nextcloud's database container
+  docker_container:
+    name: "{{ nextcloud_dbcontainer }}"
+    image: mariadb:{{ nextcloud_dbversion }}
     state: started
-    enabled: true
-  when: nextcloud.ENABLE | default('false')
+    restart_policy: always
+    volumes: "{{ nextcloud_dbroot }}:/var/lib/mysql"
+    networks_cli_compatible: true
+    networks:
+      - name: "{{ nextcloud_container }}"
+    env:
+      MYSQL_RANDOM_ROOT_PASSWORD: "true"
+      MYSQL_DATABASE: "{{ nextcloud_dbname }}"
+      MYSQL_USER: "{{ nextcloud_dbuser }}"
+      MYSQL_PASSWORD: "{{ nextcloud_dbpass }}"
+
+- name: Start Nextcloud container
+  docker_container:
+    name: "{{ nextcloud_container }}"
+    image: nextcloud:{{ nextcloud_version }}
+    state: started
+    restart_policy: always
+    volumes: "{{ nextcloud_root }}:/var/www/html"
+    networks_cli_compatible: true
+    networks:
+      - name: "{{ nextcloud_container }}"
+      - name: traefik
+    labels:
+      traefik.http.routers.nextcloud.rule: "Host(`{{ nextcloud_domain }}`)"
+      traefik.http.routers.nextcloud.entrypoints: websecure
+      traefik.http.routers.nextcloud.tls.certresolver: letsencrypt
+      traefik.http.routers.nextcloud.middlewares: "securehttps@file,nextcloud-webdav"
+      traefik.http.middlewares.nextcloud-webdav.redirectregex.regex: "https://(.*)/.well-known/(card|cal)dav"
+      traefik.http.middlewares.nextcloud-webdav.redirectregex.replacement: "https://${1}/remote.php/dav/"
+      traefik.http.middlewares.nextcloud-webdav.redirectregex.permanent: "true"
+      traefik.docker.network: traefik
+      traefik.enable: "true"
+
+- name: Grab Nextcloud database container information
+  docker_container_info:
+    name: "{{ nextcloud_dbcontainer }}"
+  register: nextcloud_dbinfo
 
 - name: Grab Nextcloud container information
-  community.general.docker_container_info:
-    name: "{{ nextcloud_name }}"
+  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 }}"
-    delay: 10
     port: 80
 
 - name: Check Nextcloud status
-  ansible.builtin.command: >
-    docker exec --user www-data "{{ nextcloud_name }}" php occ status
+  command: "docker exec --user www-data {{ nextcloud_container }}
+            php occ status"
   register: nextcloud_status
-  changed_when: false
+  args:
+    removes: "{{ nextcloud_root }}/config/CAN_INSTALL"
+
+- name: Wait for Nextcloud database to become available
+  wait_for:
+    host: "{{ nextcloud_dbinfo.container.NetworkSettings.Networks.nextcloud.IPAddress }}"
+    port: 3306
 
 - name: Install Nextcloud
-  ansible.builtin.command: >
-    docker exec --user www-data {{ nextcloud_name }}
-      php occ maintenance:install
-        --database "mysql"
-        --database-host "{{ nextcloud.DB_HOST | default('host.docker.internal') }}"
-        --database-name "{{ nextcloud.DB_NAME | default('nextcloud') }}"
-        --database-user "{{ nextcloud.DB_USER | default('nextcloud') }}"
-        --database-pass "{{ nextcloud.DB_PASSWD }}"
-        --admin-user "{{ nextcloud.ADMIN_USER | default('admin') }}"
-        --admin-pass "{{ nextcloud.ADMIN_PASSWD }}"
+  command: 'docker exec --user www-data {{ nextcloud_container }}
+            php occ maintenance:install
+              --database "mysql"
+              --database-host "{{ nextcloud_dbcontainer }}"
+              --database-name "{{ nextcloud_dbname }}"
+              --database-user "{{ nextcloud_dbuser }}"
+              --database-pass "{{ nextcloud_dbpass }}"
+              --admin-user "{{ nextcloud_admin }}"
+              --admin-pass "{{ nextcloud_pass }}"'
   register: nextcloud_install
-  when: nextcloud_status.stderr[:26] == "Nextcloud is not installed"
-  changed_when: nextcloud_install.stdout == "Nextcloud was successfully installed"
-  notify: install_nextcloud
+  when:
+    - nextcloud_status.stdout[:26] == "Nextcloud is not installed"
+    - nextcloud_domain is defined
 
-- name: Install Nextcloud background jobs cron
-  ansible.builtin.cron:
-    name: Nextcloud background job
-    minute: "*/5"
-    job: "/usr/bin/docker exec -u www-data nextcloud /usr/local/bin/php -f /var/www/html/cron.php"
-    user: root
+- name: Set Nextcloud's Trusted Proxy
+  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
+  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
+  command: "docker exec --user www-data {{ nextcloud_container }} {{ item }}"
+  loop:
+    - "php occ maintenance:mode --on"
+    - "php occ db:add-missing-indices"
+    - "php occ db:convert-filecache-bigint"
+    - "php occ maintenance:mode --off"
+  when: nextcloud_install.changed
+
+- name: Remove Nextcloud's CAN_INSTALL 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/defaults/main.yml

@@ -1 +0,0 @@
-cached_dhparams_pem: /vagrant/scratch/dhparams.pem

roles/proxy/handlers/main.yml

@@ -1,15 +1,5 @@
-- name: Enable nginx sites configuration
-  ansible.builtin.file:
-    src: "/etc/nginx/sites-available/{{ item.item.domain }}.conf"
-    dest: "/etc/nginx/sites-enabled/{{ item.item.domain }}.conf"
-    state: link
-    mode: "400"
-  loop: "{{ nginx_sites.results }}"
-  when: item.changed
-  listen: reload_nginx
-
 - name: Reload nginx
-  ansible.builtin.service:
+  service:
     name: nginx
     state: reloaded
   listen: reload_nginx

roles/proxy/tasks/main.yml

@@ -1,51 +1,47 @@
 - 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: Check for cached dhparams.pem file
-  ansible.builtin.stat:
-    path: "{{ cached_dhparams_pem }}"
-  register: dhparams_file
-
-- name: Copy cached dhparams.pem to /etc/ssl/
-  ansible.builtin.copy:
-    src: "{{ cached_dhparams_pem }}"
-    dest: /etc/ssl/dhparams.pem
-    mode: "600"
-    remote_src: true
-  when: dhparams_file.stat.exists
-
 - 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: "644"
+    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: "400"
+    mode: '0644'
   loop: "{{ proxy.servers }}"
   notify: reload_nginx
   register: nginx_sites
 
+- name: Enable nginx sites configuration
+  file:
+    src: "/etc/nginx/sites-available/{{ item.item.domain }}.conf"
+    dest: "/etc/nginx/sites-enabled/{{ item.item.domain }}.conf"
+    state: link
+  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'
@@ -55,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: "400"
+    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: "500"
   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 }}" \
@@ -98,7 +93,7 @@
   notify: reload_nginx
 
 - name: Add HTTP and HTTPS firewall rule
-  community.general.ufw:
+  ufw:
     rule: allow
     port: "{{ item }}"
     proto: tcp

roles/proxy/templates/server-nginx.conf.j2

@@ -35,13 +35,7 @@ server {
   client_max_body_size {{ item.client_max_body_size }};
 {% endif %}
   location / {
-{% if item.allowedips is defined %}
-{% for ip in item.allowedips %}
-    allow {{ ip }};
-{% endfor %}
-    deny all;
-{% endif %}
-{% if item.restrict is defined and item.restrict %}
+{% if item.restrict is defined and item.restrict  %}
     auth_basic "{{ item.restrict_name | default('Restricted Access') }}";
     auth_basic_user_file {{ item.restrict_file | default('/etc/nginx/.htpasswd') }};
     proxy_set_header Authorization "";
@@ -52,12 +46,6 @@ server {
     proxy_pass {{ item.proxy_pass }};
 {% if item.proxy_ssl_verify is defined and item.proxy_ssl_verify is false %}
     proxy_ssl_verify off;
-{% endif %}
-{% if item.websockets is defined and item.websockets %}
-    proxy_http_version 1.1;
-    proxy_set_header Connection $http_connection;
-    proxy_set_header Origin http://$host;
-    proxy_set_header Upgrade $http_upgrade;
 {% endif %}
   }
 }

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_http_only: false
-traefik_debug: false
-traefik_web_entry: "127.0.0.1:8000"
-traefik_websecure_entry: "127.0.0.1:8443"
+traefik_dashboard: false
+traefik_root: "/opt/{{ traefik_name }}"
 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
-
-# Host settings
-traefik_root: "{{ docker_compose_root }}/{{ traefik_name }}"
+traefik_http_redirect: false
+traefik_ports:
+  - "80:80"
+  - "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
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
-    state: restarted
+- name: Restart Traefik container
+  docker_container:
+    name: "{{ traefik_name }}"
+    image: traefik:{{ traefik_version }}
+    state: started
+    container_default_behavior: "no_defaults"
+    restart: yes
   listen: restart_traefik

roles/traefik/tasks/main.yml

@@ -1,36 +1,56 @@
-- name: Create Traefik directories
-  ansible.builtin.file:
+- name: Create Traefik configuration directories
+  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 static Traefik configuration
-  ansible.builtin.template:
-    src: traefik.yml.j2
-    dest: "{{ traefik_root }}/config/traefik.yml"
-    mode: 0400
-  notify: restart_traefik
+- name: Create Traefik network
+  docker_network:
+    name: traefik
 
-- name: Start Traefik service and enable on boot
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
+- name: Start Traefik container
+  docker_container:
+    name: "{{ traefik_name }}"
+    image: traefik:{{ traefik_version }}
     state: started
-    enabled: true
-  when: traefik.ENABLED | default('false')
+    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