From 464362a43e52a4bb6537c0b33ef7f124d28b91dc Mon Sep 17 00:00:00 2001
From: Mar Alegre <mar@mar.alemor.org>
Date: Thu, 30 Dec 2021 17:18:41 -0500
Subject: [PATCH] removed references to nc-mount, added db-dump service to
 containerfile

---
 nextcloud/Containerfile                     |  5 ++---
 nextcloud/Systemdfile                       |  2 +-
 nextcloud/assets/bin/nc-adduser             | 15 -------------
 nextcloud/assets/bin/nc-mntuser             | 24 ---------------------
 nextcloud/{assets => }/data/host.config.php |  0
 nextcloud/startup/nextcloud                 |  2 --
 6 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100755 nextcloud/assets/bin/nc-adduser
 delete mode 100755 nextcloud/assets/bin/nc-mntuser
 rename nextcloud/{assets => }/data/host.config.php (100%)

diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile
index ef25aac..2ed70cf 100644
--- a/nextcloud/Containerfile
+++ b/nextcloud/Containerfile
@@ -6,7 +6,6 @@ FROM localhost/debian
 # deploy options
 # -p (port) and -v (volume) both go host:container
 LABEL config_default="\
---cap-add=sys_admin --security-opt apparmor=unconfined \
 -p 9080:80 \
 -v /srv/vol/nextcloud/files:/vol/files \
 -v /srv/vol/nextcloud/data:/vol/data"
@@ -105,8 +104,8 @@ RUN wget https://download.nextcloud.com/server/releases/latest.zip && \
     rm latest.zip
 
 # create data dir for nextcloud
-RUN mkdir -p /srv/nextcloud/data && \
-    chown -R www-data:www-data /srv/nextcloud
+RUN mkdir -p /vol/files && \
+    chown -R www-data:www-data /vol/files
 
 # copy nextcloud config
 COPY --chown=www-data:www-data assets/config/ nextcloud/config/
diff --git a/nextcloud/Systemdfile b/nextcloud/Systemdfile
index 7e9ac94..7029783 100644
--- a/nextcloud/Systemdfile
+++ b/nextcloud/Systemdfile
@@ -10,7 +10,7 @@ sleep 5
 db-make
 
 # install nextcloud
-nc-occ maintenance:install --data-dir "/srv/nextcloud/data/" --database "pgsql" --database-host "/var/run/postgresql" --database-name "$DBNAME" --database-user "$DBUSER" --database-pass "" --admin-user "admin" --admin-pass "admin"
+nc-occ maintenance:install --data-dir "/vol/files" --database "pgsql" --database-host "/var/run/postgresql" --database-name "$DBNAME" --database-user "$DBUSER" --database-pass "" --admin-user "admin" --admin-pass "admin"
 
 # do post-installation steps
 nc-occ maintenance:update:htaccess
diff --git a/nextcloud/assets/bin/nc-adduser b/nextcloud/assets/bin/nc-adduser
deleted file mode 100755
index a3188c7..0000000
--- a/nextcloud/assets/bin/nc-adduser
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [[ -z $1 ]]; then
-        echo "Usage: $0 username"
-        exit 2
-fi
-
-set -e
-
-nc-occ user:add "$1"
-
-mkdir -p /vol/files/"$1"
-chown www-data:www-data /vol/files/"$1"
-
-nc-mntuser "$1"
diff --git a/nextcloud/assets/bin/nc-mntuser b/nextcloud/assets/bin/nc-mntuser
deleted file mode 100755
index 8e1f8cb..0000000
--- a/nextcloud/assets/bin/nc-mntuser
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [[ -z $1 ]]; then
-        echo "Usage: $0 user"
-        exit 2
-fi
-user=$1
-
-intdir=/srv/nextcloud/data
-extdir=/vol/files
-
-set -e
-
-nc-occ maintenance:mode --on
-
-mkdir -p $intdir/$user/files
-chown -R www-data:www-data $intdir/$user
-line="$extdir/$user $intdir/$user/files none defaults,bind,nofail 0 0"
-if ! grep -q "$line" /etc/fstab ; then
-    echo "$line" >> /etc/fstab
-fi
-mount -a
-
-nc-occ maintenance:mode --off
diff --git a/nextcloud/assets/data/host.config.php b/nextcloud/data/host.config.php
similarity index 100%
rename from nextcloud/assets/data/host.config.php
rename to nextcloud/data/host.config.php
diff --git a/nextcloud/startup/nextcloud b/nextcloud/startup/nextcloud
index 9440871..b8ebba4 100755
--- a/nextcloud/startup/nextcloud
+++ b/nextcloud/startup/nextcloud
@@ -2,5 +2,3 @@
 sysctl vm.overcommit_memory=1
 echo never > /sys/kernel/mm/transparent_hugepage/enabled
 podman start nextcloud
-sleep 5
-podman exec nextcloud /bin/bash -c "mount -a"