diff --git a/conf/install_nextcloud.conf.sample b/conf/install_nextcloud.conf.sample index 8bff92a..c6a0fd3 100644 --- a/conf/install_nextcloud.conf.sample +++ b/conf/install_nextcloud.conf.sample @@ -3,6 +3,15 @@ # --- +# - WEBSITE +# - +# - URL of cloud service +# - +# - No default value +# - +#WEBSITE="" + + # - SRC_BASE_DIR # - # - Source directory for downloading nextcloud diff --git a/install_nextcloud.sh b/install_nextcloud.sh index 902714b..5a9ee54 100755 --- a/install_nextcloud.sh +++ b/install_nextcloud.sh @@ -1331,20 +1331,48 @@ else # - Add key for ColaboraOnline Repository # - + _failed=false echo "" >> $log_file echo "# - Add key for ColaboraOnline Repository" >> $log_file echo "# -" >> $log_file echononl "Add key for ColaboraOnline Repository.." - echo "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D" >> $log_file - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D >> $log_file 2>&1 + #echo "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D" >> $log_file + #apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D >> $log_file 2>&1 - if [ "$?" = 0 ]; then - echo_ok - else - echo_failed - error "For more informations see log output at '$log_file'." - fi + echo "wget -O /tmp/co-apt.key \\ + https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-centos7/repodata/repomd.xml.key" >> $log_file + wget -O /tmp/co-apt.key \ + https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-centos7/repodata/repomd.xml.key >> $log_file 2>&1 + + if [[ "$?" -gt 0 ]]; then + _failed=true + echo_failed + error "For more informations see log output at '$log_file'." + else + echo "" >> $log_file + echo "apt-key add /tmp/co-apt.key" >> $log_file + apt-key add /tmp/co-apt.key >> $log_file 2>&1 + if [[ "$?" -eq 0 ]]; then + echo_ok + else + _failed=true + echo_failed + fi + fi + + if $_failed ; then + error "Something went wrong with adding repositoty key..." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." + fi # - Add Repository ColaboraOnline @@ -1385,11 +1413,21 @@ EOF else echo_failed error "For more informations see log output at '$log_file'." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." fi # - Install ColaboraOnline packages # - + _failed=false for _debian_pkg in ${dpkg_pkg_colabora_online[@]} ; do echononl "Installing $_debian_pkg .." @@ -1403,6 +1441,7 @@ EOF if [ "$?" = 0 ]; then echo_ok else + _failed=true echo_failed error "For more informations see log output at '$log_file'." fi @@ -1412,6 +1451,19 @@ EOF done + if $_failed ; then + error "Something went wrong with installing debian packages .." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." + fi + LOOLWDS_USER="$(stat -c "%U" /etc/loolwsd/loolwsd.xml)" echo "" >> $log_file echo "LOOLWDS_USER=$LOOLWDS_USER" >> $log_file @@ -1453,6 +1505,15 @@ EOF else echo_failed error "For more informations see log output at '$log_file'." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." fi # - Symlimk Snakeoil Cert '/etc/loolwsd/ca-chain.cert.pem' --> '/etc/ssl/certs/ssl-cert-snakeoil.pem' @@ -1469,6 +1530,15 @@ EOF else echo_failed error "For more informations see log output at '$log_file'." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." fi # - Symlimk Snakeoil Cert '/etc/loolwsd/key.pem' --> '/etc/ssl/private/ssl-cert-snakeoil.key' @@ -1485,6 +1555,15 @@ EOF else echo_failed error "For more informations see log output at '$log_file'." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." fi blank_line @@ -4143,6 +4222,58 @@ else fi +# - Install and enable nextcloud app 'desk' +# - +_app="deck" +echo "" >> $log_file +echo "# -" >> $log_file +echo "# - Install nextcloud app '$_app'" >> $log_file +echononl "Install nextcloud app '$_app'.." + +echo "sudo -u \"$HTTP_USER\" \"$php_binary\" \"${INSTALL_DIR}/occ\" app:install \"$_app\"" >> $log_file +sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" >> $log_file 2>&1 + +if [[ $? -eq 0 ]]; then + echo_ok +else + echo_failed + error "For more informations see log output at '$log_file'." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." +fi + +echo "" >> $log_file +echo "# -" >> $log_file +echo "# - Eanable nextcloud app '$_app'" >> $log_file +echononl "Eanable nextcloud app '$_app'.." + +echo "sudo -u \"$HTTP_USER\" \"$php_binary\" \"${INSTALL_DIR}/occ\" app:enable \"$_app\"" >> $log_file +sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" >> $log_file 2>&1 + +if [[ $? -eq 0 ]]; then + echo_ok +else + echo_failed + error "For more informations see log output: \"$log_file\"." + + echononl "continue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/no]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Interrupted ny user." +fi + + blank_line if $COLABORA_SERVICE_INSTALLED ; then