From 503ac75d7c8afac18bf6098c46029a4ce1249d0f Mon Sep 17 00:00:00 2001
From: Eorn <eorn@goe.land>
Date: Wed, 22 Jul 2020 11:34:11 +0200
Subject: [PATCH] updates

---
 .gitignore                          |  9 ++++++++-
 apps/bitwardenrs/docker-compose.yml |  2 +-
 apps/freshrss/docker-compose.yml    |  2 +-
 apps/gitea/docker-compose.yml       |  2 +-
 apps/isso/docker-compose.yml        |  2 +-
 apps/matrix/docker-compose.yml      |  6 +++---
 apps/nextcloud/Dockerfile           | 12 ++++++++++--
 apps/pleroma/Dockerfile             |  2 +-
 config/borg/config.yaml             |  4 ++++
 9 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8b2012..f358686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,11 @@ certs/
 secret.exs
 
 # The rest
-apps/nextcloud/config
+#apps/nextcloud/config
+apps/mailu/certs
+apps/mailu/dkim
+apps/mailu/filter
+apps/mailu/mail
+apps/mailu/mailu.env
+apps/mailu/overrides
+apps/mailu/webmail
diff --git a/apps/bitwardenrs/docker-compose.yml b/apps/bitwardenrs/docker-compose.yml
index fa4c749..b2276d7 100644
--- a/apps/bitwardenrs/docker-compose.yml
+++ b/apps/bitwardenrs/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   bitwarden:
-    image: bitwardenrs/server:1.14.2-alpine
+    image: bitwardenrs/server:1.15.1-alpine
     restart: always
     networks:
       - myweb
diff --git a/apps/freshrss/docker-compose.yml b/apps/freshrss/docker-compose.yml
index 5e165db..448bb24 100644
--- a/apps/freshrss/docker-compose.yml
+++ b/apps/freshrss/docker-compose.yml
@@ -12,7 +12,7 @@ services:
         - .env
 
   freshrss:
-    image: freshrss/freshrss:1.16.0
+    image: freshrss/freshrss:1.16.2
     restart: unless-stopped
     depends_on:
       - dbfreshrss
diff --git a/apps/gitea/docker-compose.yml b/apps/gitea/docker-compose.yml
index cf8e953..a684ffc 100644
--- a/apps/gitea/docker-compose.yml
+++ b/apps/gitea/docker-compose.yml
@@ -12,7 +12,7 @@ services:
         - myweb
 
   gitea:
-    image: gitea/gitea:1.11.5
+    image: gitea/gitea:1.11.6
     restart: unless-stopped
     depends_on:
         - dbgitea
diff --git a/apps/isso/docker-compose.yml b/apps/isso/docker-compose.yml
index fbd52df..733a6eb 100644
--- a/apps/isso/docker-compose.yml
+++ b/apps/isso/docker-compose.yml
@@ -6,7 +6,7 @@ services:
                 restart: always
                 env_file: .env
                 volumes:
-                        - ./db:/db
+                        - ./data/db:/db
                         - ./data/config:/config
                 networks:
                         - myweb
diff --git a/apps/matrix/docker-compose.yml b/apps/matrix/docker-compose.yml
index fda474a..8df74db 100644
--- a/apps/matrix/docker-compose.yml
+++ b/apps/matrix/docker-compose.yml
@@ -13,8 +13,8 @@ services:
         - .env
 
   synapse:
-    image: docker.tedomum.net/tedomum/synapse:tedomum-prod
-          #image: matrixdotorg/synapse:v1.12.4
+          #image: docker.tedomum.net/tedomum/synapse:tedomum-prod
+    image: matrixdotorg/synapse:v1.17.0
     restart: unless-stopped
     depends_on:
       - dbsynapse
@@ -45,7 +45,7 @@ services:
 
 
   riot:
-    image: vectorim/riot-web:v1.6.1
+    image: vectorim/riot-web:v1.7.1
     restart: unless-stopped
     networks:
       - myweb
diff --git a/apps/nextcloud/Dockerfile b/apps/nextcloud/Dockerfile
index f9c2ebd..42296e4 100644
--- a/apps/nextcloud/Dockerfile
+++ b/apps/nextcloud/Dockerfile
@@ -1,10 +1,18 @@
-FROM nextcloud:19.0.0RC3-apache
+FROM nextcloud:19.0.1-apache
 
+# This is for cron
 RUN apt-get update && apt-get install -y \
-    supervisor \
+    supervisor wget gnupg \
   && rm -rf /var/lib/apt/lists/* \
   && mkdir /var/log/supervisord /var/run/supervisord
 
+
+# This is for facial recognition app
+#RUN echo "deb https://repo.delellis.com.ar stretch stretch" > /etc/apt/sources.list.d/20-pdlib.list \
+#  && wget -qO - https://repo.delellis.com.ar/repo.gpg.key | apt-key add - \
+#  && apt update \
+#  && apt install -y libdlib-dev bzip2
+
 COPY ./config/supervisord.conf /
 
 ENV NEXTCLOUD_UPDATE=1
diff --git a/apps/pleroma/Dockerfile b/apps/pleroma/Dockerfile
index 57bdc4d..21484a1 100644
--- a/apps/pleroma/Dockerfile
+++ b/apps/pleroma/Dockerfile
@@ -3,7 +3,7 @@ FROM elixir:1.10.1-alpine
 ENV UID=911 GID=911 \
     MIX_ENV=prod
 
-ARG PLEROMA_VER=v2.0.5
+ARG PLEROMA_VER=v2.0.7
 
 RUN apk -U upgrade \
     && apk add --no-cache \
diff --git a/config/borg/config.yaml b/config/borg/config.yaml
index 3fee4a1..e44787a 100644
--- a/config/borg/config.yaml
+++ b/config/borg/config.yaml
@@ -4,6 +4,8 @@
 location:
     source_directories:
         - /srv/apps/
+        - /srv/core
+        - /srv/config
 
     repositories:
         #- borg@cloud.corre.bio:/backup/borg/mustela
@@ -54,6 +56,8 @@ hooks:
     before_backup:
         - echo "Starting a backup."
         - /srv/config/borg/scripts/dump_database.sh -t mysql -s bzhbitume -c mariadbbzhbitume
+        - /srv/config/borg/scripts/dump_database.sh -t mysql -s codimd -c dbcodimd
+        - /srv/config/borg/scripts/dump_database.sh -t mysql -s codimdcorre -c dbcodimdcorre
         - /srv/config/borg/scripts/dump_database.sh -t postgres -s etherpad -c dbetherpad
         - /srv/config/borg/scripts/dump_database.sh -t postgres -s freshrss -c dbfreshrss
         - /srv/config/borg/scripts/dump_database.sh -t postgres -s funkwhale -c postgresqlfunkwhale