testing

- Default docker_compose_deploy to empty list if undefined
- Add conditional check to avoid looping through an empty list

.github/workflows/vagrant.yml

@@ -0,0 +1,39 @@
+name: homelab-ci
+
+on:
+  push:
+    branches:
+      - 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,3 +1,4 @@
-.vagrant
 .playbook
+.vagrant*
+.vscode
 /environments/

Makefile

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

Vagrantfile

@@ -1,43 +1,41 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-SSH_FORWARD=ENV["SSH_FORWARD"]
+require 'yaml'
-if !(SSH_FORWARD == "true")
+settings_path = '.vagrant.yml'
-  SSH_FORWARD = false
+settings = {}
+
+if File.exist?(settings_path)
+  settings = YAML.load_file(settings_path)
 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
-  if File.exist?('.playbook')
-    PLAYBOOK = IO.read('.playbook').split("\n")[0]
-  end
-
 if !PLAYBOOK || PLAYBOOK.empty?
-    PLAYBOOK = "\nERROR: Set env PLAYBOOK"
+  # PLAYBOOK setting in .vagrant.yml (priority #2)
-  end
+  PLAYBOOK = settings['PLAYBOOK'] || 'default'
-else
-  File.write(".playbook", PLAYBOOK)
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/bullseye64"
+  config.vm.box = VAGRANT_BOX
   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
 
-  # Machine Name
+  # Libvrit provider
-  config.vm.define :moxie do |moxie| #
-  end
-
   config.vm.provider :libvirt do |libvirt|
-    libvirt.cpus = 2
+    libvirt.cpus   = VAGRANT_CPUS
-    libvirt.memory = 4096
+    libvirt.memory = VAGRANT_MEM
-    libvirt.default_prefix = ""
   end
 
-  config.vm.provider "virtualbox" do |vbox|
+  # Virtualbox provider
-    vbox.memory = 4096
+  config.vm.provider :virtualbox do |vbox|
+    vbox.cpus   = VAGRANT_CPUS
+    vbox.memory = VAGRANT_MEM
   end
 
   # Provision with Ansible
@@ -45,6 +43,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,6 +1,7 @@
 [defaults]
 inventory = ./environments/development
 interpreter_python = /usr/bin/python3
+roles_path = ./roles
 
 [connection]
 pipelining = true

dev/default.yml

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

dev/docker.yml

@@ -0,0 +1,8 @@
+- 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 Docker Box Server
+- name: Install Dockerbox Server
   hosts: all
   become: true
   vars_files:

dev/gitea.yml

@@ -0,0 +1,10 @@
+- 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.vm.krislamo.org
+traefik_domain: traefik.local.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.vm.krislamo.org
+bitwarden_domain: vault.local.krislamo.org
 bitwarden_dbpass: password
 bitwarden_install_id: 4ea840a3-532e-4cb6-a472-abd900728b23
 bitwarden_install_key: 1yB3Z2gRI0KnnH90C6p

dev/host_vars/docker.yml

@@ -0,0 +1,48 @@
+# 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

@@ -9,40 +9,36 @@ docker_users:
 # traefik
 traefik_version: latest
 traefik_dashboard: true
-traefik_domain: traefik.vm.krislamo.org
+traefik_domain: traefik.local.krislamo.org
 traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
+traefik_web_entry: 0.0.0.0:80
+traefik_websecure_entry: 0.0.0.0:443
 #traefik_acme_email: realemail@example.com # Let's Encrypt settings
 #traefik_production: true
-traefik_http_only: true # if behind reverse-proxy
+#traefik_http_only: true # if behind reverse-proxy
 
 # nextcloud
 nextcloud_version: stable
 nextcloud_admin: admin
 nextcloud_pass: password
-nextcloud_domain: cloud.vm.krislamo.org
+nextcloud_domain: cloud.local.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
+jenkins_domain: jenkins.local.krislamo.org
 
 # prometheus (includes grafana)
 prom_version: latest
