diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile index ff6e11a..31630d3 100644 --- a/nextcloud/Containerfile +++ b/nextcloud/Containerfile @@ -6,7 +6,7 @@ FROM localhost/debian # deploy options # -p (port) and -v (volume) both go host:container LABEL config_default="\ ---cap-add SYS_ADMIN \ +--privileged \ -p 9080:80 \ -v /srv/vol/nextcloud/files:/vol/files \ -v /srv/vol/nextcloud/data:/vol/data" @@ -43,6 +43,11 @@ RUN usermod --uid $FILESUID www-data && \ # copy our custom scripts COPY assets/bin/ /usr/local/bin/ +# make sure volume dirs exist, and copy sample data +RUN mkdir -p /vol/data /vol/files + +COPY --chown=www-data:www-data assets/data/ /vol/data/ + ### ### PHP ### @@ -120,10 +125,10 @@ RUN crontab -u www-data /root/crontab ### # push the fixed systemd file for redis -COPY bugfix/redis.service /etc/systemd/system/redis.service +COPY assets/bugfix/redis-server.service /etc/systemd/system/redis-server.service -COPY bugfix/apache2.override /etc/systemd/system/apache2.service.d/override.conf +COPY assets/bugfix/apache2.override /etc/systemd/system/apache2.service.d/override.conf # bugfix for cron -COPY bugfix/cronfix /root/ +COPY assets/bugfix/cronfix /root/ RUN chmod +x /root/cronfix && /root/cronfix diff --git a/nextcloud/assets/bin/maint b/nextcloud/assets/bin/maint index 1f819c0..cd0bf64 100755 --- a/nextcloud/assets/bin/maint +++ b/nextcloud/assets/bin/maint @@ -8,7 +8,7 @@ day=$(date +%d) month=$(date +%m) year=$(date +%Y) -dumpdir=/vol/data +dumpdir=/vol/data/sql errlog=error/$year-$month-$day-T$hour.log mkdir -p $dumpdir/error diff --git a/nextcloud/assets/data/host.config.php b/nextcloud/assets/data/host.config.php new file mode 100644 index 0000000..d29ce49 --- /dev/null +++ b/nextcloud/assets/data/host.config.php @@ -0,0 +1,10 @@ + + array ( + 0 => 'example.domain.com', + ), +'overwriteprotocol' => 'https', +'overwritehost' => 'example.domain.com', +'overwritewebroot' => '/nextcloud', +);