add redis handlers

group_vars/umami.yml

@@ -10,18 +10,7 @@ description: Umami web analytics
 docker_users_to_add:
   - "{{ ansible_user }}"   # add the SSH user to the docker group
 
-# --- Umami role ---
+umami_admin_password: "0cf1c36d008b67d42ad9eb5b0b802b2d"
-umami_base_dir: /opt/umami
-umami_image: "ghcr.io/umami-software/umami:latest"
-umami_container_name: umami
-umami_port: 3000                     # host port Umami will be exposed on
-
-# Address the umami_port is bound to on the host.
-# - "127.0.0.1" if your reverse proxy runs on this same host (loopback only)
-# - "0.0.0.0" if your reverse proxy is elsewhere (another host/container) and
-#   needs to reach this port over the network
-umami_bind_address: "0.0.0.0"
-
 # Postgres settings (used by the umami-db container)
 umami_db_container_name: umami-db
 umami_db_image: "postgres:15-alpine"

plays/mysql.yml

@@ -0,0 +1,17 @@
+---
+- name: Install & configure mysql server
+  hosts: all
+  vars:
+    custom_firewall_ports:
+      - 111
+      - 2049
+      - 3306
+      - 6379
+    apt_packages:
+      - nfs-kernel-server
+    install_redis_exporter: true
+    install_mysqld_exporter: true
+    description: 'database & filestorage node for hosting app.retailor.io'
+  roles:
+    - role: roles/firewall
+    - role: roles/mysql

plays/redis.yml

@@ -0,0 +1,12 @@
+---
+- name: Install & configure redis
+  hosts: all
+  vars:
+    custom_firewall_ports:
+      - 6379
+    install_redis_exporter: true
+    description: 'cache node for retailor redis cache'
+  roles:
+    - role: roles/firewall
+    - role: roles/redis
+

plays/traefik.yml

@@ -4,5 +4,4 @@
   roles:
     - role: roles/firewall
     - role: roles/docker
-    - role: roles/env
     - role: roles/traefik

plays/umami.yml

@@ -6,5 +6,4 @@
   roles:
     - role: roles/firewall
     - role: roles/docker
-    - role: roles/env
     - role: roles/umami

roles/elasticsearch/tasks/tls.yml

@@ -8,7 +8,24 @@
 # provisioning time. See the role README for the IaC side of this.
 # ---------------------------------------------------------------------------
 
-- name: Assert the Cloudflare token file exists
+- name: Check if Cloudflare token file exists at legacy/staging path
+  ansible.builtin.stat:
+    path: /etc/retailor/cloudflare-token.env
+  register: elk_cf_token_src_stat
+
+- name: Ensure folder exists
+  ansible.builtin.command:
+    cmd: mkdir -p "{{ elk_lego_path }}"
+  when: elk_cf_token_src_stat.stat.exists
+  changed_when: true
+
+- name: Move Cloudflare token file into place if found at staging path
+  ansible.builtin.command:
+    cmd: cp /etc/retailor/cloudflare-token.env "{{ elk_cloudflare_token_env_file }}"
+  when: elk_cf_token_src_stat.stat.exists
+  changed_when: true
+
+- name: Assert the Cloudflare token file exists at the expected location
   ansible.builtin.stat:
     path: "{{ elk_cloudflare_token_env_file }}"
   register: elk_cf_token_stat
@@ -18,19 +35,33 @@
     msg: >
       {{ elk_cloudflare_token_env_file }} does not exist. This role expects
       cloud-init (or equivalent provisioning) to have already written a
-      scoped Cloudflare API token here before Ansible runs. See the IaC
+      scoped Cloudflare API token here before Ansible runs, or a legacy
-      notes in the role README.
+      copy at /etc/retailor/cloudflare-token.env to be moved into place. See the
+      IaC notes in the role README.
   when: not elk_cf_token_stat.stat.exists
 
-- name: Verify the token file is not world/group readable
+- name: Ensure the token file has correct ownership and permissions
+  ansible.builtin.file:
+    path: "{{ elk_cloudflare_token_env_file }}"
+    mode: "0640"
+    owner: root
+    group: root
+  when: elk_cf_token_stat.stat.exists
+
+- name: Re-stat token file after permission enforcement
+  ansible.builtin.stat:
+    path: "{{ elk_cloudflare_token_env_file }}"
+  register: elk_cf_token_stat
+
+- name: Verify the token file is not world readable
   ansible.builtin.assert:
     that:
-      - elk_cf_token_stat.stat.mode == "0600"
+      - elk_cf_token_stat.stat.mode == "0640"
     fail_msg: >
-      {{ elk_cloudflare_token_env_file }} should be mode 0600
+      {{ elk_cloudflare_token_env_file }} should be mode 0640
       (currently {{ elk_cf_token_stat.stat.mode }}) since it holds a
       Cloudflare API credential.
-    success_msg: "Cloudflare token file permissions look correct."
+    success_msg: "Cloudflare token file permissions verified."
 
 - name: Create lego directories
   ansible.builtin.file:
@@ -104,9 +135,7 @@
 - name: Issue the initial certificate (first run only)
   ansible.builtin.shell: |
     set -o pipefail
-    set -a
+    export $(cat "{{ elk_cloudflare_token_env_file}}" | xargs) && \
-    source {{ elk_cloudflare_token_env_file }}
-    set +a
     {{ elk_lego_install_dir }}/lego \
       --accept-tos \
       --email "{{ elk_tls_acme_email }}" \

roles/mysql/defaults/main.yml

@@ -0,0 +1,36 @@
+---
+# ---------------------------------------------------------------------------
+mysql_root_password: "{{ lookup('env', 'MYSQL_ROOT_PASSWORD') | default('', true) }}"
+mysql_replication_user: "repl"
+mysql_replication_password: "{{ lookup('env', 'MYSQL_REPL_PASSWORD') | default('', true) }}"
+mysql_app_user: "{{ lookup('env', 'MYSQL_APP_USER') | default('appuser', true) }}"
+mysql_app_password: "{{ lookup('env', 'MYSQL_APP_PASSWORD') | default('', true) }}"
+mysql_app_database: "{{ lookup('env', 'MYSQL_APP_DATABASE') | default('appdb', true) }}"
+
+mysql_version: "{{ lookup('env', 'MYSQL_VERSION') | default('8.0', true) }}"
+mysql_server_id: "{{ lookup('env', 'HOSTNAME') | default('mysql', true) }}"
+
+# --- Sizing ------------------------------------------------------------
+# Set per-environment (override in host_vars if primary/replicas differ in size).
+# Rule of thumb: innodb_buffer_pool_size ~= 70-75% of RAM on a dedicated DB host.
+mysql_total_ram_mb: "{{ lookup('env', 'MYSQL_TOTAL_RAM_MB') | default(8192, true) | int }}"
+mysql_innodb_buffer_pool_size: "{{ (mysql_total_ram_mb | int * 0.70) | round | int }}M"
+
+mysql_max_connections: 200
+
+# --- Networking / security ----------------------------------------------
+mysql_bind_address: "0.0.0.0"     # bound to all interfaces; ufw restricts who can reach it
+mysql_port: 3306
+mysql_allowed_cidrs:              # who is allowed to hit port 3306 via firewall
+  - "{{ lookup('env', 'MYSQL_ALLOWED_CIDR') | default('10.0.1.0/24', true) }}"
+
+# --- Replication ----------------------------------------------------------
+mysql_gtid_mode: "ON"
+mysql_binlog_format: "ROW"
+mysql_binlog_expire_logs_seconds: 604800   # 7 days
+
+# --- Backups ---------------------------------------------------------------
+mysql_backup_enabled: "{{ lookup('env', 'MYSQL_BACKUP_ENABLED') | default('true', true) | bool }}"
+mysql_backup_dir: /var/backups/mysql
+mysql_backup_retention_days: 7
+mysql_backup_hour: 2    # 2am local, staggered per-host below if needed