-prom_domain: prom.vm.krislamo.org
+prom_domain: prom.local.krislamo.org
 grafana_version: latest
-grafana_domain: grafana.vm.krislamo.org
+grafana_domain: grafana.local.krislamo.org
 prom_targets: "['10.0.2.15:9100']"
 
 # nginx
-nginx_domain: nginx.vm.krislamo.org
+nginx_domain: nginx.local.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/gitea.yml

@@ -0,0 +1,45 @@
+# base
+allow_reboot: false
+manage_network: false
+
+users:
+  git:
+    uid: 1001
+    gid: 1001
+    home: true
+
+# Import my GPG key for git signature verification
+root_gpgkeys:
+  - name: kris@lamoureux.io
+    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+
+# docker
+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
+    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,9 +1,27 @@
-base_domain: vm.krislamo.org
+base_domain: local.krislamo.org
 
 # base
 allow_reboot: false
 manage_network: false
 
+users:
+  - name: jellyfin
+
+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
@@ -35,3 +53,4 @@ 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.vm.krislamo.org
+traefik_domain: traefik.local.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.vm.krislamo.org
+nextcloud_domain: cloud.local.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.vm.krislamo.org
+traefik_domain: traefik.local.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.vm.krislamo.org
+nginx_domain: nginx.local.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,4 +1,4 @@
-base_domain: vm.krislamo.org
+base_domain: local.krislamo.org
 
 # base
 allow_reboot: false

dev/host_vars/wordpress.yml

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

docker.yml

@@ -1,21 +0,0 @@
-# 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

@@ -1,25 +0,0 @@
-# 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

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Finds the SSH private key under ./.vagrant and connects to
+# the Vagrant box, port forwarding localhost ports: 8443, 80, 443
+
+# Root check
+if [ "$EUID" -ne 0 ]; then
+  echo "[ERROR]: Please run 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:localhost:80 \
+        -L 443:localhost: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]: Delined 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)"
+if ! 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
+fi
+echo "[CHECK]: Valid key at $PRIVATE_KEY"
+
+# Grab first IP or use whatever HOST_IP_FIELD is set to and check that the guest is up
+HOST_IP="$(vagrant ssh -c "hostname -I | cut -d' ' -f${HOST_IP_FIELD:-1}" 2>/dev/null)"
+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 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

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

playbooks/dockerbox.yml

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

playbooks/mediaserver.yml

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

roles/base/defaults/main.yml

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

roles/base/handlers/main.yml

@@ -22,3 +22,9 @@
     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,21 +1,3 @@
-- name: 'Install Ansible dependency: python3-apt'
-  ansible.builtin.shell: 'apt-get update && apt-get install python3-apt -y'
-  args:
-    creates: /usr/lib/python3/dist-packages/apt
-    warn: false
-
-- name: Install additional Ansible dependencies
-  ansible.builtin.apt:
-    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:
     path: "~/.ansible/tmp"

roles/base/tasks/main.yml

@@ -9,6 +9,7 @@
 - name: Import Firewall tasks
   ansible.builtin.import_tasks: firewall.yml
   tags: firewall
+  when: manage_firewall
 
 - name: Import Network tasks
   ansible.builtin.import_tasks: network.yml
@@ -29,3 +30,8 @@
   ansible.builtin.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/samba.yml

@@ -0,0 +1,53 @@
+- name: Install Samba
+  ansible.builtin.apt:
+    name: samba
+    state: present
+
+- name: Create nologin shell accounts for Samba
+  ansible.builtin.user:
+    name: "{{ item.name }}"
+    state: present
+    shell: /usr/sbin/nologin
+    createhome: false
+    system: yes
+  loop: "{{ samba.users }}"
+  when: item.manage_user is defined and item.manage_user is true
+
+- name: Create Samba users
+  ansible.builtin.shell: "smbpasswd -a {{ item.name }}"
+  args:
+    stdin: "{{ item.password }}\n{{ item.password }}"
+  loop: "{{ samba.users }}"
+  register: samba_users
+  changed_when: "'User added' in samba_users.stdout"
+
+- name: Ensure share directories exist
+  ansible.builtin.file:
+    path: "{{ item.path }}"
+    owner: "{{ item.owner }}"
+    group: "{{ item.group }}"
+    state: directory
+    mode: 0755
+  loop: "{{ samba.shares }}"
+
+- name: Configure Samba shares
+  ansible.builtin.template:
+    src: smb.conf.j2
+    dest: /etc/samba/smb.conf
+  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

