refactor: update service configurations and remove karakeep service

2025-07-21 16:43:00 +02:00
parent 9a2952e192
commit 2a8dad2e20
14 changed files with 38 additions and 135 deletions
--- a/config/ansible/tasks/servers/server.yml
+++ b/config/ansible/tasks/servers/server.yml
@@ -46,10 +46,6 @@

  vars:
    services:
-      - name: karakeep
-        enabled: true
-        hosts:
-          - mennos-cloud-server
      - name: gitea
        enabled: true
        hosts:
@@ -61,15 +57,15 @@
      - name: factorio
        enabled: true
        hosts:
-          - mennos-cloud-server
+          - mennos-cachyos-desktop
      - name: dozzle
        enabled: true
        hosts:
-          - mennos-cloud-server
+          - mennos-cachyos-desktop
      - name: beszel
        enabled: true
        hosts:
-          - mennos-cloud-server
+          - mennos-cachyos-desktop
      - name: caddy
        enabled: true
        hosts:
--- a/config/ansible/tasks/servers/services/beszel/beszel.yml
+++ b/config/ansible/tasks/servers/services/beszel/beszel.yml
@@ -4,7 +4,7 @@
    - name: Set Beszel directories
      ansible.builtin.set_fact:
        beszel_service_dir: "{{ ansible_env.HOME }}/services/beszel"
-        beszel_data_dir: "/mnt/object_storage/services/beszel"
+        beszel_data_dir: "/mnt/services/beszel"

    - name: Create Beszel directory
      ansible.builtin.file:
--- a/config/ansible/tasks/servers/services/beszel/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/beszel/docker-compose.yml.j2
@@ -20,7 +20,7 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock:ro
    environment:
      LISTEN: /beszel_socket/beszel.sock
-      KEY: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA2e4Eg8BrcYOVZ5MaEdrxErM/HA4Tc0ANxPQNcCwFwY'
+      KEY: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKkSIQDh1vS8lG+2Uw/9dK1eOgCHVCgQfP+Bfk4XPkdn'

 networks:
  beszel-net:
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -29,17 +29,6 @@
 {% endif %}

 {% if inventory_hostname == 'mennos-cloud-server' %}
-karakeep.mvl.sh {
-   import country_block
-   reverse_proxy karakeep:3000
-   tls {{ caddy_email }}
-}
-
-hoarder.mvl.sh {
-   import country_block
-   redir https://karakeep.mvl.sh{uri}
-}
-
 git.vleeuwen.me git.mvl.sh {
   import country_block
   reverse_proxy gitea:3000
@@ -52,12 +41,6 @@ status.vleeuwen.me status.mvl.sh {
   tls {{ caddy_email }}
 }

-fsm.mvl.sh {
-   import country_block
-   reverse_proxy factorio-server-manager:80
-   tls {{ caddy_email }}
-}
-
 df.mvl.sh {
   import country_block
   redir / https://git.mvl.sh/vleeuwenmenno/dotfiles/raw/branch/master/setup.sh
@@ -65,6 +48,30 @@ df.mvl.sh {
 }

 {% elif inventory_hostname == 'mennos-cachyos-desktop' %}
+fsm.mvl.sh {
+   import country_block
+   reverse_proxy factorio-server-manager:80
+   tls {{ caddy_email }}
+}
+
+fsm.vleeuwen.me {
+   import country_block
+   redir https://fsm.mvl.sh{uri}
+   tls {{ caddy_email }}
+}
+
+beszel.mvl.sh {
+   import country_block
+   reverse_proxy beszel:8090
+   tls {{ caddy_email }}
+}
+
+beszel.vleeuwen.me {
+   import country_block
+   redir https://beszel.mvl.sh{uri}
+   tls {{ caddy_email }}
+}
+
 photos.mvl.sh {
   import country_block
   reverse_proxy immich:2283
--- a/config/ansible/tasks/servers/services/dozzle/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/dozzle/docker-compose.yml.j2
@@ -4,7 +4,7 @@ services:
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
    ports:
-      - 8585:8080
+      - 8686:8080
    environment:
      - DOZZLE_NO_ANALYTICS=true
    restart: unless-stopped
--- a/config/ansible/tasks/servers/services/dozzle/dozzle.yml
+++ b/config/ansible/tasks/servers/services/dozzle/dozzle.yml
@@ -4,7 +4,7 @@
    - name: Set Dozzle directories
      ansible.builtin.set_fact:
        dozzle_service_dir: "{{ ansible_env.HOME }}/services/dozzle"
-        dozzle_data_dir: "/mnt/object_storage/services/dozzle"
+        dozzle_data_dir: "/mnt/services/dozzle"

    - name: Create Dozzle directory
      ansible.builtin.file:
--- a/config/ansible/tasks/servers/services/echoip/echoip.yml
+++ b/config/ansible/tasks/servers/services/echoip/echoip.yml
@@ -4,7 +4,7 @@
    - name: Set EchoIP directories
      ansible.builtin.set_fact:
        echoip_service_dir: "{{ ansible_env.HOME }}/services/echoip"
-        echoip_data_dir: "{{ '/mnt/services/echoip' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/services/echoip' }}"
+        echoip_data_dir: "/mnt/services/echoip"
        maxmind_account_id: "{{ lookup('community.general.onepassword', 'MaxMind',
          vault='Dotfiles', field='account_id') | regex_replace('\\s+', '') }}"
        maxmind_license_key: "{{ lookup('community.general.onepassword', 'MaxMind',
