testing

.github/workflows/vagrant.yml

@@ -3,9 +3,8 @@ name: homelab-ci
 on:
   push:
     branches:
-      - github_actions
+      - main
-      # - main
+      - testing
-      # - testing
 
 jobs:
   homelab-ci:

dev/dockerbox.yml

@@ -6,7 +6,8 @@
   roles:
     - base
     - docker
-    - mariadb
     - traefik
     - nextcloud
-    - proxy
+    - jenkins
+    - prometheus
+    - nginx

dev/host_vars/dockerbox.yml

@@ -2,47 +2,44 @@
 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:
+traefik_version: latest
-  ENABLE: true
+traefik_dashboard: true
+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
 
 # nextcloud
-nextcloud:
+nextcloud_version: stable
-  DOMAIN: cloud.local.krislamo.org
+nextcloud_admin: admin
-  DB_PASSWD: password
+nextcloud_pass: password
-  ADMIN_PASSWD: password
+nextcloud_domain: cloud.local.krislamo.org
+
+nextcloud_dbversion: latest
+nextcloud_dbpass: password
+
+# jenkins
+jenkins_version: lts
+jenkins_domain: jenkins.local.krislamo.org
+
+# prometheus (includes grafana)
+prom_version: latest
+prom_domain: prom.local.krislamo.org
+grafana_version: latest
+grafana_domain: grafana.local.krislamo.org
+prom_targets: "['10.0.2.15:9100']"
+
+# nginx
+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
+nginx_version: latest

forward-ssh.sh

@@ -28,7 +28,6 @@ fi
 
 # Clean environment
 unset PRIVATE_KEY
-unset HOST_IP
 unset MATCH_PATTERN
 unset PKILL_ANSWER
 
@@ -78,12 +77,17 @@ else
 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"
+  HOST_IP="$(sudo -u "$SUDO_USER" vagrant ssh -c "hostname -I | cut -d' ' -f${HOST_IP_FIELD:-1}" "${1:-default}" 2>/dev/null)"
-  exit 1
+
+  if [ -z "$HOST_IP" ]; then
+    echo "[ERROR]: Failed to find ${1:-default}'s IP"
+    exit 1
+  fi
+  HOST_IP="${HOST_IP::-1}" # trim
+else
+  echo "[INFO]: HOST_IP configured by the shell environment"
 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'"

playbooks/docker.yml

@@ -4,5 +4,4 @@
   roles:
     - base
     - jenkins
-    - proxy
     - docker

roles/base/tasks/samba.yml

@@ -26,7 +26,7 @@
   ansible.builtin.template:
     src: smb.conf.j2
     dest: /etc/samba/smb.conf
-    mode: "644"
+    mode: "700"
   notify: restart_samba
 
 - name: Start smbd and enable on boot

roles/base/tasks/wireguard.yml

@@ -18,28 +18,6 @@
     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:
-    src: /etc/wireguard/privatekey
-  register: wgkey
-
 - name: Install WireGuard configuration
   ansible.builtin.template:
     src: wireguard.j2

roles/base/templates/wireguard.j2

@@ -1,6 +1,4 @@
-# {{ ansible_managed }}
+[Interface]
-
-[Interface] # {{ ansible_hostname }}
 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/mariadb/tasks/main.yml

@@ -17,10 +17,6 @@
     line: "bind-address            = {{ ansible_facts.docker0.ipv4.address }}"
   notify: restart_mariadb
 
-- name: Flush handlers to ensure MariaDB restarts immediately
-  ansible.builtin.meta: flush_handlers
-  tags: restart_mariadb
-
 - name: Allow database connections from Docker
   community.general.ufw:
     rule: allow

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,62 +1,109 @@
-- name: Install MySQL module for Ansible
+- name: Create Nextcloud network
-  ansible.builtin.apt:
+  community.general.docker_network:
-    name: python3-pymysql
+    name: "{{ nextcloud_container }}"
-    state: present
 
-- name: Create Nextcloud database
+- name: Start Nextcloud's database container
-  community.mysql.mysql_db:
+  community.general.docker_container:
-    name: "{{ nextcloud.DB_NAME | default('nextcloud') }}"
+    name: "{{ nextcloud_dbcontainer }}"
-    state: present
+    image: mariadb:{{ nextcloud_dbversion }}
-    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 }}"
     state: started
-    enabled: true
+    restart_policy: always
-  when: nextcloud.ENABLE | default('false')
+    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
+  community.general.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
+    env:
+      PHP_MEMORY_LIMIT: 1024M
+    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
+  community.general.docker_container_info:
+    name: "{{ nextcloud_dbcontainer }}"
+  register: nextcloud_dbinfo
 
 - name: Grab Nextcloud container information
   community.general.docker_container_info:
-    name: "{{ nextcloud_name }}"
+    name: "{{ nextcloud_container }}"
   register: nextcloud_info
 
 - name: Wait for Nextcloud to become available
   ansible.builtin.wait_for:
     host: "{{ nextcloud_info.container.NetworkSettings.Networks.traefik.IPAddress }}"
-    delay: 10
     port: 80
 
 - name: Check Nextcloud status
-  ansible.builtin.command: >
+  ansible.builtin.command: "docker exec --user www-data {{ nextcloud_container }}
-    docker exec --user www-data "{{ nextcloud_name }}" php occ status
+            php occ status"
   register: nextcloud_status
-  changed_when: false
+  args:
+    removes: "{{ nextcloud_root }}/config/CAN_INSTALL"
+
+- name: Wait for Nextcloud database to become available
+  ansible.builtin.wait_for:
+    host: "{{ nextcloud_dbinfo.container.NetworkSettings.Networks.nextcloud.IPAddress }}"
+    port: 3306
 
 - name: Install Nextcloud
-  ansible.builtin.command: >
+  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}
-    docker exec --user www-data {{ nextcloud_name }}
+            php occ maintenance:install
-      php occ maintenance:install
+              --database "mysql"
-        --database "mysql"
+              --database-host "{{ nextcloud_dbcontainer }}"
-        --database-host "{{ nextcloud.DB_HOST | default('host.docker.internal') }}"
+              --database-name "{{ nextcloud_dbname }}"
-        --database-name "{{ nextcloud.DB_NAME | default('nextcloud') }}"
+              --database-user "{{ nextcloud_dbuser }}"
-        --database-user "{{ nextcloud.DB_USER | default('nextcloud') }}"
+              --database-pass "{{ nextcloud_dbpass }}"
-        --database-pass "{{ nextcloud.DB_PASSWD }}"
+              --admin-user "{{ nextcloud_admin }}"
-        --admin-user "{{ nextcloud.ADMIN_USER | default('admin') }}"
+              --admin-pass "{{ nextcloud_pass }}"'
-        --admin-pass "{{ nextcloud.ADMIN_PASSWD }}"
   register: nextcloud_install
-  when: nextcloud_status.stderr[:26] == "Nextcloud is not installed"
+  when:
-  changed_when: nextcloud_install.stdout == "Nextcloud was successfully installed"
+    - nextcloud_status.stdout[:26] == "Nextcloud is not installed"
-  notify: install_nextcloud
+    - nextcloud_domain is defined
+
+- name: Set Nextcloud's Trusted Proxy
+  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}
+            php occ config:system:set trusted_proxies 0
+              --value="{{ traefik_name }}"'
+  when: nextcloud_install.changed
+
+- name: Set Nextcloud's Trusted Domain
+  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}
+            php occ config:system:set trusted_domains 0
+              --value="{{ nextcloud_domain }}"'
+  when: nextcloud_install.changed
+
+- name: Preform Nextcloud database maintenance
+  ansible.builtin.command: "docker exec --user www-data {{ nextcloud_container }} {{ item }}"
+  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: Install Nextcloud background jobs cron
   ansible.builtin.cron:
@@ -64,3 +111,8 @@
     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"
+    state: absent

roles/proxy/defaults/main.yml

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

roles/proxy/tasks/main.yml

@@ -10,19 +10,6 @@
     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:
     path: /etc/ssl/dhparams.pem

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 %}
+{% if item.restrict is defined and item.restrict  %}
-{% for ip in item.allowedips %}
-    allow {{ ip }};
-{% endfor %}
-    deny all;
-{% endif %}
-{% 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 "";

roles/traefik/tasks/main.yml

@@ -21,6 +21,20 @@
   loop: "{{ traefik_external }}"
   when: traefik_external is defined
 
+- name: Install Traefik's docker-compose file
+  ansible.builtin.template:
+    src: docker-compose.yml.j2
+    dest: "{{ traefik_root }}/docker-compose.yml"
+    mode: 0400
+  notify: restart_traefik
+
+- name: Install Traefik's docker-compose variables
+  ansible.builtin.template:
+    src: compose-env.j2
+    dest: "{{ traefik_root }}/.env"
+    mode: 0400
+  notify: restart_traefik
+
 - name: Install static Traefik configuration
   ansible.builtin.template:
     src: traefik.yml.j2
@@ -28,9 +42,8 @@
     mode: 0400
   notify: restart_traefik
 
-- name: Start Traefik service and enable on boot
+- name: Start and enable Traefik service
   ansible.builtin.service:
     name: "{{ docker_compose_service }}@{{ traefik_name }}"
     state: started
     enabled: true
-  when: traefik.ENABLED | default('false')