Browse Source

removed references to nc-mount, added db-dump service to containerfile

pull/1/head
Mar Alegre 4 years ago
parent
commit
464362a43e
  1. 5
      nextcloud/Containerfile
  2. 2
      nextcloud/Systemdfile
  3. 15
      nextcloud/assets/bin/nc-adduser
  4. 24
      nextcloud/assets/bin/nc-mntuser
  5. 0
      nextcloud/data/host.config.php
  6. 2
      nextcloud/startup/nextcloud

5
nextcloud/Containerfile

@ -6,7 +6,6 @@ FROM localhost/debian
# deploy options # deploy options
# -p (port) and -v (volume) both go host:container # -p (port) and -v (volume) both go host:container
LABEL config_default="\ LABEL config_default="\
--cap-add=sys_admin --security-opt apparmor=unconfined \
-p 9080:80 \ -p 9080:80 \
-v /srv/vol/nextcloud/files:/vol/files \ -v /srv/vol/nextcloud/files:/vol/files \
-v /srv/vol/nextcloud/data:/vol/data" -v /srv/vol/nextcloud/data:/vol/data"
@ -105,8 +104,8 @@ RUN wget https://download.nextcloud.com/server/releases/latest.zip && \
rm latest.zip rm latest.zip
# create data dir for nextcloud # create data dir for nextcloud
RUN mkdir -p /srv/nextcloud/data && \ RUN mkdir -p /vol/files && \
chown -R www-data:www-data /srv/nextcloud chown -R www-data:www-data /vol/files
# copy nextcloud config # copy nextcloud config
COPY --chown=www-data:www-data assets/config/ nextcloud/config/ COPY --chown=www-data:www-data assets/config/ nextcloud/config/

2
nextcloud/Systemdfile

@ -10,7 +10,7 @@ sleep 5
db-make db-make
# install nextcloud # 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 # do post-installation steps
nc-occ maintenance:update:htaccess nc-occ maintenance:update:htaccess

15
nextcloud/assets/bin/nc-adduser

@ -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"

24
nextcloud/assets/bin/nc-mntuser

@ -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

0
nextcloud/assets/data/host.config.php → nextcloud/data/host.config.php

2
nextcloud/startup/nextcloud

@ -2,5 +2,3 @@
sysctl vm.overcommit_memory=1 sysctl vm.overcommit_memory=1
echo never > /sys/kernel/mm/transparent_hugepage/enabled echo never > /sys/kernel/mm/transparent_hugepage/enabled
podman start nextcloud podman start nextcloud
sleep 5
podman exec nextcloud /bin/bash -c "mount -a"

Loading…
Cancel
Save