Merge branch 'master' of ssh://git.mvl.sh/vleeuwenmenno/dotfiles

remove stash, add bazarr, add cloudreve
2025-09-23 16:16:09 +02:00 · 2025-09-23 16:13:09 +02:00
10 changed files with 195 additions and 107 deletions
--- a/ansible/tasks/servers/server.yml
+++ b/ansible/tasks/servers/server.yml
@@ -115,10 +115,6 @@
        enabled: true
        hosts:
          - mennos-desktop
-      - name: stash
-        enabled: true
-        hosts:
-          - mennos-desktop
      - name: downloaders
        enabled: true
        hosts:
@@ -131,6 +127,10 @@
        enabled: true
        hosts:
          - mennos-desktop
+      - name: cloudreve
+        enabled: true
+        hosts:
+          - mennos-desktop
      - name: echoip
        enabled: true
        hosts:
@@ -152,6 +152,6 @@
        hosts:
          - mennos-desktop
      - name: avorion
-        enabled: true
+        enabled: false
        hosts:
          - mennos-desktop
--- a/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2
+++ b/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2
@@ -44,18 +44,19 @@ services:
        limits:
          memory: 2G

-  whisparr:
-    image: ghcr.io/hotio/whisparr:latest
+  bazarr:
+    image: ghcr.io/hotio/bazarr:latest
+    container_name: bazarr
    environment:
      - PUID=1000
      - PGID=100
      - TZ=Europe/Amsterdam
    ports:
-      - 6969:6969
+      - 6767:6767
    extra_hosts:
      - host.docker.internal:host-gateway
    volumes:
-      - {{ arr_stack_data_dir }}/whisparr-config:/config
+      - {{ arr_stack_data_dir }}/bazarr-config:/config
      - /mnt/data:/mnt/data
    restart: unless-stopped
    networks:
@@ -63,7 +64,7 @@ services:
    deploy:
      resources:
        limits:
-          memory: 2G
+          memory: 512M

  prowlarr:
    container_name: prowlarr
--- a/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -189,6 +189,30 @@ tautulli.vleeuwen.me {
   tls {{ caddy_email }}
 }

+cloud.mvl.sh {
+   import country_block
+   reverse_proxy cloudreve:5212 {
+       header_up Host {host}
+       header_up X-Real-IP {http.request.remote.host}
+   }
+   tls {{ caddy_email }}
+}
+
+cloud.vleeuwen.me {
+  import country_block
+  redir https://cloud.mvl.sh{uri}
+  tls {{ caddy_email }}
+}
+
+collabora.mvl.sh {
+  import country_block
+  reverse_proxy collabora:9980 {
+    header_up Host {host}
+    header_up X-Real-IP {http.request.remote.host}
+  }
+  tls {{ caddy_email }}
+}
+
 drive.mvl.sh drive.vleeuwen.me {
   import country_block

--- a/ansible/tasks/servers/services/dashy/conf.yml.j2
+++ b/ansible/tasks/servers/services/dashy/conf.yml.j2
@@ -259,16 +259,6 @@ sections:
          - do
          - discount
          - work
-  - name: Other
-    items:
-      - title: Whisparr
-        icon: http://mennos-desktop:4000/assets/whisparr.svg
-        url: http://go/whisparr
-        id: 0_514_whisparr
-      - title: Stash
-        icon: http://mennos-desktop:4000/assets/stash.svg
-        url: http://go/stash
-        id: 1_514_stash
    displayData:
      sortBy: default
      rows: 1
--- a/ansible/tasks/servers/services/stash/stash.yml
+++ b/ansible/tasks/servers/services/stash/stash.yml
@@ -1,37 +0,0 @@
---
- name: Deploy Stash service
-  block:
-    - name: Set Stash directories
-      ansible.builtin.set_fact:
-        stash_data_dir: "/mnt/data/stash"
-        stash_config_dir: "/mnt/services/stash"
-        stash_service_dir: "{{ ansible_env.HOME }}/.services/stash"
-
-    - name: Create Stash directories
-      ansible.builtin.file:
-        path: "{{ stash_dir }}"
-        state: directory
-        mode: "0755"
-      loop:
-        - "{{ stash_data_dir }}"
-        - "{{ stash_service_dir }}"
-      loop_control:
-        loop_var: stash_dir
-
-    - name: Deploy Stash docker-compose.yml
-      ansible.builtin.template:
-        src: docker-compose.yml.j2
-        dest: "{{ stash_service_dir }}/docker-compose.yml"
-        mode: "0644"
-      register: stash_compose
-
-    - name: Stop Stash service
-      ansible.builtin.command: docker compose -f "{{ stash_service_dir }}/docker-compose.yml" down --remove-orphans
-      when: stash_compose.changed
-
-    - name: Start Stash service
-      ansible.builtin.command: docker compose -f "{{ stash_service_dir }}/docker-compose.yml" up -d
-      when: stash_compose.changed
-  tags:
-    - services
-    - stash
--- a/config/ansible/tasks/servers/services/cloudreve/cloudreve.yml
+++ b/config/ansible/tasks/servers/services/cloudreve/cloudreve.yml
@@ -0,0 +1,31 @@
+---
+- name: Deploy Cloudreve service
+  block:
+    - name: Set Cloudreve directories
+      ansible.builtin.set_fact:
+        cloudreve_service_dir: "{{ ansible_env.HOME }}/.services/cloudreve"
+        cloudreve_data_dir: "/mnt/services/cloudreve"
+
+    - name: Create Cloudreve directory
+      ansible.builtin.file:
+        path: "{{ cloudreve_service_dir }}"
+        state: directory
+        mode: "0755"
+
+    - name: Deploy Cloudreve docker-compose.yml
+      ansible.builtin.template:
+        src: docker-compose.yml.j2
+        dest: "{{ cloudreve_service_dir }}/docker-compose.yml"
+        mode: "0644"
+      register: cloudreve_compose
+
+    - name: Stop Cloudreve service
+      ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" down --remove-orphans
+      when: cloudreve_compose.changed
+
+    - name: Start Cloudreve service
+      ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" up -d
+      when: cloudreve_compose.changed
+  tags:
+    - services
+    - cloudreve
--- a/config/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2
@@ -0,0 +1,63 @@
+services:
+  cloudreve:
+    image: cloudreve/cloudreve:latest
+    depends_on:
+      - postgresql
+      - redis
+    restart: always
+    ports:
+      - 5212:5212
+    networks:
+      - caddy_network
+      - cloudreve
+    environment:
+      - CR_CONF_Database.Type=postgres
+      - CR_CONF_Database.Host=postgresql
+      - CR_CONF_Database.User=cloudreve
+      - CR_CONF_Database.Name=cloudreve
+      - CR_CONF_Database.Port=5432
+      - CR_CONF_Redis.Server=redis:6379
+    volumes:
+      - {{ cloudreve_data_dir }}/data:/cloudreve/data
+
+  postgresql:
+    image: postgres:17
+    environment:
+      - POSTGRES_USER=cloudreve
+      - POSTGRES_DB=cloudreve
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    networks:
+      - cloudreve
+    volumes:
+      - {{ cloudreve_data_dir }}/postgres:/var/lib/postgresql/data
+
+  collabora:
+    image: collabora/code
+    restart: unless-stopped
+    ports:
+      - 9980:9980
+    environment:
+      - domain=collabora\\.mvl\\.sh
+      - username=admin
+      - password=Dt3hgIJOPr3rgh
+      - dictionaries=en_US
+      - TZ=Europe/Amsterdam
+      - extra_params=--o:ssl.enable=false --o:ssl.termination=true
+    networks:
+      - cloudreve
+      - caddy_network
+
+  redis:
+    image: redis:latest
+    networks:
+      - cloudreve
+    volumes:
+      - {{ cloudreve_data_dir }}/redis:/data
+
+networks:
+  cloudreve:
+    name: cloudreve
+    driver: bridge
+  caddy_network:
+    name: caddy_default
+    external: true
--- a/config/ansible/tasks/servers/services/qdrant/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/qdrant/docker-compose.yml.j2
@@ -0,0 +1,17 @@
+services:
+  qdrant:
+    image: qdrant/qdrant:latest
+    restart: always
+    ports:
+      - 6333:6333
+      - 6334:6334
+    expose:
+      - 6333
+      - 6334
+      - 6335
+    volumes:
+      - /mnt/services/qdrant:/qdrant/storage
+    deploy:
+      resources:
+        limits:
+          memory: 2G
--- a/config/ansible/tasks/servers/services/qdrant/qdrant.yml
+++ b/config/ansible/tasks/servers/services/qdrant/qdrant.yml
@@ -0,0 +1,31 @@
+---
+- name: Deploy Qdrant service
+  block:
+    - name: Set Qdrant directories
+      ansible.builtin.set_fact:
+        qdrant_service_dir: "{{ ansible_env.HOME }}/.services/qdrant"
+        qdrant_data_dir: "/mnt/services/qdrant"
+
+    - name: Create Qdrant directory
+      ansible.builtin.file:
+        path: "{{ qdrant_service_dir }}"
+        state: directory
+        mode: "0755"
+
+    - name: Deploy Qdrant docker-compose.yml
+      ansible.builtin.template:
+        src: docker-compose.yml.j2
+        dest: "{{ qdrant_service_dir }}/docker-compose.yml"
+        mode: "0644"
+      register: qdrant_compose
+
+    - name: Stop Qdrant service
+      ansible.builtin.command: docker compose -f "{{ qdrant_service_dir }}/docker-compose.yml" down --remove-orphans
+      when: qdrant_compose.changed
+
+    - name: Start Qdrant service
+      ansible.builtin.command: docker compose -f "{{ qdrant_service_dir }}/docker-compose.yml" up -d
+      when: qdrant_compose.changed
+  tags:
+    - services
+    - qdrant
--- a/config/zed.json
+++ b/config/zed.json
@@ -10,21 +10,8 @@
  // #############################################
  // ## Theming                                 ##
  // #############################################
-  "context_servers": {
-    "mcp-server-context7": {
-      "source": "extension",
-      "enabled": true,
-      "settings": {
-        "default_minimum_tokens": "10000"
-      }
-    },
-    "mcp-server-brave-search": {
-      "source": "extension",
-      "enabled": true,
-      "settings": {
-        "brave_api_key": "BSAEoMzaMsFQWIfrDSs2SkmUExIDN-5"
-      }
-    }
+  "features": {
+    "edit_prediction_provider": "copilot"
  },
  "telemetry": {
    "diagnostics": false,
@@ -35,45 +22,30 @@
      "host": "desktop",
      "projects": [
        {
-          "paths": ["/home/menno"]
-        },
-        {
-          "paths": ["/home/menno/.dotfiles"]
-        },
-        {
-          "paths": ["/mnt/services/dashy"]
-        }
-      ],
-      "nickname": "Menno's Desktop PC"
-    },
-    {
-      "host": "salt.dev",
-      "projects": []
-    },
-    {
-      "host": "salt.dev",
-      "username": "salt",
-      "projects": [
-        {
-          "paths": ["/home/salt/releases/current"]
+          "paths": [
+            "/home/menno/.dotfiles"
+          ]
        }
      ]
    },
    {
-      "host": "vps",
+      "host": "salt.dev-via-laptop",
+      "username": "salt",
      "projects": [
        {
-          "paths": ["/home/menno"]
-        },
-        {
-          "paths": ["/home/menno/.dotfiles/./"]
+          "paths": [
+            "/home/salt/releases"
+          ]
        }
      ]
    }
  ],
  "icon_theme": "VSCode Icons (Dark)",
  "ui_font_size": 16,
-  "buffer_font_size": 16,
+  "buffer_font_size": 14,
+  "terminal": {
+    "font_size": 14
+  },
  "minimap": {
    "show": "always",
    "thumb": "hover",
@@ -96,7 +68,6 @@
  "toolbar": {
    "code_actions": true
  },
-
  // #############################################
  // ## Preferences                             ##
  // #############################################
@@ -113,13 +84,11 @@
    "enabled": true,
    "show_parameter_hints": true
  },
-
  // #############################################
  // ## AI Stuff                                ##
  // #############################################
  "agent": {
    "always_allow_tool_actions": true,
-    "play_sound_when_agent_done": false,
    "default_profile": "write",
    "model_parameters": [],
    "default_model": {
@@ -140,7 +109,6 @@
      "**/secrets/**"
    ]
  },
-
  // #############################################
  // ## Extensions                              ##
  // #############################################
@@ -151,13 +119,14 @@
    "docker-compose": true,
    "golang": true
  },
-
  // #############################################
  // ## Languages                               ##
  // #############################################
  "languages": {
    "PHP": {
-      "language_servers": ["phptools"]
+      "language_servers": [
+        "phptools"
+      ]
    },
    "Dart": {
      "code_actions_on_format": {
@@ -165,7 +134,6 @@
      }
    }
  },
-
  "lsp": {
    "phptools": {
      "initialization_options": {
@@ -173,4 +141,4 @@
      }
    }
  }
-}
+}
Author	SHA1	Message	Date
Menno van Leeuwen	6fcabcd1f3	Merge branch 'master' of ssh://git.mvl.sh/vleeuwenmenno/dotfiles Some checks failed Ansible Lint Check / check-ansible (push) Failing after 11s Details Nix Format Check / check-format (push) Successful in 1m17s Details Python Lint Check / check-python (push) Failing after 8s Details	2025-09-23 16:16:09 +02:00
Menno van Leeuwen	3e25210f4c	remove stash, add bazarr, add cloudreve	2025-09-23 16:13:09 +02:00