testing

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

Vagrantfile

@@ -43,6 +43,5 @@ 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/docker.yml

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

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/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/gitea.yml

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

forward-ssh.sh

@@ -3,12 +3,6 @@
 # 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
@@ -17,27 +11,16 @@ 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" \
+  sudo ssh -fNT -i "$PRIVATE_KEY" \
-        -L 22:localhost:22 \
+    -L 8443:localhost:8443 \
     -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
@@ -73,7 +56,7 @@ else
   case "$PKILL_ANSWER" in
     [yY])
       echo "[WARNING]: Killing old vagrant SSH tunnel(s): "
-      pgrep -f "$MATCH_PATTERN" | tee >(xargs kill -15)
+      pgrep -f "$MATCH_PATTERN" | tee >(xargs sudo kill -15)
       echo
       if [ "$(pgrep -afc "$MATCH_PATTERN")" -eq 0 ]; then
         ssh_connect

roles/base/defaults/main.yml

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

roles/base/tasks/system.yml

@@ -4,61 +4,6 @@
     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
@@ -66,27 +11,13 @@
     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 }}"
+    name: "{{ item.name }}"
     state: present
-    uid: "{{ item.value.uid }}"
+    shell: "{{ item.shell | default('/bin/bash') }}"
-    group: "{{ item.value.gid }}"
+    create_home: "{{ item.home | default(false) }}"
-    shell: "{{ item.value.shell | default('/bin/bash') }}"
+  loop: "{{ users }}"
-    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
@@ -94,9 +25,7 @@
     user: "{{ item.key }}"
     key: "{{ item.value.key }}"
     state: present
-  loop: "{{ users | dict2items }}"
+  loop: "{{ users }}"
-  loop_control:
-    label: "{{ item.key }}"
   when: users is defined and item.value.key is defined
 
 - name: Manage filesystem mounts

roles/docker/defaults/main.yml

@@ -3,4 +3,4 @@ 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
+docker_repos_path: /srv/compose_repos

roles/docker/handlers/main.yml

@@ -2,29 +2,3 @@
   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,13 +4,6 @@
     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 }}"
@@ -38,7 +31,6 @@
   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
@@ -47,15 +39,11 @@
   ansible.builtin.git:
     repo: "{{ item.url }}"
     dest: "{{ docker_repos_path }}/{{ item.name }}"
-    version: "{{ item.version }}"
+    version: "{{ item.version | default('main') }}"
-    accept_newhostkey: "{{ item.accept_newhostkey | default('false') }}"
+    force: true
-    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
+  loop: "{{ docker_compose_deploy }}"
 
 - name: Create directories for docker-compose projects using the systemd service
   ansible.builtin.file:
@@ -63,33 +51,22 @@
     state: directory
     mode: 0400
   loop: "{{ docker_compose_deploy }}"
-  loop_control:
-    label: "{{ item.name }}"
   when: docker_compose_deploy is defined
 
-- name: Synchronize docker-compose.yml
+- name: Copy docker-compose.yml files to their service directories
-  ansible.posix.synchronize:
+  ansible.builtin.copy:
     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 }}"
+    remote_src: yes
-  register: compose_update
+  loop: "{{ docker_compose_deploy }}"
-  notify: compose_restart
+  when: docker_compose_deploy is defined
-  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
@@ -112,6 +89,4 @@
     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

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

roles/gitea/tasks/main.yml

@@ -1,23 +1,38 @@
-- name: Install MySQL module for Ansible
+- name: Create Gitea directory
-  ansible.builtin.apt:
+  ansible.builtin.file:
-    name: python3-pymysql
+    path: "{{ gitea_root }}"
-    state: present
+    state: directory
 
 - name: Create Gitea database
   community.mysql.mysql_db:
-    name: "{{ gitea.DB_NAME }}"
+    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 }}"
+    name: "{{ gitea_dbuser }}"
-    password: "{{ gitea.DB_PASSWD }}"
+    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
+  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
@@ -55,11 +70,28 @@
     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/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,5 +0,0 @@
-- name: Restart MariaDB
-  ansible.builtin.service:
-    name: mariadb
-    state: restarted
-  listen: restart_mariadb

roles/mariadb/tasks/main.yml

@@ -3,20 +3,23 @@
     name: mariadb-server
     state: present
 
-- name: Regather facts for the potentially new docker0 interface
+- name: Change the bind-address to allow Docker
-  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            = {{ ansible_facts.docker0.ipv4.address }}"
+    line: "bind-address            = 0.0.0.0"
-  notify: restart_mariadb
+  register: mariadb_conf
 
-- name: Allow database connections from Docker
+- name: Restart MariaDB
+  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 | default(['172.16.0.0/12']) }}"
+  loop: "{{ mariadb_trust }}"