adjust installation

This commit is contained in:
nacho 2018-12-28 13:45:23 -07:00 committed by nachoparker
parent b0726207f3
commit abef04f7ed
4 changed files with 26 additions and 19 deletions

View File

@ -29,12 +29,15 @@ cd /tmp/overlay
echo -e "\nInstalling NextCloudPi"
source etc/library.sh
install_app lamp.sh
install_app etc/ncp-config.d/nc-nextcloud.sh
run_app etc/ncp-config.d/nc-nextcloud.sh
install_app ncp.sh
run_app etc/ncp-config.d/nc-init.sh
run_app post-inst.sh
mkdir -p /usr/local/etc/ncp-config.d/
cp etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/
install_app lamp.sh
install_app etc/ncp-config.d/nc-nextcloud.sh
run_app_unsafe etc/ncp-config.d/nc-nextcloud.sh
install_app ncp.sh
run_app_unsafe etc/ncp-config.d/nc-init.sh
run_app_unsafe post-inst.sh
cd -

View File

@ -50,7 +50,7 @@ EOF
## nc.limits.sh (auto)adjustments: number of threads, memory limits...
source /usr/local/etc/library.sh
configure_app nc-limits && run_app nc-limits
run_app nc-limits
## Check for interrupted upgrades and rollback
BKP="$( ls -1t /var/www/nextcloud-bkp_*.tar.gz 2>/dev/null | head -1 )"

View File

@ -34,7 +34,7 @@ rm -f ncp-web/{wizard.cfg,ncp-web.cfg}
echo -e "\e[1m\n[ Build NCP ]\e[0m"
prepare_chroot_raspbian "$IMG"
mkdir raspbian_root/tmp/ncp-build
mkdir raspbian_root/tmp/ncp-build raspbian_root/usr/local/etc/ncp-config.d
cp -r *.sh etc bin ncp-web raspbian_root/tmp/ncp-build
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
@ -57,12 +57,13 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
# install everything
cd /tmp/ncp-build || exit 1
source etc/library.sh
install_app lamp.sh
install_app etc/ncp-config.d/nc-nextcloud.sh
run_app etc/ncp-config.d/nc-nextcloud.sh
install_app ncp.sh
run_app etc/ncp-config.d/nc-init.sh
run_app post-inst.sh
cp etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/
install_app lamp.sh
install_app bin/ncp/CONFIG/nc-nextcloud.sh
run_app_unsafe bin/ncp/CONFIG/nc-nextcloud.sh
install_app ncp.sh
run_app_unsafe bin/ncp/CONFIG/nc-init.sh
run_app_unsafe post-inst.sh
# harden SSH further for Raspbian
sed -i 's|^#PermitRootLogin .*|PermitRootLogin no|' /etc/ssh/sshd_config

View File

@ -46,11 +46,14 @@ cd - && cd "$TMPDIR"/nextcloudpi-"$BRANCH"
echo -e "\nInstalling NextCloudPi"
source etc/library.sh
install_app lamp.sh
install_app etc/ncp-config.d/nc-nextcloud.sh
run_app etc/ncp-config.d/nc-nextcloud.sh
install_app ncp.sh
run_app etc/ncp-config.d/nc-init.sh
mkdir -p /usr/local/etc/ncp-config.d/
cp etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/
install_app lamp.sh
install_app etc/ncp-config.d/nc-nextcloud.sh
run_app_unsafe etc/ncp-config.d/nc-nextcloud.sh
install_app ncp.sh
run_app_unsafe etc/ncp-config.d/nc-init.sh
popd