From 3c21c5670c22d510bc593f713704a377bbf493f7 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 26 Sep 2020 14:49:38 +0100
Subject: [PATCH] Replace postgres with mariadb

Its' recommended, and might hopefully fix my annoying auth issues!
---
 .../files/nextcloud/config.php                |  6 ++--
 .../files/nextcloud/docker-compose.yml        | 29 +++++--------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/ansible/roles/intersect-docker/files/nextcloud/config.php b/ansible/roles/intersect-docker/files/nextcloud/config.php
index 2682c3e..105aaed 100644
--- a/ansible/roles/intersect-docker/files/nextcloud/config.php
+++ b/ansible/roles/intersect-docker/files/nextcloud/config.php
@@ -18,12 +18,12 @@ $CONFIG = array (
   array (
     0 => 'intersect.jakehoward.tech',
   ),
-  'dbtype' => 'pgsql',
+  'dbtype' => 'mysql',
   'version' => '19.0.3.1',
   'overwrite.cli.url' => 'https://intersect.jakehoward.tech',
   'dbname' => 'nextcloud',
-  'dbhost' => 'db',
-  'dbport' => '5432',
+  'dbhost' => 'mariadb',
+  'dbport' => '3306',
   'dbtableprefix' => 'oc_',
   'mysql.utf8mb4' => true,
   'dbuser' => 'nextcloud',
diff --git a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml
index 77cb096..0157cc9 100644
--- a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml
+++ b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - /mnt/media:/content:ro
     restart: unless-stopped
     depends_on:
-      - db
+      - mariadb
       - redis
       - collabora
     tmpfs:
@@ -28,29 +28,16 @@ services:
       - traefik.http.middlewares.nextcloud-hsts.headers.stsseconds=15552000
       - traefik.http.routers.nextcloud.middlewares=nextcloud-hsts@docker
 
-  db:
-    image: postgres:12-alpine
+  mariadb:
+    image: mariadb:10.5
     restart: unless-stopped
     volumes:
-      - /srv/nextcloud-postgres:/var/lib/postgresql/data
+      - /mnt/tank/dbs/mariadb/nextcloud:/var/lib/mysql
     environment:
-      - POSTGRES_PASSWORD=nextcloud
-      - POSTGRES_USER=nextcloud
-
-  db-backups:
-    image: prodrigestivill/postgres-backup-local:12-alpine
-    restart: unless-stopped
-    volumes:
-      - /mnt/scratch/db-backups:/backups
-    depends_on:
-      - db
-    environment:
-      - POSTGRES_HOST=db
-      - POSTGRES_PASSWORD=nextcloud
-      - POSTGRES_USER=nextcloud
-      - POSTGRES_DB=nextcloud
-      - BACKUP_KEEP_MONTHS=1
-      - BACKUP_KEEP_WEEKS=1
+      - MYSQL_ROOT_PASSWORD=nextcloud
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+      - MYSQL_PASSWORD=nextcloud
 
   redis:
     image: redis:6-alpine