diff --git a/assets/build/install.sh b/assets/build/install.sh index e855c86..ce7a08f 100644 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -8,7 +8,7 @@ if [[ ! -f ${NEXTCLOUD_BUILD_DIR}/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2 ]]; the wget "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" -O ${NEXTCLOUD_BUILD_DIR}/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2 fi -echo "Extracting ownCloud ${NEXTCLOUD_VERSION}..." +echo "Extracting Nextcloud ${NEXTCLOUD_VERSION}..." tar -xf ${NEXTCLOUD_BUILD_DIR}/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2 --strip=1 -C ${NEXTCLOUD_INSTALL_DIR} rm -rf ${NEXTCLOUD_BUILD_DIR}/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2 diff --git a/assets/runtime/functions b/assets/runtime/functions index 96b4db1..03c53ea 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -506,8 +506,8 @@ initialize_datadir() { chmod -R 0755 ${NEXTCLOUD_BACKUPS_DIR} chown -R ${NEXTCLOUD_USER}: ${NEXTCLOUD_BACKUPS_DIR} - # symlink to config/config.php -> ${NEXTCLOUD_CONFIG_DIR}/config.php - ln -sf ${NEXTCLOUD_CONFIG_DIR}/config.php ${NEXTCLOUD_INSTALL_DIR}/config/config.php + # symlink to config/config.php -> ${NEXTCLOUD_APP_CONFIG} + ln -sf ${NEXTCLOUD_APP_CONFIG} ${NEXTCLOUD_INSTALL_DIR}/config/config.php } initialize_system() { diff --git a/entrypoint.sh b/entrypoint.sh index b1c6ef8..b9bdea0 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -36,7 +36,7 @@ case ${1} in app:help) echo "Available options:" echo " occ - Launch the Nextcloud's command-line interface" - echo " app:nextcloud - Starts the Nextcloud php5-fpm server (default)" + echo " app:nextcloud - Starts the Nextcloud php5-fpm server (default)" echo " app:nginx - Starts the nginx server" echo " app:backup:create - Create a backup" echo " app:backup:restore - Restore an existing backup"