External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

tweak ncc command

Browse Source 
Signed-off-by: nachoparker <nacho@ownyourbits.com>
This commit is contained in:
nachoparker 2021-11-18 10:06:59 -07:00
parent 0c589ff36f
commit 4717eb334f
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/ncp-diag
View File

@ -45,8 +45,7 @@ test -d "$DBDIR" || DBDIRINFO=" (doesn't exist)"
echo "dbdir|$DBDIR$DBDIRINFO"
# Nextcloud
[[ ${EUID} -eq 0 ]] && SUDO="sudo -u www-data"
VERSION="$( $SUDO php /var/www/nextcloud/occ status | grep "version:" | awk '{ print $3 }' )"
VERSION="$( ncc status | grep "version:" | awk '{ print $3 }' )"
if [[ "$VERSION" != "" ]]; then
echo "Nextcloud check|ok"
echo "Nextcloud version|$VERSION"
@ -59,7 +58,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|$($SUDO php /var/www/nextcloud/occ notify_push:self-test &>/dev/null && echo up || echo down )"
echo "HPB service|$( ncc notify_push:self-test &>/dev/null && echo up || echo down )"
echo "Postfix service|$( pgrep -fc postfix &>/dev/null && echo up || echo down )"
# WAN

6
changelog.md
View File

@ -1,9 +1,9 @@
[v1.44.2](https://github.com/nextcloud/nextcloudpi/commit/3d274e1) (2021-11-16) ncp-app: bump to NC22
[v1.44.3](https://github.com/nextcloud/nextcloudpi/commit/70eae61) (2021-11-18) tweak ncc command
[v1.44.1](https://github.com/nextcloud/nextcloudpi/commit/4032628) (2021-11-16) ncp-previewgenerator: update to NC22
[v1.44.2](https://github.com/nextcloud/nextcloudpi/commit/0c589ff) (2021-11-16) ncp-app: bump to NC22
[v1.44.0 ](https://github.com/nextcloud/nextcloudpi/commit/3113a0e) (2021-11-16) upgrade to NC22.2.1
[v1.44.1 ](https://github.com/nextcloud/nextcloudpi/commit/2aa95c6) (2021-11-16) ncp-previewgenerator: update to NC22
[v1.43.7](https://github.com/nextcloud/nextcloudpi/commit/6aba9b9) (2021-11-05) nc-restore: improve restoring data from SD to docker

3
ncp.sh
View File

@ -34,7 +34,8 @@ install()
# add the ncc shortcut
cat > /usr/local/bin/ncc <<'EOF'
#!/bin/bash
sudo -E -u www-data php /var/www/nextcloud/occ "$@"
[[ ${EUID} -eq 0 ]] && SUDO="sudo -E -u www-data"
${SUDO} php /var/www/nextcloud/occ "$@"
EOF
chmod +x /usr/local/bin/ncc

8
updates/1.45.0.sh
View File

@ -11,6 +11,14 @@ source /usr/local/etc/library.sh # sets NCLATESTVER PHPVER RELEASE
# this update brings a version bump for ncp-previewgenerator
ncc upgrade
# update ncc
cat > /usr/local/bin/ncc <<'EOF'
#!/bin/bash
[[ ${EUID} -eq 0 ]] && SUDO="sudo -E -u www-data"
${SUDO} php /var/www/nextcloud/occ "$@"
EOF
chmod +x /usr/local/bin/ncc
# docker images only
[[ -f /.docker-image ]] && {
: