upgrade to NC21.0.4

Signed-off-by: nachoparker <[email protected]>

Author: nachoparker

README.md

@@ -16,7 +16,7 @@ Find the full documentation at [docs.nextcloudpi.com](http://docs.nextcloudpi.co
 ## Features
 
  * Debian/Raspbian 10 Buster
- * Nextcloud 20.0.12
+ * Nextcloud 21.0.4
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.3
  * MariaDB 10

Vagrantfile

@@ -37,7 +37,7 @@ Vagrant.configure("2") do |config|
     # cleanup
     source etc/library.sh
     run_app_unsafe post-inst.sh
-    cd -
+    cd /
     rm -r /tmp/nextcloudpi
     systemctl disable sshd
     poweroff

bin/ncp-diag

@@ -57,6 +57,7 @@ echo "HTTPD service|$( pgrep -c apache2 &>/dev/null && echo up || echo down )"
 echo "PHP service|$( pgrep -c php-fpm &>/dev/null && echo up || echo down )"
 echo "MariaDB service|$( pgrep -c mysqld &>/dev/null && echo up || echo down )"
 echo "Redis service|$( pgrep -c redis-server &>/dev/null && echo up || echo down )"
+echo "HPB service|$(pgrep -c notify_push &>/dev/null && echo up || echo down )"
 echo "Postfix service|$( pgrep -fc postfix &>/dev/null && echo up || echo down )"
 
 # WAN

bin/ncp-update-nc

@@ -22,6 +22,8 @@ set -eE
 VER="$1"
 BIN="${0##*/}"
 
+source /usr/local/etc/library.sh
+
 # pre-checks
 ####################
 [[ "$VER" == "" ]] && { echo "Usage ${BIN} <version>"; exit 1; }
@@ -61,7 +63,7 @@ fi
 
 echo "Current   Nextcloud version $CURRENT"
 echo "Available Nextcloud version $VER"
-[[ "$NEED_UPDATE" == "true" ]] || { echo "Nothing to update"; exit 1; }
+[[ "$NEED_UPDATE" == "true" ]] || { echo "Nothing to update"; exit; }
 
 # make sure that cron.php is not running and there are no pending jobs
 # https://github.com/nextcloud/server/issues/10949
@@ -159,7 +161,8 @@ rollback() {
   echo -e "Abort\nClean up..."
   rm -rf /var/www/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old
   echo "Rolling back to backup $BKP..."
-  local TMPDATA="$( mktemp -d "/var/www/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; }
+  local TMPDATA
+  TMPDATA="$( mktemp -d "/var/www/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; }
   [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && mv -T "$DATADIR" "$TMPDATA"
   ncp-restore "$BKP" || { echo "Rollback failed! Data left at $TMPDATA"; exit 1; }
   [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && { rm -rf "$DATADIR"; mv -T "$TMPDATA" "$DATADIR"; }
@@ -186,6 +189,50 @@ $ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns -n
 $ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys -n
 $ncc | grep -q db:convert-filecache-bigint && $ncc db:convert-filecache-bigint -n
 
+
+# use the correct version for custom apps
+NCVER="$(ncc status | grep "version:" | awk '{ print $3 }')"
+if is_more_recent_than "21.0.0" "${NCVER}"; then
+  NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc20
+else
+  # Install notify_push if not installed
+  if ! is_app_enabled notify_push; then
+    ncc app:install notify_push
+    ncc app:enable  notify_push
+    bash /usr/local/etc/ncp-templates/nextcloud.conf.sh > /etc/apache2/sites-available/nextcloud.conf
+    a2enmod proxy proxy_http proxy_wstunnel
+    apachectl -k graceful
+    ## make sure the notify_push daemon is runnnig
+
+    arch="$(uname -m)"
+    [[ "${arch}" =~ "armv7" ]] && arch="armv7"
+    cat > /etc/systemd/system/notify_push.service <<EOF
+[Unit]
+Description = Push daemon for Nextcloud clients
+After = mysql.service
+
+[Service]
+Environment = PORT=7867
+ExecStart = /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php
+User=www-data
+
+[Install]
+WantedBy = multi-user.target
+EOF
+    start_notify_push
+    nc_domain="$(ncc config:system:get overwrite.cli.url)"
+    set-nc-domain "${nc_domain}" || {
+      echo "notify_push setup failed. You are probably behind a proxy"
+      echo "Run 'ncc config:system:set trusted_proxies 15 --value=<proxy_IP>' and then 'ncc notify_push:setup https://<domain>/push to enable"
+      echo "Check https://help.nextcloud.com/tags/ncp for support"
+    }
+
+  fi
+  NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc21
+fi
+rm -rf /var/www/nextcloud/apps/previewgenerator
+ln -snf "${NCPREV}" /var/www/nextcloud/apps/previewgenerator
+
 # done
 ####################
 mkdir -p  "$DATADIR"/ncp-update-backups

bin/ncp/CONFIG/nc-httpsonly.sh

@@ -11,12 +11,12 @@
 
 configure()
 {
-  [[ $ACTIVE == "no" ]] && local OPT=Off || local OPT=On
-  sed -i "s|RewriteEngine .*|RewriteEngine $OPT|" /etc/apache2/sites-available/000-default.conf
-  echo "Forcing HTTPS $OPT"
-
-  # delayed in bg so it does not kill the connection, and we get AJAX response
-  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+  [[ -f /.ncp-image ]] && return 0
+  [[ $ACTIVE == "no" ]] && local opt=Off proto=https || local opt=On proto=http
+  sed -i "s|RewriteEngine .*|RewriteEngine $opt|" /etc/apache2/sites-available/000-default.conf
+  ncc config:system:set overwriteprotocol --value="${proto}"
+  apachectl -k graceful
+  echo "Forcing HTTPS $opt"
 }
 
 install() { :; }

bin/ncp/CONFIG/nc-init.sh

@@ -12,7 +12,7 @@ DBADMIN=ncadmin
 
 configure()
 {
-  source /usr/local/etc/library.sh # sets PHPVER
+  source /usr/local/etc/library.sh # sets PHPVER NCVER
 
   echo "Setting up a clean Nextcloud instance... wait until message 'NC init done'"
 
@@ -103,14 +103,10 @@ EOF
   # 4 Byte UTF8 support
   ncc config:system:set mysql.utf8mb4 --type boolean --value="true"
 
-  # Default trusted domain ( only from ncp-config )
-  test -f /usr/local/bin/nextcloud-domain.sh && {
-    test -f /.ncp-image || bash /usr/local/bin/nextcloud-domain.sh
-  }
-  ncc config:system:set trusted_domains 5 --value="nextcloudpi.local"
+  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-local]}" --value="nextcloudpi.local"
   # trusted_domains 6 used by docker
-  ncc config:system:set trusted_domains 7 --value="nextcloudpi"
-  ncc config:system:set trusted_domains 8 --value="nextcloudpi.lan"
+  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi]}" --value="nextcloudpi"
+  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-lan]}" --value="nextcloudpi.lan"
 
   # email
   ncc config:system:set mail_smtpmode     --value="sendmail"
