From a55369070dbe1b1843307725297469005e94095c Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Thu, 11 Dec 2025 11:52:26 +0100 Subject: [PATCH] Remove Nextcloud, Cloudreve, and Stash services --- ansible/tasks/servers/server.yml | 17 ++--- .../servers/services/cloudreve/cloudreve.yml | 32 -------- .../services/cloudreve/docker-compose.yml.j2 | 67 ----------------- .../services/nextcloud/docker-compose.yml.j2 | 73 ------------------- .../servers/services/nextcloud/nextcloud.yml | 31 -------- .../services/stash/docker-compose.yml.j2 | 41 ----------- 6 files changed, 5 insertions(+), 256 deletions(-) delete mode 100644 ansible/tasks/servers/services/cloudreve/cloudreve.yml delete mode 100644 ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2 delete mode 100644 ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2 delete mode 100644 ansible/tasks/servers/services/nextcloud/nextcloud.yml delete mode 100644 ansible/tasks/servers/services/stash/docker-compose.yml.j2 diff --git a/ansible/tasks/servers/server.yml b/ansible/tasks/servers/server.yml index 8c34b7f..fc0338a 100644 --- a/ansible/tasks/servers/server.yml +++ b/ansible/tasks/servers/server.yml @@ -113,14 +113,6 @@ enabled: true hosts: - mennos-server - - name: nextcloud - enabled: true - hosts: - - mennos-server - - name: cloudreve - enabled: false - hosts: - - mennos-server - name: echoip enabled: true hosts: @@ -141,14 +133,15 @@ enabled: true hosts: - mennos-server - - name: avorion - enabled: false - hosts: - - mennos-server - name: sathub enabled: true hosts: - mennos-server + # Game Servers + - name: avorion + enabled: false + hosts: + - mennos-server - name: necesse enabled: true hosts: diff --git a/ansible/tasks/servers/services/cloudreve/cloudreve.yml b/ansible/tasks/servers/services/cloudreve/cloudreve.yml deleted file mode 100644 index a201048..0000000 --- a/ansible/tasks/servers/services/cloudreve/cloudreve.yml +++ /dev/null @@ -1,32 +0,0 @@ -- name: Deploy Cloudreve service - tags: - - services - - cloudreve - 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 - changed_when: false - when: cloudreve_compose.changed - - - name: Start Cloudreve service - ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" up -d - changed_when: false - when: cloudreve_compose.changed diff --git a/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2 b/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2 deleted file mode 100644 index 43b7196..0000000 --- a/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2 +++ /dev/null @@ -1,67 +0,0 @@ -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 - deploy: - resources: - limits: - memory: 1G - - 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 diff --git a/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2 b/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2 deleted file mode 100644 index 6371808..0000000 --- a/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2 +++ /dev/null @@ -1,73 +0,0 @@ -services: - nextcloud: - image: nextcloud - container_name: nextcloud - restart: unless-stopped - networks: - - nextcloud - - caddy_network - depends_on: - - nextclouddb - - redis - ports: - - 8081:80 - volumes: - - {{ nextcloud_data_dir }}/nextcloud/html:/var/www/html - - {{ nextcloud_data_dir }}/nextcloud/custom_apps:/var/www/html/custom_apps - - {{ nextcloud_data_dir }}/nextcloud/config:/var/www/html/config - - {{ nextcloud_data_dir }}/nextcloud/data:/var/www/html/data - environment: - - PUID=1000 - - PGID=100 - - TZ=Europe/Amsterdam - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - MYSQL_PASSWORD={{ lookup('community.general.onepassword', 'Nextcloud', vault='Dotfiles', field='MYSQL_NEXTCLOUD_PASSWORD') }} - - MYSQL_HOST=nextclouddb - - REDIS_HOST=redis - deploy: - resources: - limits: - memory: 2G - - nextclouddb: - image: mariadb:11.4.7 - container_name: nextcloud-db - restart: unless-stopped - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW - networks: - - nextcloud - volumes: - - {{ nextcloud_data_dir }}/database:/var/lib/mysql - environment: - - PUID=1000 - - PGID=100 - - TZ=Europe/Amsterdam - - MYSQL_RANDOM_ROOT_PASSWORD=true - - MYSQL_PASSWORD={{ lookup('community.general.onepassword', 'Nextcloud', vault='Dotfiles', field='MYSQL_NEXTCLOUD_PASSWORD') }} - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - deploy: - resources: - limits: - memory: 1G - - redis: - image: redis:alpine - container_name: redis - volumes: - - {{ nextcloud_data_dir }}/redis:/data - networks: - - nextcloud - deploy: - resources: - limits: - memory: 512M - -networks: - nextcloud: - name: nextcloud - driver: bridge - caddy_network: - name: caddy_default - external: true diff --git a/ansible/tasks/servers/services/nextcloud/nextcloud.yml b/ansible/tasks/servers/services/nextcloud/nextcloud.yml deleted file mode 100644 index 5308554..0000000 --- a/ansible/tasks/servers/services/nextcloud/nextcloud.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- name: Deploy Nextcloud service - block: - - name: Set Nextcloud directories - ansible.builtin.set_fact: - nextcloud_service_dir: "{{ ansible_env.HOME }}/.services/nextcloud" - nextcloud_data_dir: "/mnt/services/nextcloud" - - - name: Create Nextcloud directory - ansible.builtin.file: - path: "{{ nextcloud_service_dir }}" - state: directory - mode: "0755" - - - name: Deploy Nextcloud docker-compose.yml - ansible.builtin.template: - src: docker-compose.yml.j2 - dest: "{{ nextcloud_service_dir }}/docker-compose.yml" - mode: "0644" - register: nextcloud_compose - - - name: Stop Nextcloud service - ansible.builtin.command: docker compose -f "{{ nextcloud_service_dir }}/docker-compose.yml" down --remove-orphans - when: nextcloud_compose.changed - - - name: Start Nextcloud service - ansible.builtin.command: docker compose -f "{{ nextcloud_service_dir }}/docker-compose.yml" up -d - when: nextcloud_compose.changed - tags: - - services - - nextcloud diff --git a/ansible/tasks/servers/services/stash/docker-compose.yml.j2 b/ansible/tasks/servers/services/stash/docker-compose.yml.j2 deleted file mode 100644 index 649b1a0..0000000 --- a/ansible/tasks/servers/services/stash/docker-compose.yml.j2 +++ /dev/null @@ -1,41 +0,0 @@ -services: - stash: - image: stashapp/stash:latest - container_name: stash - restart: unless-stopped - ports: - - "9999:9999" - environment: - - PUID=1000 - - PGID=1000 - - STASH_STASH=/data/ - - STASH_GENERATED=/generated/ - - STASH_METADATA=/metadata/ - - STASH_CACHE=/cache/ - - STASH_PORT=9999 - volumes: - - /etc/localtime:/etc/localtime:ro - ## Point this at your collection. - - {{ stash_data_dir }}:/data - - ## Keep configs, scrapers, and plugins here. - - {{ stash_config_dir }}/config:/root/.stash - ## This is where your stash's metadata lives - - {{ stash_config_dir }}/metadata:/metadata - ## Any other cache content. - - {{ stash_config_dir }}/cache:/cache - ## Where to store binary blob data (scene covers, images) - - {{ stash_config_dir }}/blobs:/blobs - ## Where to store generated content (screenshots,previews,transcodes,sprites) - - {{ stash_config_dir }}/generated:/generated - networks: - - caddy_network - deploy: - resources: - limits: - memory: 2G - -networks: - caddy_network: - external: true - name: caddy_default