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

nc-notify-updates: allow specifying user

Browse Source
This commit is contained in:
nachoparker 2017-09-01 10:16:27 +02:00
parent c4d2e41c1c
commit a695c16693
2 changed files with 30 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
etc/nextcloudpi-config.d/nc-notify-updates.sh
View File

@ -14,6 +14,7 @@
#
ACTIVE_=yes
USER_=admin
CHECKINTERVAL=60
DESCRIPTION="Notify in NC when a NextCloudPi update is available"
@ -31,34 +32,6 @@ install()
chown -R www-data:www-data *
sudo -u www-data php /var/www/nextcloud/occ app:enable admin_notifications
# code
cat > /usr/local/bin/ncp-notify-update <<'EOF'
#!/bin/bash
VERFILE=/usr/local/etc/ncp-version
LATEST=/var/run/.ncp-latest-version
NOTIFIED=/var/run/.ncp-version-notified
test -e $LATEST || exit 0;
ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; }
test -e $NOTIFIED && [[ "$( cat $LATEST )" == "$( cat $NOTIFIED )" ]] && {
echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Already notified"
exit 0
}
echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Sending notification..."
IFACE=$( ip r | grep "default via" | awk '{ print $5 }' )
IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )
sudo -u www-data php /var/www/nextcloud/occ notification:generate \
admin "NextCloudPi $( cat $VERFILE )" \
-l "NextCloudPi $( cat $LATEST ) is available. Update from https://$IP:4443"
cat $LATEST > $NOTIFIED
EOF
chmod +x /usr/local/bin/ncp-notify-update
# timers
cat > /etc/systemd/system/nc-notify-updates.service <<EOF
[Unit]
@ -82,6 +55,35 @@ configure()
return 0
}
# code
cat > /usr/local/bin/ncp-notify-update <<EOF
#!/bin/bash
VERFILE=/usr/local/etc/ncp-version
LATEST=/var/run/.ncp-latest-version
NOTIFIED=/var/run/.ncp-version-notified
test -e \$LATEST || exit 0;
ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; }
test -e \$NOTIFIED && [[ "\$( cat \$LATEST )" == "\$( cat \$NOTIFIED )" ]] && {
echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Already notified"
exit 0
}
echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Sending notification..."
IFACE=\$( ip r | grep "default via" | awk '{ print \$5 }' )
IP=\$( ip a | grep "global \$IFACE" | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 )
sudo -u www-data php /var/www/nextcloud/occ notification:generate \
$USER_ "NextCloudPi \$( cat \$VERFILE )" \
-l "NextCloudPi \$( cat \$LATEST ) is available. Update from https://\$IP:4443"
cat \$LATEST > \$NOTIFIED
EOF
chmod +x /usr/local/bin/ncp-notify-update
# timer
cat > /etc/systemd/system/nc-notify-updates.timer <<EOF
[Unit]
Description=Timer notify NCP updates in browser

28
update.sh
View File

@ -66,34 +66,6 @@ test -f /root/.my.cnf || echo -e "[client]\npassword=ownyourbits" > /root/.my.cn
chown www-data /var/www/nextcloud/.htaccess
rm -rf /var/www/nextcloud/.well-known
# fix ncp-notify-update
cat > /usr/local/bin/ncp-notify-update <<'EOF'
#!/bin/bash
VERFILE=/usr/local/etc/ncp-version
LATEST=/var/run/.ncp-latest-version
NOTIFIED=/var/run/.ncp-version-notified
test -e $LATEST || exit 0;
ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; }
test -e $NOTIFIED && [[ "$( cat $LATEST )" == "$( cat $NOTIFIED )" ]] && {
echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Already notified"
exit 0
}
echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Sending notification..."
IFACE=$( ip r | grep "default via" | awk '{ print $5 }' )
IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )
sudo -u www-data php /var/www/nextcloud/occ notification:generate \
admin "NextCloudPi $( cat $VERFILE )" \
-l "NextCloudPi $( cat $LATEST ) is available. Update from https://$IP:4443"
cat $LATEST > $NOTIFIED
EOF
chmod +x /usr/local/bin/ncp-notify-update
# fix permissions for ncp-web: shutdown button
sed -i 's|www-data.*|www-data ALL = NOPASSWD: /home/www/ncp-launcher.sh , /sbin/halt|' /etc/sudoers