diff --git a/ansible/roles/git/defaults/main.yml b/ansible/roles/git/defaults/main.yml index 56f2bd1..ac7f150 100644 --- a/ansible/roles/git/defaults/main.yml +++ b/ansible/roles/git/defaults/main.yml @@ -4,7 +4,7 @@ git_home: "/srv/{{ git_user }}" # Gitea configuration gitea_debyl_server_name: git.debyl.io -gitea_image: docker.gitea.com/gitea:1.25.2 +gitea_image: docker.gitea.com/gitea:1.26.1 gitea_db_image: docker.io/library/postgres:14-alpine # Skudak Gitea configuration diff --git a/ansible/roles/podman/defaults/main.yml b/ansible/roles/podman/defaults/main.yml index e8f62d4..b38ed17 100644 --- a/ansible/roles/podman/defaults/main.yml +++ b/ansible/roles/podman/defaults/main.yml @@ -8,7 +8,6 @@ debyltech_path: "{{ podman_volumes }}/debyltech" factorio_path: "{{ podman_volumes }}/factorio" fulfillr_path: "{{ podman_volumes }}/fulfillr" fulfillr_cases_table: "debyltech-cases-prod" -n8n_path: "{{ podman_volumes }}/n8n" gregtime_path: "{{ podman_volumes }}/gregtime" searxng_path: "{{ podman_volumes }}/searxng" hass_path: "{{ podman_volumes }}/hass" @@ -16,6 +15,7 @@ hass_path: "{{ podman_volumes }}/hass" # nosql_path: removed - nosql/redis no longer used partkeepr_path: "{{ podman_volumes }}/partkeepr" partsy_path: "{{ podman_volumes }}/partsy" +partsy_skudak_path: "{{ podman_volumes }}/partsy-skudak" photos_path: "{{ podman_volumes }}/photos" uptime_kuma_path: "{{ podman_volumes }}/uptime-kuma" uptime_kuma_personal_path: "{{ podman_volumes }}/uptime-kuma-personal" @@ -79,7 +79,6 @@ bookstack_server_name: wiki.skudakrennsport.com cloud_server_name: cloud.bdebyl.net cloud_skudak_server_name: cloud.skudakrennsport.com fulfillr_server_name: fulfillr.debyltech.com -n8n_server_name: n8n.debyl.io home_server_name: home.debyl.io uptime_kuma_server_name: uptime.debyltech.com uptime_kuma_personal_server_name: uptime.debyl.io @@ -96,7 +95,9 @@ photos_server_name_io: photos.debyl.io gitea_debyl_server_name: git.debyl.io # skudak.com domains (migration from skudakrennsport.com) +parts_skudak_server_name: parts.skudak.com bookstack_server_name_new: wiki.skudak.com +# partsy_skudak_admin_password: defined in vault cloud_skudak_server_name_new: cloud.skudak.com gitea_skudak_server_name: git.skudak.com @@ -158,7 +159,6 @@ caddy_log_names: - gitea-debyl - gitea-skudak - fulfillr - - n8n # GeoIP configuration for Graylog # Requires free MaxMind account: https://dev.maxmind.com/geoip/geolite2-free-geolocation-data diff --git a/ansible/roles/podman/tasks/containers/debyltech/n8n.yml b/ansible/roles/podman/tasks/containers/debyltech/n8n.yml deleted file mode 100644 index ef056ab..0000000 --- a/ansible/roles/podman/tasks/containers/debyltech/n8n.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- name: create n8n host directory volumes - become: true - ansible.builtin.file: - path: "{{ item }}" - state: directory - owner: "{{ podman_user }}" - group: "{{ podman_user }}" - mode: 0755 - notify: restorecon podman - loop: - - "{{ n8n_path }}" - -- name: set n8n volume ownership for node user - become: true - become_user: "{{ podman_user }}" - ansible.builtin.command: - cmd: podman unshare chown -R 1000:1000 {{ n8n_path }} - changed_when: false - -- name: flush handlers - ansible.builtin.meta: flush_handlers - -- import_tasks: podman/podman-check.yml - vars: - container_name: n8n - container_image: "{{ image }}" - -- name: create n8n container - become: true - become_user: "{{ podman_user }}" - containers.podman.podman_container: - name: n8n - image: "{{ image }}" - image_strict: true - restart_policy: on-failure:3 - log_driver: journald - network: shared - volumes: - - "{{ n8n_path }}:/home/node/.n8n" - ports: - - 5678:5678/tcp - env: - N8N_HOST: "{{ n8n_server_name }}" - N8N_PORT: "5678" - N8N_PROTOCOL: https - WEBHOOK_URL: "https://{{ n8n_server_name }}/" - N8N_SECURE_COOKIE: "true" - GENERIC_TIMEZONE: America/New_York - -- name: create systemd startup job for n8n - include_tasks: podman/systemd-generate.yml - vars: - container_name: n8n diff --git a/ansible/roles/podman/tasks/main.yml b/ansible/roles/podman/tasks/main.yml index 131b2a1..1b0559c 100644 --- a/ansible/roles/podman/tasks/main.yml +++ b/ansible/roles/podman/tasks/main.yml @@ -14,7 +14,7 @@ - import_tasks: containers/base/caddy.yml vars: - image: docker.io/library/caddy:2.10.2 + image: docker.io/library/caddy:2.11.2 tags: - caddy - web @@ -31,7 +31,7 @@ - import_tasks: containers/home/hass.yml vars: - image: ghcr.io/home-assistant/home-assistant:2026.1 + image: ghcr.io/home-assistant/home-assistant:2026.5.1 tags: hass - import_tasks: containers/home/partkeepr.yml @@ -45,18 +45,23 @@ image: "git.debyl.io/debyltech/partsy:latest" tags: partsy +- import_tasks: containers/skudak/partsy.yml + vars: + image: "git.debyl.io/debyltech/partsy:latest" + tags: skudak, partsy-skudak + - import_tasks: containers/skudak/wiki.yml vars: db_image: docker.io/library/mysql:5.7.21 - image: docker.io/solidnerd/bookstack:25.7 + image: docker.io/solidnerd/bookstack:26.3.4 tags: skudak, skudak-wiki - import_tasks: containers/home/photos.yml vars: db_image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0 - ml_image: ghcr.io/immich-app/immich-machine-learning:v2.5.0 + ml_image: ghcr.io/immich-app/immich-machine-learning:v2.7.5 redis_image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8 - image: ghcr.io/immich-app/immich-server:v2.5.0 + image: ghcr.io/immich-app/immich-server:v2.7.5 tags: photos - import_tasks: containers/home/cloud.yml @@ -76,19 +81,14 @@ image: git.debyl.io/debyltech/fulfillr:20260509.2150 tags: debyltech, fulfillr -- import_tasks: containers/debyltech/n8n.yml - vars: - image: docker.io/n8nio/n8n:2.11.3 - tags: debyltech, n8n - - import_tasks: containers/debyltech/uptime-kuma.yml vars: - image: docker.io/louislam/uptime-kuma:2.0.2 + image: docker.io/louislam/uptime-kuma:2.3.2 tags: debyltech, uptime-debyltech - import_tasks: containers/home/uptime-kuma.yml vars: - image: docker.io/louislam/uptime-kuma:2.0.2 + image: docker.io/louislam/uptime-kuma:2.3.2 tags: home, uptime - import_tasks: data/geoip.yml @@ -108,7 +108,7 @@ - import_tasks: containers/home/gregtime.yml vars: - image: localhost/greg-time-bot:3.4.3 + image: localhost/greg-time-bot:3.6.5 tags: gregtime - import_tasks: containers/home/zomboid.yml diff --git a/ansible/roles/podman/templates/caddy/Caddyfile.j2 b/ansible/roles/podman/templates/caddy/Caddyfile.j2 index 20ebbd6..7161dac 100644 --- a/ansible/roles/podman/templates/caddy/Caddyfile.j2 +++ b/ansible/roles/podman/templates/caddy/Caddyfile.j2 @@ -159,6 +159,16 @@ } } +# Partsy Skudak (authenticated) - {{ parts_skudak_server_name }} +{{ parts_skudak_server_name }} { + import common_headers + reverse_proxy localhost:8082 + log { + output file /var/log/caddy/parts-skudak.log + format json + } +} + # Uptime Kuma (Debyltech) - {{ uptime_kuma_server_name }} {{ uptime_kuma_server_name }} { {{ ip_restricted_site() }} @@ -332,23 +342,6 @@ } } -# N8N Workflow Automation - {{ n8n_server_name }} -{{ n8n_server_name }} { -{{ ip_restricted_site() }} - - handle @local { - import common_headers - reverse_proxy localhost:5678 { - flush_interval -1 - } - } - - log { - output file {{ caddy_log_path }}/n8n.log - format {{ caddy_log_format }} - } -} - # Fulfillr - {{ fulfillr_server_name }} (Static + API with IP restrictions) {{ fulfillr_server_name }} { {{ ip_restricted_site() }}