--- a/config/ansible/tasks/servers/services/factorio/factorio.yml
+++ b/config/ansible/tasks/servers/services/factorio/factorio.yml
@@ -4,7 +4,7 @@
    - name: Set Factorio directories
      ansible.builtin.set_fact:
        factorio_service_dir: "{{ ansible_env.HOME }}/services/factorio"
-        factorio_data_dir: "/mnt/object_storage/services/factorio"
+        factorio_data_dir: "/mnt/services/factorio"

    - name: Create Factorio directory
      ansible.builtin.file:
--- a/config/ansible/tasks/servers/services/karakeep/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/karakeep/docker-compose.yml.j2
@@ -1,42 +0,0 @@
-services:
-  karakeep:
-    image: ghcr.io/karakeep-app/karakeep:${KARAKEEP_VERSION:-release}
-    restart: unless-stopped
-    volumes:
-      - {{ karakeep_data_dir }}/karakeep:/data
-    ports:
-      - 3500:3000
-    env_file:
-      - .env
-    networks:
-      - karakeep
-      - caddy_network
-
-  chrome:
-    image: zenika/alpine-chrome:124
-    restart: unless-stopped
-    command:
-      - --no-sandbox
-      - --disable-gpu
-      - --disable-dev-shm-usage
-      - --remote-debugging-address=0.0.0.0
-      - --remote-debugging-port=9222
-      - --hide-scrollbars
-    networks:
-      - karakeep
-
-  meilisearch:
-    image: getmeili/meilisearch:v1.13.3
-    restart: unless-stopped
-    env_file:
-      - .env
-    volumes:
-      - {{ karakeep_data_dir }}/meilisearch:/meili_data
-    networks:
-      - karakeep
-
-networks:
-  karakeep:
-  caddy_network:
-    external: true
-    name: caddy_default
--- a/config/ansible/tasks/servers/services/karakeep/dotenv.j2
+++ b/config/ansible/tasks/servers/services/karakeep/dotenv.j2
@@ -1,15 +0,0 @@
-KARAKEEP_VERSION=release
-MEILI_NO_ANALYTICS=true
-
-MEILI_ADDR=http://meilisearch:7700
-BROWSER_WEB_URL=http://chrome:9222
-
-DATA_DIR=/data
-
-TZ=Europe/Amsterdam
-PUID=1000
-PGID=100
-
-NEXTAUTH_SECRET="{{ lookup('community.general.onepassword', 'Kara Keep', vault='Dotfiles', field='NEXTAUTH_SECRET') }}"
-MEILI_MASTER_KEY="{{ lookup('community.general.onepassword', 'Kara Keep', vault='Dotfiles', field='MEILI_MASTER_KEY') }}"
-OPENAI_API_KEY="{{ lookup('community.general.onepassword', 'Kara Keep', vault='Dotfiles', field='OPENAI_API_KEY') }}"
--- a/config/ansible/tasks/servers/services/karakeep/karakeep.yml
+++ b/config/ansible/tasks/servers/services/karakeep/karakeep.yml
@@ -1,43 +0,0 @@
---
- name: Deploy Karakeep service
-  block:
-    - name: Set Karakeep directories
-      ansible.builtin.set_fact:
-        karakeep_data_dir: "/mnt/object_storage/services/karakeep"
-        karakeep_service_dir: "{{ ansible_env.HOME }}/services/karakeep"
-
-    - name: Create Karakeep directories
-      ansible.builtin.file:
-        path: "{{ karakeep_dir }}"
-        state: directory
-        mode: "0755"
-      loop:
-        - "{{ karakeep_data_dir }}"
-        - "{{ karakeep_service_dir }}"
-      loop_control:
-        loop_var: karakeep_dir
-
-    - name: Deploy Karakeep docker-compose.yml
-      ansible.builtin.template:
-        src: docker-compose.yml.j2
-        dest: "{{ karakeep_service_dir }}/docker-compose.yml"
-        mode: "0644"
-      register: karakeep_compose
-
-    - name: Deploy Karakeep .env
-      ansible.builtin.template:
-        src: dotenv.j2
-        dest: "{{ karakeep_service_dir }}/.env"
-        mode: "0644"
-      register: karakeep_compose
-
-    - name: Stop Karakeep service
-      ansible.builtin.command: docker compose -f "{{ karakeep_service_dir }}/docker-compose.yml" down --remove-orphans
-      when: karakeep_compose.changed
-
-    - name: Start Karakeep service
-      ansible.builtin.command: docker compose -f "{{ karakeep_service_dir }}/docker-compose.yml" up -d
-      when: karakeep_compose.changed
-  tags:
-    - services
-    - redis
--- a/config/ansible/tasks/servers/services/plex/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/plex/docker-compose.yml.j2
@@ -14,9 +14,9 @@ services:
    volumes:
      - {{ plex_data_dir }}/config:/config
      - {{ plex_data_dir }}/transcode:/transcode
