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

fix web update to NC12.0.1

Browse Source
This commit is contained in:
nachoparker 2017-08-08 23:18:09 +02:00
parent f248c0fc09
commit a6b79b433f
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/nextcloudpi-config.d/letsencrypt.sh
View File

@ -55,15 +55,17 @@ configure()
sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_/fullchain.pem|" $VHOSTCFG2
sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_/privkey.pem|" $VHOSTCFG2
/etc/letsencrypt/letsencrypt-auto certonly -n --no-self-upgrade --webroot -w $NCDIR --hsts --agree-tos -m $EMAIL_ -d $DOMAIN_ || return 1
echo "* 1 * * 1 root /etc/letsencrypt/certbot-auto renew --quiet" > /etc/cron.d/letsencrypt-ncp
/etc/letsencrypt/letsencrypt-auto certonly -n --no-self-upgrade --webroot -w $NCDIR --hsts --agree-tos -m $EMAIL_ -d $DOMAIN_ && {
echo "* 1 * * 1 root /etc/letsencrypt/certbot-auto renew --quiet" > /etc/cron.d/letsencrypt-ncp
cd /var/www/nextcloud
sudo -u www-data php occ config:system:set trusted_domains 4 --value=$DOMAIN_
sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://$DOMAIN_
cd /var/www/nextcloud
sudo -u www-data php occ config:system:set trusted_domains 4 --value=$DOMAIN_
sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://$DOMAIN_
# delayed in bg so it does not kill the connection, and we get AJAX response
( sleep 2 && systemctl restart apache2 ) &>/dev/null &
# delayed in bg so it does not kill the connection, and we get AJAX response
( sleep 2 && systemctl restart apache2 ) &>/dev/null &
}
rm -rf $NCDIR/.well-known
}
cleanup()

4
etc/nextcloudpi-config.d/nc-nextcloud.sh
View File

@ -115,11 +115,11 @@ EOF
printf "chmod/chown .htaccess\n"
if [ -f ${ocpath}/.htaccess ]; then
chmod 0644 ${ocpath}/.htaccess
chown ${rootuser}:${htgroup} ${ocpath}/.htaccess
chown ${htuser}:${htgroup} ${ocpath}/.htaccess
fi
if [ -f ${ocpath}/data/.htaccess ]; then
chmod 0644 ${ocpath}/data/.htaccess
chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess
chown ${htuser}:${htgroup} ${ocpath}/data/.htaccess
fi
# create and configure opcache dir

4
update.sh
View File

@ -59,6 +59,10 @@ activate_script unattended-upgrades.sh
# for old image users, save default password
test -f /root/.my.cnf || echo -e "[client]\npassword=ownyourbits" > /root/.my.cnf
# fix updates from NC12 to NC12.0.1
chown www-data /var/www/nextcloud/.htaccess
rm -rf /var/www/nextcloud/.well-known
# License
#
# This script is free software; you can redistribute it and/or modify it