testing

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

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

@@ -2,6 +2,11 @@
 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
@@ -10,30 +15,34 @@ docker_users:
 #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: 4d3391b1644e87dec2d60d3315401e4db2bbc943
+    version: 31ee724feebc1d5f91cb17ffd6892c352537f194
     enabled: true
     accept_newhostkey: true # Consider verifying manually instead
-    # Must manually add my GPG key to root's keyring
-    #trusted_keys:
-    #  - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+    trusted_keys:
+      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
     env:
-      VERSION: "2.10"
+      ENABLE: true
+
+  # Traefik 2 (no other external compose to test currently)
   - name: traefik2
     url: https://github.com/krislamo/traefik
-    version: 4d3391b1644e87dec2d60d3315401e4db2bbc943
+    version: 31ee724feebc1d5f91cb17ffd6892c352537f194
     enabled: true
     accept_newhostkey: true # Consider verifying manually instead
-    # Must manually add my GPG key to root's keyring
-    #trusted_keys:
-    #  - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+    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_POST: 127.0.0.1:8444:8443
+      LOCAL_PORT: 127.0.0.1:8444:8443

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

forward-ssh.sh

@@ -23,9 +23,10 @@ function ssh_connect {
     [yY])
       printf "[INFO]: Starting new vagrant SSH tunnel on PID "
       sudo -u "$USER" ssh -fNT -i "$PRIVATE_KEY" \
-        -L 8443:localhost:8443 \
+        -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

roles/base/defaults/main.yml

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

roles/base/handlers/main.yml

@@ -27,4 +27,4 @@
   ansible.builtin.service:
     name: smbd
     state: restarted
-  listen: restart_samba
+  listen: restart_samba

roles/base/tasks/system.yml

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

roles/docker/tasks/main.yml

@@ -74,10 +74,10 @@
   delegate_to: "{{ inventory_hostname }}"
   register: compose_update
   notify: compose_restart
-  loop: "{{ docker_compose_deploy }}"
+  loop: "{{ docker_compose_deploy | default([]) }}"
   loop_control:
     label: "{{ item.name }}"
-  when: docker_compose_deploy is defined
+  when: docker_compose_deploy is defined and docker_compose_deploy | length > 0
 
 - name: Set environment variables for docker-compose projects
   ansible.builtin.template:
@@ -86,6 +86,7 @@
     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 }}"

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

@@ -1,6 +1,10 @@
 # {{ ansible_managed }}
 {% if item.env is defined %}
-{% for kvpair in item.env.items() %}
-{{ kvpair.0 }}={{ kvpair.1 }}
+{% 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
-  ansible.builtin.file:
-    path: "{{ gitea_root }}"
-    state: directory
+- name: Install MySQL module for Ansible
+  ansible.builtin.apt:
+    name: python3-pymysql
+    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 }}"
-    password: "{{ gitea_dbpass }}"
+    name: "{{ gitea.DB_USER }}"
+    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/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"
-  register: mariadb_conf
+    line: "bind-address            = {{ ansible_facts.docker0.ipv4.address }}"
+  notify: restart_mariadb
 
-- name: Restart MariaDB
-  ansible.builtin.service:
-    name: mariadb
-    state: restarted
-  when: mariadb_conf.changed
-
-- name: Allow database connections
+- name: Allow database connections from Docker
   community.general.ufw:
     rule: allow
     port: "3306"
     proto: tcp
     src: "{{ item }}"
-  loop: "{{ mariadb_trust }}"
+  loop: "{{ mariadb_trust | default(['172.16.0.0/12']) }}"