-      - {{ '/mnt/data/movies' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/movies' }}:/movies
-      - {{ '/mnt/data/tvshows' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/tvshows' }}:/tvshows
-      - {{ '/mnt/data/music' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/music' }}:/music
+      - {{ '/mnt/data/movies' }}:/movies
+      - {{ '/mnt/data/tvshows' }}:/tvshows
+      - {{ '/mnt/data/music' }}:/music
    deploy:
      resources:
        reservations:
--- a/config/ansible/tasks/servers/services/plex/plex.yml
+++ b/config/ansible/tasks/servers/services/plex/plex.yml
@@ -3,7 +3,7 @@
  block:
    - name: Set Plex directories
      ansible.builtin.set_fact:
-        plex_data_dir: "{{ '/mnt/services/plex' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/services/plex' }}"
+        plex_data_dir: "/mnt/services/plex"
        plex_service_dir: "{{ ansible_env.HOME }}/services/plex"

    - name: Create Plex directories
--- a/config/ansible/tasks/servers/services/wireguard/wireguard.yml
+++ b/config/ansible/tasks/servers/services/wireguard/wireguard.yml
@@ -4,7 +4,7 @@
    - name: Set WireGuard directories
      ansible.builtin.set_fact:
        wireguard_service_dir: "{{ ansible_env.HOME }}/services/wireguard"
-        wireguard_data_dir: "/mnt/object_storage/services/wireguard"
+        wireguard_data_dir: "/mnt/services/wireguard"

    - name: Create WireGuard directory
      ansible.builtin.file: