From 7f0f2a8cedc4df316e7649376ba99f44b66ed6ea Mon Sep 17 00:00:00 2001
From: Marcio Granzotto <oscensores@gmail.com>
Date: Thu, 30 Dec 2021 00:45:09 -0300
Subject: [PATCH] Fix data direcatory

---
 nextcloud/rootfs/defaults/config.php            | 1 +
 nextcloud/rootfs/defaults/nextcloud-perms.sh    | 8 +++++---
 nextcloud/rootfs/etc/cont-init.d/10-adduser.sh  | 3 ++-
 nextcloud/rootfs/etc/cont-init.d/40-config.sh   | 7 ++++---
 nextcloud/rootfs/etc/cont-init.d/60-memcache.sh | 5 +++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nextcloud/rootfs/defaults/config.php b/nextcloud/rootfs/defaults/config.php
index 9a534907c..8f3114c51 100644
--- a/nextcloud/rootfs/defaults/config.php
+++ b/nextcloud/rootfs/defaults/config.php
@@ -2,5 +2,6 @@
 $CONFIG = array (
   'memcache.local' => '\OC\Memcache\APCu',
   'datadirectory' => '%%datadirectory%%',
+  'overwriteprotocol' => 'https',
   );
 
diff --git a/nextcloud/rootfs/defaults/nextcloud-perms.sh b/nextcloud/rootfs/defaults/nextcloud-perms.sh
index 6bf4607f0..63ff70d55 100644
--- a/nextcloud/rootfs/defaults/nextcloud-perms.sh
+++ b/nextcloud/rootfs/defaults/nextcloud-perms.sh
@@ -1,10 +1,12 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 ocpath="${NEXTCLOUD_PATH}"
 htuser='abc'
 htgroup='abc'
 rootuser='root'
 
+datadirectory=$(bashio::config 'data_directory')
+
 printf "Creating possible missing Directories\n"
 mkdir -p $ocpath/data
 mkdir -p $ocpath/assets
@@ -17,7 +19,7 @@ mkdir -p $ocpath/themes
 mkdir -p /data/config/nextcloud/config
 mkdir -p /data/config/nextcloud/data
 mkdir -p /data/config/www/nextcloud/occ 2>/dev/null
-mkdir -p /share/nextcloud
+mkdir -p $datadirectory
 mkdir -p /ssl/nextcloud/keys
 
 printf "chmod Files and Directories.  This could take some time, please wait...\n"
@@ -36,7 +38,7 @@ chown -R ${htuser}:${htgroup} ${ocpath}/config/
 chown -R ${htuser}:${htgroup} ${ocpath}/data/
 chown -R ${htuser}:${htgroup} ${ocpath}/themes/
 chown -R ${htuser}:${htgroup} ${ocpath}/updater/
-chown -R ${htuser}:${htgroup} /share/nextcloud
+chown -R ${htuser}:${htgroup} ${datadirectory}
 chown -R ${htuser}:${htgroup} /ssl/nextcloud/keys || true
 
 chmod +x ${ocpath}/occ
diff --git a/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh b/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh
index 07112736f..36542b0ea 100644
--- a/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh
@@ -2,11 +2,12 @@
 
 PUID=$(bashio::config "PUID")
 PGID=$(bashio::config "PGID")
+datadirectory=$(bashio::config 'data_directory')
 
 groupmod -o -g "$PGID" abc
 usermod -o -u "$PUID" abc
 mkdir -p /data/config
-mkdir -p /share/nextcloud
+mkdir -p $datadirectory
 echo '
 -------------------------------------
           _         ()
diff --git a/nextcloud/rootfs/etc/cont-init.d/40-config.sh b/nextcloud/rootfs/etc/cont-init.d/40-config.sh
index f63e7eb5b..13965cbdd 100644
--- a/nextcloud/rootfs/etc/cont-init.d/40-config.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/40-config.sh
@@ -1,14 +1,15 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 #create folders
+datadirectory=$(bashio::config 'data_directory')
 mkdir -p \
-	/share/nextcloud \
+	$datadirectory \
 	/data/config/nextcloud/config \
 	/data/config/nextcloud/data
 	
 #permissions
 chown abc:abc \
-	/share/nextcloud \
+	$datadirectory \
 	/data/config/nextcloud/config \
 	/data/config/nextcloud/data
 	
diff --git a/nextcloud/rootfs/etc/cont-init.d/60-memcache.sh b/nextcloud/rootfs/etc/cont-init.d/60-memcache.sh
index a2ac0edc2..a1705a99b 100644
--- a/nextcloud/rootfs/etc/cont-init.d/60-memcache.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/60-memcache.sh
@@ -1,8 +1,9 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 # Change data directory
 datadirectory=$(bashio::config 'data_directory')
-sed -i "s/%%datadirectory%%/${datadirectory}/g" /defaults/config.php
+bashio::log.info "Setting data diretory: ${datadirectory}"
+sed -i "s|%%datadirectory%%|$datadirectory|g" /defaults/config.php
 
 # copy config
 [[ ! -f /data/config/www/nextcloud/config/config.php ]] && \