roles/mysql/handlers/main.yml

@@ -0,0 +1,6 @@
+---
+- name: restart mysql
+  systemd:
+    name: mysql
+    state: restarted
+

roles/mysql/tasks/main.yml

@@ -0,0 +1,155 @@
+---
+- name: Install prerequisite packages
+  apt:
+    name:
+      - gnupg2
+      - lsb-release
+      - python3-pymysql   # required by Ansible's community.mysql modules
+      - ufw
+    state: present
+    update_cache: true
+
+- name: Install MySQL server
+  apt:
+    name:
+      - mysql-server-8.0
+      - mysql-client-8.0
+    state: present
+  notify: restart mysql
+
+- name: Ensure MySQL data/log directories exist with correct ownership
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: mysql
+    group: mysql
+    mode: '0750'
+  loop:
+    - /var/log/mysql
+    - "{{ mysql_backup_dir }}"
+
+- name: Deploy tuned my.cnf
+  template:
+    src: my.cnf.j2
+    dest: /etc/mysql/mysql.conf.d/99-production.cnf
+    owner: root
+    group: root
+    mode: '0644'
+    # validate: 'mysqld --defaults-file=%s --validate-config'
+  notify: restart mysql
+
+- name: Start and enable MySQL
+  systemd:
+    name: mysql
+    state: started
+    enabled: true
+
+- name: Set MySQL root password (idempotent — only runs if not already set)
+  community.mysql.mysql_user:
+    name: root
+    password: "{{ mysql_root_password }}"
+    host: localhost
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+    state: present
+  no_log: true
+
+- name: Create .my.cnf for root so future plays authenticate automatically
+  template:
+    src: root_my_cnf.j2
+    dest: /root/.my.cnf
+    owner: root
+    group: root
+    mode: '0600'
+  no_log: true
+
+# --- mysql_secure_installation equivalent, done idempotently ---------------
+- name: Remove anonymous MySQL users
+  community.mysql.mysql_user:
+    name: ''
+    host_all: true
+    state: absent
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+
+- name: Remove test database
+  community.mysql.mysql_db:
+    name: test
+    state: absent
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+
+- name: Disallow remote root login
+  community.mysql.mysql_user:
+    name: root
+    host: "{{ item }}"
+    state: absent
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+  loop:
+    - "{{ ansible_hostname }}"
+    - "%"
+  ignore_errors: true   # fine if they don't exist
+
+# --- Firewall: only allow MySQL port from known CIDRs ----------------------
+- name: Allow MySQL port from trusted CIDRs only
+  community.general.ufw:
+    rule: allow
+    port: "{{ mysql_port | string }}"
+    proto: tcp
+    from_ip: "{{ item }}"
+  loop: "{{ mysql_allowed_cidrs }}"
+
+- name: Reload ufw
+  community.general.ufw:
+    state: enabled
+
+# --- Application DB + user --------------------------------------------------
+- name: Create retailor database
+  community.mysql.mysql_db:
+    name: "{{ mysql_app_database }}"
+    state: present
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+
+- name: Create forge user
+  community.mysql.mysql_user:
+    name: "{{ mysql_app_user }}"
+    password: "{{ mysql_app_password }}"
+    priv: "{{ mysql_app_database }}.*:ALL"
+    host: '%'
+    state: present
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+  no_log: true
+
+- name: Create replication user
+  community.mysql.mysql_user:
+    name: "{{ mysql_replication_user }}"
+    password: "{{ mysql_replication_password }}"
+    priv: "*.*:REPLICATION SLAVE"
+    host: '%'
+    state: present
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+  no_log: true
+
+- name: Deploy logrotate config
+  template:
+    src: logrotate_mysql.j2
+    dest: /etc/logrotate.d/mysql-server
+    owner: root
+    group: root
+    mode: '0644'
+
+- name: Deploy backup script
+  template:
+    src: mysql_backup.sh.j2
+    dest: /usr/local/bin/mysql_backup.sh
+    owner: root
+    group: root
+    mode: '0750'
+  when: mysql_backup_enabled
+
+- name: Schedule nightly backup cron
+  cron:
+    name: "mysql nightly backup"
+    hour: "{{ mysql_backup_hour }}"
+    minute: "0"
+    job: "/usr/local/bin/mysql_backup.sh >> /var/log/mysql/backup.log 2>&1"
+    user: root
+  when: mysql_backup_enabled
+