@@ -159,8 +155,16 @@ EOF
   fi
 
   # ncp-previewgenerator
-  cp -r /var/www/ncp-previewgenerator /var/www/nextcloud/apps/previewgenerator
-  chown www-data:www-data /var/www/nextcloud/apps/previewgenerator
+  if is_more_recent_than "21.0.0" "$NCVER"; then
+    local ncprev=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc20
+  else
+    ncc app:install notify_push
+    ncc app:enable  notify_push
+    test -f /.ncp-image || start_notify_push # don't start during build
+    local ncprev=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc21
+  fi
+  ln -snf "${ncprev}" /var/www/nextcloud/apps/previewgenerator
+  chown -R www-data: /var/www/nextcloud/apps/previewgenerator
   ncc app:enable previewgenerator
 
   # previews
@@ -174,11 +178,17 @@ EOF
 
   # other
   ncc config:system:set overwriteprotocol --value=https
+  ncc config:system:set overwrite.cli.url --value="https://nextcloudpi/"
+  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nc_domain]}" --value="nextcloudpi"
 
   # TODO temporary workaround for https://github.com/nextcloud/server/pull/13358
   ncc -n db:convert-filecache-bigint
   ncc db:add-missing-indices
 
+  # Default trusted domain (only from ncp-config)
+  test -f /usr/local/bin/nextcloud-domain.sh && {
+    test -f /.ncp-image || bash /usr/local/bin/nextcloud-domain.sh
+  }
   echo "NC init done"
 }
 

bin/ncp/CONFIG/nc-nextcloud.sh

@@ -200,6 +200,26 @@ EOF
 </VirtualHost>
 EOF
 
+  # for notify_push app in NC21
+  a2enmod proxy proxy_http proxy_wstunnel
+
+  arch="$(uname -m)"
+  [[ "${arch}" =~ "armv7" ]] && arch="armv7"
+  cat > /etc/systemd/system/notify_push.service <<EOF
+[Unit]
+Description = Push daemon for Nextcloud clients
+After = mysql.service
+
+[Service]
+Environment = PORT=7867
+ExecStart = /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php
+User=www-data
+
+[Install]
+WantedBy = multi-user.target
+EOF
+  [[ -f /.docker-image ]] || systemctl enable notify_push
+
   # some added security
   sed -i 's|^ServerSignature .*|ServerSignature Off|' /etc/apache2/conf-enabled/security.conf
   sed -i 's|^ServerTokens .*|ServerTokens Prod|'      /etc/apache2/conf-enabled/security.conf

bin/ncp/CONFIG/nc-passwd.sh

@@ -21,13 +21,18 @@ configure()
     ln -s /data/etc/shadow /etc/shadow
   }
 
-  # Run cron.php once now to get all checks right in CI.
-  sudo -u www-data php /var/www/nextcloud/cron.php
-
   # activate NCP
-  a2ensite  ncp nextcloud
-  a2dissite ncp-activation
-  bash -c "sleep 1.5 && service apache2 reload" &>/dev/null &
+  if ! is_ncp_activated; then
+    # Run cron.php once now to get all checks right in CI.
+    sudo -u www-data php /var/www/nextcloud/cron.php
+
+    a2dissite ncp-activation
+    a2ensite  ncp nextcloud
+    apachectl -k graceful
+
+    # Trusted Domain (local/public IP), also configures notify_push
+    bash /usr/local/bin/nextcloud-domain.sh
+  fi
 }
 
 install() { :; }

bin/ncp/CONFIG/nc-prettyURL.sh

@@ -8,9 +8,6 @@
 
 
 
-NCDIR=/var/www/nextcloud
-OCC="$NCDIR/occ"
-
 install() { :; }
 
 isactive()
@@ -20,30 +17,31 @@ isactive()
   [[ $REWRITEBASE != 1 ]]
 }
 
-configure() 
-{  
+configure()
+{
   # make sure overwrite.cli.url end with a '/'
-  local URL="$(ncc config:system:get overwrite.cli.url)"
+  local URL
+  URL="$(ncc config:system:get overwrite.cli.url)"
   [[ "${URL: -1}" != "/" ]] && ncc config:system:set overwrite.cli.url --value="${URL}/"
 
-  [[ $ACTIVE != "yes" ]] && {
-    sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value=""
-    sudo -u www-data php "$OCC" maintenance:update:htaccess
+  if [[ $ACTIVE != "yes" ]]; then
+    ncc config:system:set htaccess.RewriteBase --value=""
+    ncc maintenance:update:htaccess
     [[ $? -ne 0 ]] && {
       echo "There has been an error."
       return 1
     }
     echo "Your cloud does no longer have a pretty domain name."
-  } || {
-    sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value="/"
-    sudo -u www-data php "$OCC" maintenance:update:htaccess
+  else
+    ncc config:system:set htaccess.RewriteBase --value="/"
+    ncc maintenance:update:htaccess
     [[ $? -ne 0 ]] && {
       echo "There has been an error."
       return 1
     }
     echo "Your cloud now has a pretty domain name."
-  }
-  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+  fi
+  apachectl -k graceful
   return 0
 }
 

bin/ncp/CONFIG/nc-trusted-domains.sh

@@ -10,9 +10,9 @@
 
 configure()
 {
-  [[ "$DOMAIN1" != "" ]] && ncc config:system:set trusted_domains 20 --value="$DOMAIN1"
-  [[ "$DOMAIN2" != "" ]] && ncc config:system:set trusted_domains 21 --value="$DOMAIN2"
-  [[ "$DOMAIN3" != "" ]] && ncc config:system:set trusted_domains 22 --value="$DOMAIN3"
+  [[ "$DOMAIN1" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_1]}" --value="$DOMAIN1"
+  [[ "$DOMAIN2" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_2]}" --value="$DOMAIN2"
+  [[ "$DOMAIN3" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_3]}" --value="$DOMAIN3"
 }
 
 install(){ :; }