Update owncloud and remove redis

BurnySc2 · Nov 30, 2023 · 910d44d · 910d44d
1 parent 3b94dce
commit 910d44d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 35 deletions.
diff --git a/ansible/service_owncloud/docker-compose.yml b/ansible/service_owncloud/docker-compose.yml
@@ -4,21 +4,14 @@ networks:
   '{{secrets.TRAFIK_NETWORK}}':
     external: true
 
-volumes:
-  files:
-    driver: local
-  mysql:
-    driver: local
-  redis:
-    driver: local
-
 services:
   owncloud:
     image: owncloud/server:latest
     container_name: owncloud_server
     hostname: owncloud_server
     networks:
     - '{{ secrets.TRAFIK_NETWORK }}'
+    restart: always
     labels:
     - traefik.enable=true
     - traefik.http.routers.{{ secrets.OWNCLOUD.USERNAME }}.rule=Host(`{{ secrets.OWNCLOUD.USERNAME }}.{{ secrets.MY_DOMAIN }}`)
@@ -28,22 +21,21 @@ services:
     - traefik.http.routers.{{ secrets.OWNCLOUD.USERNAME }}.middlewares=authelia@docker
     depends_on:
     - mariadb
-    - redis
     environment:
     - PUID="{{ USER_ID.stdout }}"
     - PGID="{{ GROUP_ID.stdout }}"
     - OWNCLOUD_DOMAIN={{ secrets.OWNCLOUD.USERNAME }}.{{ secrets.MY_DOMAIN }}
     - OWNCLOUD_TRUSTED_DOMAINS="localhost,{{ secrets.OWNCLOUD.USERNAME }}.{{ secrets.MY_DOMAIN }}
     - OWNCLOUD_DB_TYPE=mysql
-    - OWNCLOUD_DB_NAME=owncloud
-    - OWNCLOUD_DB_USERNAME=owncloud
-    - OWNCLOUD_DB_PASSWORD=owncloud
-    - OWNCLOUD_DB_HOST=mariadb
+    - OWNCLOUD_DB_NAME={{ secrets.OWNCLOUD.MYSQL_DATABASE }}
+    - OWNCLOUD_DB_USERNAME={{ secrets.OWNCLOUD.MYSQL_USER }}
+    - OWNCLOUD_DB_PASSWORD={{ secrets.OWNCLOUD.MYSQL_PASSWORD }}
+    - OWNCLOUD_DB_HOST=owncloud_mariadb
     - OWNCLOUD_ADMIN_USERNAME={{ secrets.OWNCLOUD.ADMIN_USERNAME }}
     - OWNCLOUD_ADMIN_PASSWORD={{ secrets.OWNCLOUD.ADMIN_PASSWORD }}
     - OWNCLOUD_MYSQL_UTF8MB4=true
-    - OWNCLOUD_REDIS_ENABLED=true
-    - OWNCLOUD_REDIS_HOST=redis
+    - OWNCLOUD_REDIS_ENABLED=false
+    - OWNCLOUD_REDIS_HOST=owncloud_redis
     healthcheck:
       test: [CMD, /usr/bin/healthcheck]
       interval: 30s
@@ -53,8 +45,10 @@ services:
     - ./data:/mnt/data
 
   mariadb:
-    image: mariadb:10.6 # minimum required ownCloud version is 10.9
+    image: mariadb:10.11 # minimum required ownCloud version is 10.9
     container_name: owncloud_mariadb
+    hostname: owncloud_mariadb
+    restart: always
     networks:
     - '{{ secrets.TRAFIK_NETWORK }}'
     environment:
@@ -69,18 +63,4 @@ services:
       timeout: 5s
       retries: 5
     volumes:
-    - mysql:/var/lib/mysql
-
-  redis:
-    image: redis:6
-    container_name: owncloud_redis
-    networks:
-    - '{{ secrets.TRAFIK_NETWORK }}'
-    command: [--databases, '1']
-    healthcheck:
-      test: [CMD, redis-cli, ping]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    volumes:
-    - redis:/data
+    - ./mysql:/var/lib/mysql
diff --git a/ansible/service_owncloud/owncloud_setup.yml b/ansible/service_owncloud/owncloud_setup.yml
@@ -70,7 +70,7 @@
     community.docker.docker_container:
       name: owncloud_mariadb
       state: absent
-      image: mariadb:10.6
+      image: mariadb:10.11
 
   - name: Remove cloud-redis container
     community.docker.docker_container:
@@ -89,7 +89,7 @@
     ansible.builtin.cron:
       name: Clean up trash
       job: docker exec owncloud_server occ trashbin:cleanup
-      special_time: hourly
+      special_time: daily
       user: '{{ USERNAME }}'
 
   - name: Scan once per day

diff --git a/ansible/service_paperless/docker-compose.yml b/ansible/service_paperless/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 services:
   broker:
     container_name: paperless-broker
-    hostname: broker
+    hostname: paperless-broker
     image: docker.io/library/redis:7
     restart: unless-stopped
     networks:
@@ -42,7 +42,7 @@ services:
     - ./consume:/usr/src/paperless/consume
     env_file: docker-compose.env
     environment:
-      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_REDIS: redis://paperless-broker:6379
       PAPERLESS_URL: https://{{ secrets.PAPERLESS.USERNAME }}.{{ secrets.MY_DOMAIN }}
       PAPERLESS_CSRF_TRUSTED_ORIGINS: https://{{ secrets.PAPERLESS.USERNAME }}.{{ secrets.MY_DOMAIN }}
       PAPERLESS_CORS_ALLOWED_HOSTS: https://{{ secrets.PAPERLESS.USERNAME }}.{{ secrets.MY_DOMAIN }}