roles/mysql/templates/logrotate_mysql.j2

@@ -0,0 +1,14 @@
+/var/log/mysql/*.log {
+    daily
+    rotate 14
+    missingok
+    compress
+    delaycompress
+    notifempty
+    create 640 mysql adm
+    sharedscripts
+    postrotate
+        /usr/bin/mysqladmin flush-logs
+    endscript
+}
+

roles/mysql/templates/my.cnf.j2

@@ -0,0 +1,35 @@
+# Production MySQL config — generated by Ansible for retailor.io. Edit by hand might cause drift!
+
+[mysqld]
+bind-address            = {{ mysql_bind_address }}
+port                     = {{ mysql_port }}
+max_connections          = {{ mysql_max_connections }}
+server_id                = {{ mysql_server_id }}
+
+# --- InnoDB ------------------------------------------------------------
+innodb_buffer_pool_size  = {{ mysql_innodb_buffer_pool_size }}
+innodb_log_file_size     = 512M
+innodb_flush_log_at_trx_commit = 1        # full ACID durability; set to 2 only if you accept losing ~1s of txns on crash
+innodb_flush_method      = O_DIRECT
+innodb_file_per_table    = 1
+
+# --- Replication (GTID-based) -------------------------------------------
+gtid_mode                = {{ mysql_gtid_mode }}
+enforce_gtid_consistency = ON
+log_bin                  = /var/log/mysql/mysql-bin.log
+binlog_format             = {{ mysql_binlog_format }}
+binlog_expire_logs_seconds = {{ mysql_binlog_expire_logs_seconds }}
+sync_binlog               = 1
+read_only                 = {{ 'ON' if 'mysql_replica' in group_names else 'OFF' }}
+relay_log                 = /var/log/mysql/mysql-relay-bin
+
+# --- Logging -------------------------------------------------------------
+slow_query_log            = 1
+slow_query_log_file       = /var/log/mysql/mysql-slow.log
+long_query_time            = 2
+log_error                 = /var/log/mysql/error.log
+
+# --- Security --------------------------------------------------------------
+local_infile               = 0
+skip_name_resolve          = 1
+

roles/mysql/templates/root_my_cnf.j2

@@ -0,0 +1,4 @@
+[client]
+user = root
+password = "{{ mysql_root_password }}"
+

roles/prometheus-grafana/defaults/main.yml

@@ -4,3 +4,7 @@ dashboard_folders:
   - container
   - cache
   - server
+
+grafana_password: "{{ lookup('env', 'GRAFANA_PASSWORD') | default('change-me-password', true) }}"
+slack_webhook_url: "{{ lookup('env', 'SLACK_WEBHOOK_URL') | default('', true) }}"
+discord_webhook_url: "{{ lookup('env', 'DISCORD_WEBHOOK_URL') | default('', true }}"

roles/prometheus-grafana/tasks/grafana.yml

@@ -84,5 +84,5 @@
     networks:
       - name: monitoring
     env:
-      GF_SECURITY_ADMIN_PASSWORD: "{{ env_vars.GRAFANA_PASSWORD }}" # Customize the password
+      GF_SECURITY_ADMIN_PASSWORD: "{{ grafana_password }}" # Customize the password
 

roles/prometheus-grafana/tasks/main.yml

@@ -1,7 +1,4 @@
 ---
-# ensure we have variables from .env files
-- include_tasks: ../roles/env/tasks/main.yml
-
 - include_tasks: monitoring-network.yml
 - include_tasks: prometheus.yml
 - include_tasks: grafana.yml

roles/prometheus-grafana/templates/grafana-alerting/contactPoints.yml.j2

@@ -6,11 +6,11 @@ contactPoints:
         - uid: beeuk6rhszaiof
           type: slack
           settings:
-            url: {{ env_vars.SLACK_WEBHOOK_URL }}
+            url: {{ slack_webhook_url }}
           disableResolveMessage: false
         - uid: eewvrxp9d14w0a
           type: webhook
           settings:
             httpMethod: POST
-            url: {{ env_vars.DISCORD_WEBHOOK_URL }}
+            url: {{ discord_webhook_url }}
           disableResolveMessage: false 

roles/redis/defaults/main.yml

@@ -0,0 +1,41 @@
+---
+# --- Role / topology ---
+redis_role: "{{ lookup('env', 'REDIS_ROLE') | default('primary', true) }}"               # primary | replica
+redis_primary_host: "{{ lookup('env', 'REDIS_PRIMARY_HOST') | default('', true) }}"
+
+# --- Network ---
+redis_bind_addresses: "127.0.0.1 10.0.0.0/8"
+redis_bind_addresses: "0.0.0.0"
+redis_port: 6379
+redis_trusted_cidr: "{{ lookup('env', 'REDIS_ALLOWED_CIDR') | default('10.0.1.0/24', true) }}"
+
+# --- Auth (override via vault; do NOT commit plaintext) ---
+redis_password: "{{ lookup('env', 'REDIS_PASSWORD') | default('', false) }}"
+
+# --- Memory ---
+redis_maxmemory: "{{ lookup('env', 'REDIS_TOTAL_RAM_GB') | default('2', true) | int }}gb"
+redis_maxmemory_policy: "allkeys-lru"  # use "noeviction" if Redis is a source of truth
+
+# --- Persistence ---
+redis_appendonly: "yes"
+redis_appendfsync: "everysec"          # everysec | always | no
+
+# --- Dangerous command handling ---
+redis_disable_flushall: true
+redis_disable_flushdb: true
+redis_disable_debug: true
+redis_disable_keys: true
+redis_rename_config: true
+redis_rename_shutdown: true
+
+# --- Package ---
+redis_package_state: present
+
+# --- Limits ---
+redis_nofile_limit: 65536
+
+# TODO(kevinmidboe): just reference the certs acme.sh generates
+redis_tls_enabled: "{{ lookup('env', 'REDIS_TLS_ENABLED') | default('', false) }}"
+redis_tls_cert_path: ""
+redis_tls_key_path: ""
+redis_tls_ca_path: ""

roles/redis/handlers/main.yml

@@ -0,0 +1,20 @@
+---
+- name: Reload sysctl
+  ansible.builtin.command: sysctl -p /etc/sysctl.d/99-redis.conf
+  changed_when: false
+ 
+- name: Reload systemd
+  ansible.builtin.systemd:
+    daemon_reload: true
+ 
+- name: Enable and start disable-thp
+  ansible.builtin.systemd:
+    name: disable-thp.service
+    enabled: true
+    state: started
+ 
+- name: Restart redis
+  ansible.builtin.systemd:
+    name: redis-server
+    state: restarted
+ 

roles/redis/tasks/main.yml

@@ -0,0 +1,155 @@
+---
+- name: Update apt cache
+  ansible.builtin.apt:
+    update_cache: true
+    cache_valid_time: 3600
+  when: ansible_os_family == "Debian"
+
+- name: Install redis-server and firewall tooling
+  ansible.builtin.apt:
+    name:
+      - redis-server
+      - ufw
+    state: "{{ redis_package_state }}"
+
+- name: Ensure redis data/log/run directories exist with correct ownership
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+    owner: redis
+    group: redis
+    mode: "0750"
+  loop:
+    - /var/lib/redis
+    - /var/log/redis
+    - /run/redis
+
+# --- Kernel tuning ---
+- name: Apply sysctl tuning for Redis
+  ansible.builtin.copy:
+    dest: /etc/sysctl.d/99-redis.conf
+    content: |
+      vm.overcommit_memory = 1
+      vm.swappiness = 1
+      net.core.somaxconn = 511
+    mode: "0644"
+  notify: Reload sysctl
+
+- name: Disable Transparent Huge Pages via systemd unit
+  ansible.builtin.copy:
+    dest: /etc/systemd/system/disable-thp.service
+    content: |
+      [Unit]
+      Description=Disable Transparent Huge Pages (THP)
+      Before=redis-server.service
+
+      [Service]
+      Type=oneshot
+      ExecStart=/bin/sh -c 'echo never > /sys/kernel/mm/transparent_hugepage/enabled'
+      ExecStart=/bin/sh -c 'echo never > /sys/kernel/mm/transparent_hugepage/defrag'
+      RemainAfterExit=yes
+
+      [Install]
+      WantedBy=multi-user.target
+    mode: "0644"
+  notify:
+    - Reload systemd
+    - Enable and start disable-thp
+
+- name: Raise nofile limits for redis user
+  ansible.builtin.copy:
+    dest: /etc/security/limits.d/redis.conf
+    content: |
+      redis soft nofile {{ redis_nofile_limit }}
+      redis hard nofile {{ redis_nofile_limit }}
+    mode: "0644"
+
+- name: Add systemd override for redis-server (limits + restart policy)
+  ansible.builtin.file:
+    path: /etc/systemd/system/redis-server.service.d
+    state: directory
+    mode: "0755"
+
+- name: Deploy systemd override.conf
+  ansible.builtin.copy:
+    dest: /etc/systemd/system/redis-server.service.d/override.conf
+    content: |
+      [Service]
+      LimitNOFILE={{ redis_nofile_limit }}
+      Restart=always
+      RestartSec=5
+    mode: "0644"
+  notify:
+    - Reload systemd
+    - Restart redis
+
+# --- Main config ---
+- name: Deploy redis.conf from template
+  ansible.builtin.template:
+    src: redis.conf.j2
+    dest: /etc/redis/redis.conf
+    owner: redis
+    group: redis
+    mode: "0640"
+  notify: Restart redis
+
+- name: Deploy logrotate config
+  ansible.builtin.copy:
+    dest: /etc/logrotate.d/redis-server
+    content: |
+      /var/log/redis/redis-server.log {
+        weekly
+        rotate 8
+        compress
+        delaycompress
+        missingok
+        notifempty
+        create 640 redis redis
+      }
+    mode: "0644"
+
+# --- Firewall ---
+- name: Allow SSH through ufw
+  community.general.ufw:
+    rule: allow
+    name: OpenSSH
+
+- name: Allow Redis port from trusted CIDR only
+  community.general.ufw:
+    rule: allow
+    port: "{{ redis_port | string }}"
+    proto: tcp
+    src: "{{ redis_trusted_cidr }}"
+
+- name: Set default ufw policies
+  community.general.ufw:
+    state: enabled
+    policy: deny
+    direction: incoming
+
+- name: Allow outgoing traffic
+  community.general.ufw:
+    policy: allow
+    direction: outgoing
+
+# --- Service ---
+- name: Ensure redis-server is enabled and started
+  ansible.builtin.systemd:
+    name: redis-server
+    enabled: true
+    state: started
+    daemon_reload: true
+
+- name: Verify Redis responds to PING
+  ansible.builtin.command: >
+    redis-cli -a {{ redis_password }} --no-auth-warning
+    -h 127.0.0.1 -p {{ redis_port }} ping
+  register: redis_ping_result
+  changed_when: false
+  no_log: true
+
+- name: Assert Redis is healthy
+  ansible.builtin.assert:
+    that:
+      - "'PONG' in redis_ping_result.stdout"
+    fail_msg: "Redis did not respond with PONG after configuration."

roles/traefik/defaults/main.yml

@@ -4,11 +4,15 @@ traefik_web_port: 80
 traefik_websecure_port: 443
 traefik_dashboard_port: 8080
 traefik_metrics_port: 8100
-traefik_dashboard_insecure: true   # ufw should only allow from tailscale or vnet
 
-domain: "{{ lookup('env', 'DOMAIN') | default('', true) }}"
+traefik_image: "traefik:v3.1"
+traefik_dashboard_insecure: true   # ufw should only allow from tailscale or vnet
+traefik_acme_staging: "{{ lookup('env', 'TRAEFIK_ACME_STAGING') | default('false', true) }}"
+
+traefik_acme_email: "{{ lookup('env', 'TRAEFIK_ACME_EMAIL') | default('', true) }}"
+traefik_domain: "{{ lookup('env', 'DOMAIN') | default('', true) }}"
 # Single source of truth for static routing. Expected to be overridden
 # from group_vars, -e, or an env-var lookup at the play level — see
 # playbook.yml for the TRAEFIK_ROUTES example.
-traefik_web_private_ips: "{{ lookup('env', 'WEB_IPS') | default('[]', true) | from_json }}"
+traefik_web_private_ips: "{{ lookup('env', 'WEB_IPS') | from_json }}"
 traefik_analytics_private_ip: "{{ lookup('env', 'ANALYTICS_IP') | default('', true) }}"

roles/traefik/tasks/install.yml

@@ -5,7 +5,7 @@
       traefik_web_private_ips is empty. Set the WEB_IPS env var
       (JSON list) before running, or override the variable directly, e.g.
       -e traefik_web_private_ips='["10.0.1.11","10.0.1.12"]'
-  when: env_vars.WEB_IPS | length == 0
+  when: traefik_web_private_ips | length == 0
 
 - name: Ensure Traefik config directories exist
   ansible.builtin.file:

roles/traefik/templates/dynamic-analytics.yml.j2

@@ -3,18 +3,22 @@
 http:
   routers:
     analytics:
-      rule: "Host(`analytics.{{ env_vars.DOMAIN }}`)"
+      rule: "Host(`analytics.{{ traefik_domain }}`)"
       entryPoints:
         - websecure
       service: analytics-svc
       tls:
         certResolver: letsencrypt
+        domains:
+          - main: "analytics.{{ traefik_domain }}"
+            sans:
+              - "blog-1.{{ traefik_domain }}"
 
   services:
     analytics-svc:
       loadBalancer:
         servers:
-          - url: "http://{{ env_vars.ANALYTICS_IP }}:3000"
+          - url: "http://{{ traefik_analytics_private_ip }}:3000"
         healthCheck:
           path: /api/heartbeat
           interval: "10s"

roles/traefik/templates/dynamic-hosts.yml.j2

@@ -3,18 +3,26 @@
 http:
   routers:
     retailor-web:
-      rule: "Host(`app.{{ env_vars.DOMAIN }}`)"
+      rule: "Host(`app.{{ traefik_domain }}`)"
       service: retailor-web-svc
       entryPoints:
         - websecure
       tls:
         certResolver: letsencrypt
+        domains:
+          - main: "app.{{ traefik_domain }}"
+            sans:
+              - "blog-1.{{ traefik_domain }}"
 
   services:
     retailor-web-svc:
       loadBalancer:
         servers:
-{% for web_ip in env_vars.WEB_IPS | from_json %}
+{% for web_ip in traefik_web_private_ips %}
           - url: "http://{{ web_ip }}:80"
 {% endfor %}
+        healthCheck:
+          path: /health
+          interval: "10s"
+          timeout: "3s"
 

roles/traefik/templates/traefik.yml.j2

@@ -27,6 +27,9 @@ certificatesResolvers:
     acme:
       email: "{{ traefik_acme_email }}"
       storage: /etc/traefik/acme.json
+{% if traefik_acme_staging | bool %}
+      caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
+{% endif %}
       httpChallenge:
         entryPoint: web
 

roles/umami/defaults/main.yml

@@ -5,3 +5,33 @@ umami_python_docker_sdk_packages:
 
 umami_restart_policy: unless-stopped
 umami_docker_network: umami_net
+
+# --- Umami role ---
+umami_base_dir: "{{ lookup('env', 'UMAMI_BASE_DIR') | default('/opt/umami', true) }}"
+umami_image: "{{ lookup('env', 'UMAMI_IMAGE') | default('ghcr.io/umami-software/umami:latest', true) }}"
+umami_container_name: "{{ lookup('env', 'UMAMI_CONTAINER_NAME') | default('umami', true) }}"
+umami_port: "{{ lookup('env', 'UMAMI_PORT') | default('3000', true) }}"   # host port Umami will be exposed on
+
+# Address the umami_port is bound to on the host.
+# - "127.0.0.1" if your reverse proxy runs on this same host (loopback only)
+# - "0.0.0.0" if your reverse proxy is elsewhere (another host/container) and
+#   needs to reach this port over the network
+umami_bind_address: "{{ lookup('env', 'UMAMI_BIND_ADDRESS') | default('0.0.0.0', true) }}"
+umami_admin_password: "{{ lookup('env', 'UMAMI_ADMIN_PASSWORD') | default('', true) }}"
+
+# Postgres settings (used by the umami-db container)
+umami_db_container_name: "{{ lookup('env', 'UMAMI_DB_CONTAINER_NAME') | default('umami-db', true) }}"
+umami_db_image: "{{ lookup('env', 'UMAMI_DB_IMAGE') | default('postgres:15-alpine', true) }}"
+umami_db_name: "{{ lookup('env', 'UMAMI_DB_NAME') | default('umami', true) }}"
+umami_db_user: "{{ lookup('env', 'UMAMI_DB_USER') | default('umami', true) }}"
+
+# IMPORTANT: override this via the UMAMI_DB_PASSWORD environment variable,
+# inventory/vars, --extra-vars, or (better) Ansible Vault.
+# Do not leave the default password in production.
+umami_db_password: "{{ lookup('env', 'UMAMI_DB_PASSWORD') | default('', true) }}"
+
+# A random string used by Umami to encrypt/salt data. Generate your own, e.g.:
+#   openssl rand -hex 32
+# Override this in production via the UMAMI_APP_SECRET environment variable,
+# --extra-vars, or vault.
+umami_app_secret: "{{ lookup('env', 'UMAMI_APP_SECRET') | default('', true) }}"

roles/umami/tasks/main.yml

@@ -45,6 +45,19 @@
   retries: 5
   delay: 10
 
+- name: Generate bcrypt hash for Umami admin password
+  ansible.builtin.set_fact:
+    umami_admin_password_hash: "{{ umami_admin_password | password_hash('bcrypt', rounds=10) }}"
+  no_log: true
+
+- name: Update Umami admin password via psql inside the db container
+  community.docker.docker_container_exec:
+    container: "{{ umami_db_container_name }}"
+    command: >
+      psql -U {{ umami_db_user }} -d {{ umami_db_name }} -c
+      "UPDATE \"user\" SET password = '{{ umami_admin_password_hash }}' WHERE username = 'admin';"
+  no_log: true
+
 - name: Umami health check result
   ansible.builtin.debug:
     msg: "Umami is up and responding on port {{ umami_port }}."