@@ -4,6 +4,61 @@
     state: present
     update_cache: true
 
+- name: Install GPG
+  ansible.builtin.apt:
+    name: gpg
+    state: present
+
+- name: Check for existing GPG keys
+  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
+  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 }}"
+  when: root_gpgkeys is defined and item.rc != 0
+
+- name: Check GPG key imports
+  fail:
+    msg: "{{ item.stderr }}"
+  loop: "{{ gpg_check_import.results }}"
+  loop_control:
+    label: "{{ item.item.item }}"
+  when: (item.skipped | default(false) == 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
+  register: locale_gen_output
+
+- name: Set the default locale
+  ansible.builtin.lineinfile:
+    path: /etc/default/locale
+    regexp: "^LANG="
+    line: "LANG={{ locale_default }}"
+
+- name: Reconfigure locales
+  ansible.builtin.command: dpkg-reconfigure -f noninteractive locales
+  when: locale_gen_output.changed
+
 - name: Manage root authorized_keys
   ansible.builtin.template:
     src: authorized_keys.j2
@@ -11,6 +66,39 @@
     mode: 0400
   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) }}"
+  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:
     path: "{{ item.path }}"

roles/base/tasks/wireguard.yml

@@ -11,6 +11,7 @@
   args:
     chdir: /etc/wireguard/
     creates: /etc/wireguard/privatekey
+    executable: /usr/bin/bash
 
 - name: Grab WireGuard private key for configuration
   ansible.builtin.slurp:
@@ -34,5 +35,5 @@
   community.general.ufw:
     rule: allow
     port: "{{ wireguard.listenport }}"
-    proto: tcp
+    proto: udp
   when: wireguard.listenport is defined

roles/base/templates/smb.conf.j2

@@ -0,0 +1,28 @@
+[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/docker/defaults/main.yml

@@ -1,3 +1,6 @@
 docker_compose_root: /var/lib/compose
-docker_compose: /usr/bin/docker-compose
 docker_compose_service: compose
+docker_compose: /usr/bin/docker-compose
+docker_repos_keys: "{{ docker_repos_path }}/.keys"
+docker_repos_keytype: rsa
+docker_repos_path: /srv/.compose_repos

roles/docker/handlers/main.yml

@@ -2,3 +2,29 @@
   ansible.builtin.systemd:
     daemon_reload: true
   listen: compose_systemd
+
+- name: Find which services had a docker-compose.yml updated
+  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
+  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 {{ docker_compose_service }} services
+  ansible.builtin.systemd:
+    state: restarted
+    name: "{{ docker_compose_service }}@{{ item }}"
+  loop: "{{ compose_restart_list | unique }}"
+  when: compose_restart_list is defined
+  listen: compose_restart

roles/docker/tasks/main.yml

@@ -4,6 +4,13 @@
     state: present
     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:
     path: "{{ docker_compose_root }}"
@@ -17,6 +24,74 @@
     mode: 0400
   notify: compose_systemd
 
+- name: Create directories to clone docker-compose repositories
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0400
+  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: 0400
+    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: 0400
+  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
+  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: 0400
+  register: compose_env_update
+  notify: compose_restart
+  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: Add users to docker group
   ansible.builtin.user:
     name: "{{ item }}"
@@ -30,3 +105,13 @@
     name: docker
     state: started
     enabled: true
+
+- name: Start docker-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

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

@@ -0,0 +1,10 @@
+# {{ 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/gitea/tasks/main.yml

@@ -1,38 +1,23 @@
-- name: Create Gitea directory
+- name: Install MySQL module for Ansible
-  ansible.builtin.file:
+  ansible.builtin.apt:
-    path: "{{ gitea_root }}"
+    name: python3-pymysql
-    state: directory
+    state: present
 
 - name: Create Gitea database
   community.mysql.mysql_db:
-    name: "{{ gitea_dbname }}"
+    name: "{{ gitea.DB_NAME }}"
     state: present
     login_unix_socket: /var/run/mysqld/mysqld.sock
 
 - name: Create Gitea database user
   community.mysql.mysql_user:
-    name: "{{ gitea_dbuser }}"
+    name: "{{ gitea.DB_USER }}"
-    password: "{{ gitea_dbpass }}"
+    password: "{{ gitea.DB_PASSWD }}"
     host: '%'
     state: present
-    priv: "{{ gitea_dbname }}.*:ALL"
+    priv: "{{ gitea.DB_NAME }}.*:ALL"
     login_unix_socket: /var/run/mysqld/mysqld.sock
 
-- name: Create git user
-  ansible.builtin.user:
-    name: git
-    state: present
-
-- name: Git user uid
-  ansible.builtin.getent:
-    database: passwd
-    key: git
-
-- name: Git user gid
-  ansible.builtin.getent:
-    database: group
-    key: git
-
 - name: Create git's .ssh directory
   ansible.builtin.file:
     path: /home/git/.ssh
@@ -70,28 +55,11 @@
     dest: /usr/local/bin/gitea
     mode: 0755
 
-- name: Install Gitea's docker-compose file
-  ansible.builtin.template:
-    src: docker-compose.yml.j2
-    dest: "{{ gitea_root }}/docker-compose.yml"
-  notify: restart_gitea
-
-- name: Install Gitea's docker-compose variables
-  ansible.builtin.template:
-    src: compose-env.j2
-    dest: "{{ gitea_root }}/.env"
-  notify: restart_gitea
-
 - name: Create Gitea's logging directory
   ansible.builtin.file:
     name: /var/log/gitea
     state: directory
 
-- name: Create Gitea's initial log file
-  ansible.builtin.file:
-    name: /var/log/gitea/gitea.log
-    state: touch
-
 - name: Install Gitea's Fail2ban filter
   ansible.builtin.template:
     src: fail2ban-filter.conf.j2

roles/jellyfin/defaults/main.yml

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

roles/jellyfin/tasks/main.yml

@@ -4,11 +4,6 @@
     state: directory
     mode: 0500
 
-- name: Create jellyfin user
-  ansible.builtin.user:
-    name: jellyfin
-    state: present
-
 - name: Get user jellyfin uid
   ansible.builtin.getent:
     database: passwd

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

@@ -1,7 +1,8 @@
 version: '3.7'
 
 volumes:
-  {{ jellyfin_volume }}:
+  config:
+  cache:
 
 networks:
   traefik:
@@ -24,6 +25,6 @@ services:
       - "traefik.docker.network=traefik"
       - "traefik.enable=true"
     volumes:
-      - ./config:/config
+      - config:/config
-      - ./cache:/cache
+      - cache:/cache
-      - {{ jellyfin_volume }}:/media
+      - {{ jellyfin_media }}:/media

roles/mariadb/defaults/main.yml

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

roles/mariadb/handlers/main.yml

@@ -0,0 +1,5 @@
+- name: Restart MariaDB
+  ansible.builtin.service:
+    name: mariadb
+    state: restarted
+  listen: restart_mariadb

roles/mariadb/tasks/main.yml

@@ -3,23 +3,20 @@
     name: mariadb-server
     state: present
 
-- name: Change the bind-address to allow Docker
+- name: Regather facts for the potentially new docker0 interface
+  ansible.builtin.setup:
+
+- name: Change the bind-address to allow from docker0
   ansible.builtin.lineinfile:
     path: /etc/mysql/mariadb.conf.d/50-server.cnf
     regex: "^bind-address"
-    line: "bind-address            = 0.0.0.0"
+    line: "bind-address            = {{ ansible_facts.docker0.ipv4.address }}"
-  register: mariadb_conf
+  notify: restart_mariadb
 
-- name: Restart MariaDB
+- name: Allow database connections from Docker
-  ansible.builtin.service:
-    name: mariadb
-    state: restarted
-  when: mariadb_conf.changed
-
-- name: Allow database connections
   community.general.ufw:
     rule: allow
     port: "3306"
     proto: tcp
     src: "{{ item }}"
-  loop: "{{ mariadb_trust }}"
+  loop: "{{ mariadb_trust | default(['172.16.0.0/12']) }}"

roles/nextcloud/tasks/main.yml

@@ -29,6 +29,8 @@
     networks:
       - name: "{{ nextcloud_container }}"
       - name: traefik
+    env:
+      PHP_MEMORY_LIMIT: 1024M
     labels:
       traefik.http.routers.nextcloud.rule: "Host(`{{ nextcloud_domain }}`)"
       traefik.http.routers.nextcloud.entrypoints: websecure
@@ -103,6 +105,13 @@
     - "php occ maintenance:mode --off"
   when: nextcloud_install.changed
 
+- 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: Remove Nextcloud's CAN_INSTALL file
   ansible.builtin.file:
     path: "{{ nextcloud_root }}/config/CAN_INSTALL"

roles/proxy/tasks/main.yml

@@ -19,14 +19,14 @@
   ansible.builtin.template:
     src: nginx.conf.j2
     dest: /etc/nginx/nginx.conf
-    mode: '0644'
+    mode: 0644
   notify: reload_nginx
 
 - name: Install nginx sites configuration
   ansible.builtin.template:
     src: server-nginx.conf.j2
     dest: "/etc/nginx/sites-available/{{ item.domain }}.conf"
-    mode: '0644'
+    mode: 0400
   loop: "{{ proxy.servers }}"
   notify: reload_nginx
   register: nginx_sites

update-hosts.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-COMMENT="Project Moxie"
-DOMAIN="vm.krislamo.org"
-HOST[0]="traefik.${DOMAIN}"
-HOST[1]="cloud.${DOMAIN}"
-HOST[2]="git.${DOMAIN}"
-HOST[3]="jenkins.${DOMAIN}"
-HOST[4]="prom.${DOMAIN}"
-HOST[5]="grafana.${DOMAIN}"
-HOST[6]="nginx.${DOMAIN}"
-HOST[7]="vault.${DOMAIN}"
-HOST[8]="wordpress.${DOMAIN}"
-HOST[9]="site1.wordpress.${DOMAIN}"
-HOST[10]="site2.wordpress.${DOMAIN}"
-HOST[11]="unifi.${DOMAIN}"
-HOST[12]="jellyfin.${DOMAIN}"
-
-# Get Vagrantbox guest IP
-VAGRANT_OUTPUT=$(vagrant ssh -c "hostname -I | cut -d' ' -f2" 2>/dev/null)
-
-# Remove ^M from the end
-[ ${#VAGRANT_OUTPUT} -gt 1 ] && IP=${VAGRANT_OUTPUT::-1}
-
-echo "Purging project addresses from /etc/hosts"
-sudo sed -i "s/# $COMMENT//g" /etc/hosts
-for address in "${HOST[@]}"; do
-  sudo sed -i "/$address/d" /etc/hosts
-done
-
-# Remove trailing newline
-sudo sed -i '${/^$/d}' /etc/hosts
-
-if [ -n "$IP" ]; then
-  echo -e "Adding new addresses...\n"
-  echo -e "# $COMMENT" | sudo tee -a /etc/hosts
-  for address in "${HOST[@]}"; do
-    echo -e "$IP\t$address" | sudo tee -a /etc/hosts
-  done
-else
-  echo "Cannot find address. Is the Vagrant box running?"
-fi