diff options
-rw-r--r-- | Makefile | 12 | ||||
-rw-r--r-- | README.md | 24 | ||||
-rw-r--r-- | armbian.sh | 4 | ||||
-rwxr-xr-x | batch.sh | 10 | ||||
-rwxr-xr-x | bin/ncp-check-updates | 6 | ||||
-rwxr-xr-x | bin/ncp-config (renamed from bin/nextcloudpi-config) | 12 | ||||
-rw-r--r-- | bin/ncp-diag | 8 | ||||
-rw-r--r-- | bin/ncp-provisioning.sh | 4 | ||||
-rwxr-xr-x | bin/ncp-report | 4 | ||||
-rw-r--r-- | bin/ncp-suggestions | 4 | ||||
-rwxr-xr-x | bin/ncp-update | 4 | ||||
-rw-r--r-- | build-SD-odroid.sh | 5 | ||||
-rwxr-xr-x | build-SD.sh | 14 | ||||
-rw-r--r-- | buildlib.sh | 20 | ||||
-rw-r--r-- | changelog.md | 4 | ||||
-rw-r--r-- | docker-armhf/build-container.sh | 8 | ||||
-rw-r--r-- | docker-armhf/nextcloud/Dockerfile | 2 | ||||
-rw-r--r-- | docker-armhf/nextcloudplus/Dockerfile (renamed from docker-armhf/nextcloudpi/Dockerfile) | 14 | ||||
-rwxr-xr-x | docker-common/nextcloudplus/000ncp (renamed from docker-common/nextcloudpi/000ncp) | 2 | ||||
-rw-r--r-- | docker-compose-armhf.yml | 4 | ||||
-rw-r--r-- | docker-compose-ncpdev.yml | 4 | ||||
-rw-r--r-- | docker-compose.yml | 4 | ||||
-rw-r--r-- | docker/devel/Dockerfile | 4 | ||||
-rw-r--r-- | docker/nextcloud/Dockerfile | 2 | ||||
-rw-r--r-- | docker/nextcloudplus/Dockerfile (renamed from docker/nextcloudpi/Dockerfile) | 14 | ||||
-rw-r--r-- | etc/library.sh | 12 | ||||
-rw-r--r-- | etc/ncp-config.d/NFS.sh (renamed from etc/nextcloudpi-config.d/NFS.sh) | 3 | ||||
-rw-r--r-- | etc/ncp-config.d/SSH.sh (renamed from etc/nextcloudpi-config.d/SSH.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/UFW.sh (renamed from etc/nextcloudpi-config.d/UFW.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/dnsmasq.sh (renamed from etc/nextcloudpi-config.d/dnsmasq.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/duckDNS.sh (renamed from etc/nextcloudpi-config.d/duckDNS.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/fail2ban.sh (renamed from etc/nextcloudpi-config.d/fail2ban.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/freeDNS.sh (renamed from etc/nextcloudpi-config.d/freeDNS.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/NFS/es.json (renamed from etc/nextcloudpi-config.d/l10n/NFS/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/SSH/es.json (renamed from etc/nextcloudpi-config.d/l10n/SSH/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/UFW/es.json (renamed from etc/nextcloudpi-config.d/l10n/UFW/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/dnsmasq/es.json (renamed from etc/nextcloudpi-config.d/l10n/dnsmasq/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/duckDNS/es.json (renamed from etc/nextcloudpi-config.d/l10n/duckDNS/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/fail2ban/es.json (renamed from etc/nextcloudpi-config.d/l10n/fail2ban/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/freeDNS/es.json (renamed from etc/nextcloudpi-config.d/l10n/freeDNS/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/letsencrypt/es.json (renamed from etc/nextcloudpi-config.d/l10n/letsencrypt/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/modsecurity/es.json (renamed from etc/nextcloudpi-config.d/l10n/modsecurity/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-admin/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-admin/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-audit/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-audit/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-automount/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-automount/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-automount/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-automount/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json | 3 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-autoupdate-ncp/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-backup-auto/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-backup-auto/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-backup-auto/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-backup-auto/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-backup/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-backup/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-backup/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-backup/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-database/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-database/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-database/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-database/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-datadir/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-datadir/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-datadir/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-datadir/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-export-ncp/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-export-ncp/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-export-ncp/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-export-ncp/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-fix-permissions/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-fix-permissions/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-fix-permissions/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-fix-permissions/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-format-USB/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-format-USB/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-format-USB/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-format-USB/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-forward-ports/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-forward-ports/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-forward-ports/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-forward-ports/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-httpsonly/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-httpsonly/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-httpsonly/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-httpsonly/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-import-ncp/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-import-ncp/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-import-ncp/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-import-ncp/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-info/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-info/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-info/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-info/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-init/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-init/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-init/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-init/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-limits/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-limits/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-limits/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-limits/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-nextcloud/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-nextcloud/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-nextcloud/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-nextcloud/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-notify-updates/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-notify-updates/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-notify-updates/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-notify-updates/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-passwd/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-passwd/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-passwd/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-passwd/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-ramlogs/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-ramlogs/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-ramlogs/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-ramlogs/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-restore/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-restore/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-restore/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-restore/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-rsync-auto/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-rsync-auto/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-rsync/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-rsync/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-scan-auto/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-scan-auto/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-scan-auto/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-scan-auto/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-scan/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-scan/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-scan/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-scan/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-snapshot-auto/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-snapshot-auto/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-snapshot-sync/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-snapshot-sync/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-snapshot/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-snapshot/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-snapshot/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-snapshot/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-static-IP/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-static-IP/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-static-IP/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-static-IP/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-swapfile/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-swapfile/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-swapfile/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-swapfile/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-update/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-update/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-webui/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-webui/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-webui/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-webui/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-wifi/de.json (renamed from etc/nextcloudpi-config.d/l10n/nc-wifi/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/nc-zram/es.json (renamed from etc/nextcloudpi-config.d/l10n/nc-zram/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/no-ip/es.json (renamed from etc/nextcloudpi-config.d/l10n/no-ip/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/samba/es.json (renamed from etc/nextcloudpi-config.d/l10n/samba/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/spDYN/es.json (renamed from etc/nextcloudpi-config.d/l10n/spDYN/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/unattended-upgrades/de.json (renamed from etc/nextcloudpi-config.d/l10n/unattended-upgrades/de.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/l10n/unattended-upgrades/es.json (renamed from etc/nextcloudpi-config.d/l10n/unattended-upgrades/es.json) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/letsencrypt.sh (renamed from etc/nextcloudpi-config.d/letsencrypt.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/modsecurity.sh (renamed from etc/nextcloudpi-config.d/modsecurity.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-admin.sh (renamed from etc/nextcloudpi-config.d/nc-admin.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-audit.sh (renamed from etc/nextcloudpi-config.d/nc-audit.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-automount.sh (renamed from etc/nextcloudpi-config.d/nc-automount.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-autoupdate-ncp.sh (renamed from etc/nextcloudpi-config.d/nc-autoupdate-ncp.sh) | 12 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-backup-auto.sh (renamed from etc/nextcloudpi-config.d/nc-backup-auto.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-backup.sh (renamed from etc/nextcloudpi-config.d/nc-backup.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-database.sh (renamed from etc/nextcloudpi-config.d/nc-database.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-datadir.sh (renamed from etc/nextcloudpi-config.d/nc-datadir.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-export-ncp.sh (renamed from etc/nextcloudpi-config.d/nc-export-ncp.sh) | 6 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-fix-permissions.sh (renamed from etc/nextcloudpi-config.d/nc-fix-permissions.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-format-USB.sh (renamed from etc/nextcloudpi-config.d/nc-format-USB.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-forward-ports.sh (renamed from etc/nextcloudpi-config.d/nc-forward-ports.sh) | 4 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-httpsonly.sh (renamed from etc/nextcloudpi-config.d/nc-httpsonly.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-import-ncp.sh (renamed from etc/nextcloudpi-config.d/nc-import-ncp.sh) | 10 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-info.sh (renamed from etc/nextcloudpi-config.d/nc-info.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-init.sh (renamed from etc/nextcloudpi-config.d/nc-init.sh) | 8 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-limits.sh (renamed from etc/nextcloudpi-config.d/nc-limits.sh) | 4 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-nextcloud.sh (renamed from etc/nextcloudpi-config.d/nc-nextcloud.sh) | 4 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-notify-updates.sh (renamed from etc/nextcloudpi-config.d/nc-notify-updates.sh) | 10 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-passwd.sh (renamed from etc/nextcloudpi-config.d/nc-passwd.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-ramlogs.sh (renamed from etc/nextcloudpi-config.d/nc-ramlogs.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-restore.sh (renamed from etc/nextcloudpi-config.d/nc-restore.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-rsync-auto.sh (renamed from etc/nextcloudpi-config.d/nc-rsync-auto.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-rsync.sh (renamed from etc/nextcloudpi-config.d/nc-rsync.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-scan-auto.sh (renamed from etc/nextcloudpi-config.d/nc-scan-auto.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-scan.sh (renamed from etc/nextcloudpi-config.d/nc-scan.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-snapshot-auto.sh (renamed from etc/nextcloudpi-config.d/nc-snapshot-auto.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-snapshot-sync.sh (renamed from etc/nextcloudpi-config.d/nc-snapshot-sync.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-snapshot.sh (renamed from etc/nextcloudpi-config.d/nc-snapshot.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-static-IP.sh (renamed from etc/nextcloudpi-config.d/nc-static-IP.sh) | 8 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-swapfile.sh (renamed from etc/nextcloudpi-config.d/nc-swapfile.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-update.sh (renamed from etc/nextcloudpi-config.d/nc-update.sh) | 4 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-webui.sh (renamed from etc/nextcloudpi-config.d/nc-webui.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-wifi.sh (renamed from etc/nextcloudpi-config.d/nc-wifi.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-zram.sh (renamed from etc/nextcloudpi-config.d/nc-zram.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/no-ip.sh (renamed from etc/nextcloudpi-config.d/no-ip.sh) | 0 | ||||
-rw-r--r-- | etc/ncp-config.d/samba.sh (renamed from etc/nextcloudpi-config.d/samba.sh) | 9 | ||||
-rw-r--r-- | etc/ncp-config.d/spDYN.sh (renamed from etc/nextcloudpi-config.d/spDYN.sh) | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/unattended-upgrades.sh (renamed from etc/nextcloudpi-config.d/unattended-upgrades.sh) | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/de.json | 3 | ||||
-rw-r--r-- | install.sh | 20 | ||||
-rw-r--r-- | ncp-web/activate/JS.js | 6 | ||||
-rw-r--r-- | ncp-web/activate/index.php | 1 | ||||
-rw-r--r-- | ncp-web/csrf.php | 2 | ||||
-rw-r--r-- | ncp-web/index.php | 12 | ||||
-rw-r--r-- | ncp-web/l10n/de.json | 2 | ||||
-rw-r--r-- | ncp-web/ncp-launcher.php | 8 | ||||
-rw-r--r-- | ncp-web/ncp.css | 8 | ||||
-rw-r--r-- | ncp-web/ncp.js | 2 | ||||
-rw-r--r-- | ncp-web/sidebar.php | 4 | ||||
-rw-r--r-- | ncp-web/wizard/index.php | 12 | ||||
-rw-r--r-- | nextcloudplus.sh (renamed from nextcloudpi.sh) | 29 | ||||
-rw-r--r-- | raspbian-cleanup.sh | 2 | ||||
-rw-r--r-- | remote-update.sh | 48 | ||||
-rwxr-xr-x | tests/tests.py | 12 | ||||
-rwxr-xr-x | update.sh | 23 |
167 files changed, 238 insertions, 280 deletions
@@ -1,12 +1,12 @@ -# Batch-build docker container layers for nextcloudpi +# Batch-build docker container layers for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! # -nextcloudpi-armhf: nextcloud-armhf - docker build . -f docker-armhf/nextcloudpi/Dockerfile -t ownyourbits/nextcloudpi-armhf:latest --no-cache +nextcloudplus-armhf: nextcloud-armhf + docker build . -f docker-armhf/nextcloudplus/Dockerfile -t ownyourbits/nextcloudplus-armhf:latest --no-cache nextcloud-armhf: lamp-armhf docker build . -f docker-armhf/nextcloud/Dockerfile -t ownyourbits/nextcloud-armhf:latest @@ -18,8 +18,8 @@ debian-ncp-armhf: docker build . -f docker-armhf/debian-ncp/Dockerfile -t ownyourbits/debian-ncp-armhf:latest -nextcloudpi-x86: nextcloud-x86 - docker build . -f docker/nextcloudpi/Dockerfile -t ownyourbits/nextcloudpi-x86:latest --no-cache +nextcloudplus-x86: nextcloud-x86 + docker build . -f docker/nextcloudplus/Dockerfile -t ownyourbits/nextcloudplus-x86:latest --no-cache nextcloud-x86: lamp-x86 docker build . -f docker/nextcloud/Dockerfile -t ownyourbits/nextcloud-x86:latest @@ -31,7 +31,7 @@ debian-ncp-x86: docker build . -f docker/debian-ncp/Dockerfile -t ownyourbits/debian-ncp-x86:latest devel: - docker build . -f docker/devel/Dockerfile -t ownyourbits/nextcloudpi-x86:devel + docker build . -f docker/devel/Dockerfile -t ownyourbits/nextcloudplus-x86:devel # License # @@ -1,13 +1,15 @@ -# NextCloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) +# NextCloudPlus [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) ![NC Logo](https://ownyourbits.com/wp-content/uploads/2017/11/ncp-square.png) -This is the build code for [NextCloudPi](https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/). +This is the build code for [NextCloudPlus](https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/) ( formerly NextCloudPi ). + +NextCloudPlus is a ready to use image for Raspberry Pi, odroid HC1 and other boards. NextCloudPi is a ready to use image for Raspberry Pi. -This code also generates the [NextCloudPi docker images](https://hub.docker.com/r/ownyourbits/nextcloudpi/). +This code also generates the [NextCloudPlus docker images](https://hub.docker.com/r/ownyourbits/nextcloudpi/) for ARM and x86 platforms, and includes an installer for any Debian based system. ## Features @@ -18,7 +20,7 @@ This code also generates the [NextCloudPi docker images](https://hub.docker.com/ * MariaDB 10 * Redis memory cache ( NEW 11-12-2017 ) * 4.9 Linux Kernel ( NEW 03-13-2017 ) - * nextcloudpi-config for easy setup ( RAM logs, USB drive and more ) + * ncp-config for easy setup ( RAM logs, USB drive and more ) * Automatic redirection to HTTPS * ACPU PHP cache * PHP Zend OPcache enabled with file cache @@ -32,7 +34,7 @@ This code also generates the [NextCloudPi docker images](https://hub.docker.com/ ## Extras * Setup wizard ( NEW 09-27-2017 ) - * NextCloudPi Web Panel ( NEW 07-24-2017 ) + * NextCloudPlus Web Panel ( NEW 07-24-2017 ) * Wi-Fi ready ( NEW 03-31-2017 ) * Ram logs ( NEW 03-31-2017 ) * Automatic security updates, activated by default. ( NEW 03-21-2017 ) @@ -73,7 +75,7 @@ Extras can be activated and configured using the web interface at HTTPS port 444 , or from the command line from ``` -sudo nextcloudpi-config +sudo ncp-config ``` ![NCP-config](https://ownyourbits.com/wp-content/uploads/2017/03/ncp-conf-700x456.jpg) @@ -81,7 +83,7 @@ sudo nextcloudpi-config ## How to build -The NextCloudPi SD image is based on Raspbian and is automatically generated using QEMU. +The NextCloudPlus SD image is based on Raspbian and is automatically generated using QEMU. ``` git clone https://github.com/nextcloud/nextcloudpi.git @@ -102,10 +104,10 @@ make ``` git clone https://github.com/nextcloud/nextcloudpi.git cd nextcloudpi -make nextcloudpi-x86 +make nextcloudplus-x86 ``` -NextCloudPi can be installed in any architecture running the latest Debian +NextCloudPlus can be installed in any architecture running the latest Debian ``` # curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh | bash @@ -124,3 +126,7 @@ https://ownyourbits.com/2017/06/08/nextcloudpi-docker-for-raspberry-pi/ https://hub.docker.com/r/ownyourbits/nextcloudpi-x86 https://hub.docker.com/r/ownyourbits/nextcloudpi-armhf + +## Contact + +You can find us in the [forums](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) and a [Telegram group](https://t.me/NextCloudPi) @@ -2,7 +2,7 @@ # arguments: $RELEASE $LINUXFAMILY $BOARD $BUILD_DESKTOP -# This is the image customization script for NextCloudPi on Armbian +# This is the image customization script for NextCloudPlus on Armbian # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -51,7 +51,7 @@ Main() { # cleanup all NCP options source /usr/local/etc/library.sh - cd /usr/local/etc/nextcloudpi-config.d/ + cd /usr/local/etc/ncp-config.d/ for script in *.sh; do cleanup_script $script done @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi images and containers +# Batch creation of NextCloudPlus images and containers # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -19,11 +19,15 @@ IP=$1 # First argument is the QEMU Raspbian IP address # docker x86 docker pull debian:stretch-slim -make nextcloudpi-x86 && { - docker push ownyourbits/nextcloudpi-x86 +make nextcloudplus-x86 && { + docker push ownyourbits/nextcloudplus-x86 docker push ownyourbits/nextcloud-x86 docker push ownyourbits/lamp-x86 docker push ownyourbits/debian-ncp-x86 + + # keep old container updated, at least for a while + docker tag ownyourbits/nextcloudplus-x86 ownyourbits/nextcloudpi-x86 + docker push ownyourbits/nextcloudpi-x86 } # docker armhf diff --git a/bin/ncp-check-updates b/bin/ncp-check-updates index f3f9bf61..34275228 100755 --- a/bin/ncp-check-updates +++ b/bin/ncp-check-updates @@ -6,8 +6,8 @@ VERFILE=/usr/local/etc/ncp-version LATEST=/var/run/.ncp-latest-version if ncp-test-updates; then - echo -e "\nNextCloudPi \e[1m$( cat $VERFILE)\e[0m is outdated" - echo -e "update to \e[1m$( cat $LATEST )\e[0m through 'nextcloudpi-config' or type 'sudo ncp-update'" + echo -e "\nNextCloudPlus \e[1m$( cat $VERFILE)\e[0m is outdated" + echo -e "update to \e[1m$( cat $LATEST )\e[0m through 'ncp-config' or type 'sudo ncp-update'" else - echo -e "\nNextCloudPi \e[1m$( cat $VERFILE)\e[0m is up to date" + echo -e "\nNextCloudPlus \e[1m$( cat $VERFILE)\e[0m is up to date" fi diff --git a/bin/nextcloudpi-config b/bin/ncp-config index 9be1aeaf..5881f51a 100755 --- a/bin/nextcloudpi-config +++ b/bin/ncp-config @@ -1,12 +1,12 @@ #!/bin/bash -# NextCloudPi software configuration +# NextCloudPlus software configuration # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! # # Usage: -# sudo nextcloudpi-config +# sudo ncp-config # # More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/ # @@ -18,8 +18,8 @@ function nextcloud-config() { local DIALOG_OK=0 local VERFILE=/var/run/.ncp-latest-version - local BACKTITLE="NextCloudPi configuration ver. " - local CONFDIR=/usr/local/etc/nextcloudpi-config.d/ + local BACKTITLE="NextCloudPlus configuration ver. " + local CONFDIR=/usr/local/etc/ncp-config.d/ local DESC # ask for update if outdated @@ -27,7 +27,7 @@ function nextcloud-config() local CHANGELOG=$( head -4 /usr/local/etc/ncp-changelog ) ncp-test-updates && \ whiptail --backtitle "$BACKTITLE $( cat /usr/local/etc/ncp-version )" \ - --title "NextCloudPi update available" \ + --title "NextCloudPlus update available" \ --clear --yesno "Update to $( cat $VERFILE )?\n\n$CHANGELOG" \ 15 70 [[ $? -eq $DIALOG_OK ]] && ncp-update @@ -45,7 +45,7 @@ function nextcloud-config() # launch the selection menu local script script=$( whiptail --backtitle "$BACKTITLE $( cat /usr/local/etc/ncp-version )" \ - --title "NextCloudPi Software Configuration Tool (nextcloudpi-config)" \ + --title "NextCloudPlus Software Configuration Tool (ncp-config)" \ --cancel-button Finish --ok-button Select \ --menu "Select program to configure and activate:" 20 105 10 \ "${LIST[@]}" \ diff --git a/bin/ncp-diag b/bin/ncp-diag index 3c65fd94..9f371b08 100644 --- a/bin/ncp-diag +++ b/bin/ncp-diag @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi diagnostics report +# NextCloudPlus diagnostics report # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -12,8 +12,8 @@ # # Distro, NCP version and tag -echo "NextCloudPi version|$( cat /usr/local/etc/ncp-version )" -echo "NextCloudPi image|$( cat /usr/local/etc/ncp-baseimage )" +echo "NextCloudPlus version|$( cat /usr/local/etc/ncp-version )" +echo "NextCloudPlus image|$( cat /usr/local/etc/ncp-baseimage )" echo "distribution|$( cat /etc/issue )" # Data @@ -23,7 +23,7 @@ test -d "$DATADIR" || DIRINFO=" (doesn't exist)" USBDEVS="$( lsblk -S -o NAME,TRAN | awk '{ if ( $2 == "usb" ) print $1; }' | tr '\n' ' ' )" [[ "$USBDEVS" == "" ]] && USBDEVS="none" -echo "automount|$( grep "^ACTIVE_" /usr/local/etc/nextcloudpi-config.d/nc-automount.sh | cut -d'=' -f2 )" +echo "automount|$( grep "^ACTIVE_" /usr/local/etc/ncp-config.d/nc-automount.sh | cut -d'=' -f2 )" echo "USB devices|$USBDEVS" echo "datadir|$DATADIR$DIRINFO" [[ "$DIRINFO" == "" ]] && { diff --git a/bin/ncp-provisioning.sh b/bin/ncp-provisioning.sh index 702157ef..8b13a5db 100644 --- a/bin/ncp-provisioning.sh +++ b/bin/ncp-provisioning.sh @@ -50,7 +50,7 @@ EOF CURRENT_THREADS=$( grep "^pm.max_children" /etc/php/7.0/fpm/pool.d/www.conf | awk '{ print $3 }' ) -CFG=/usr/local/etc/nextcloudpi-config.d/nc-limits.sh +CFG=/usr/local/etc/ncp-config.d/nc-limits.sh PHPTHREADS=0 [[ -f "$CFG" ]] && PHPTHREADS=$( grep "^PHPTHREADS_" "$CFG" | cut -d= -f2 ) @@ -75,7 +75,7 @@ PHPTHREADS=0 } ## Fix permissions on NCP folders. The main reason for this is to make devel docker container work -CONFDIR="/usr/local/etc/nextcloudpi-config.d/" +CONFDIR="/usr/local/etc/ncp-config.d/" [[ -e $CONFDIR ]] && { chown -R root:www-data "$CONFDIR"/* chmod 660 "$CONFDIR"/* diff --git a/bin/ncp-report b/bin/ncp-report index 0556423b..65881d6a 100755 --- a/bin/ncp-report +++ b/bin/ncp-report @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi diagnostics report +# NextCloudPlus diagnostics report # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -38,7 +38,7 @@ echo "<--! Paste this in GitHub report -->" ## -open_summary "NextCloudPi diagnostics" +open_summary "NextCloudPlus diagnostics" bash /usr/local/bin/ncp-diag | column -t -s'|' close_summary diff --git a/bin/ncp-suggestions b/bin/ncp-suggestions index 0b7b0da3..76498103 100644 --- a/bin/ncp-suggestions +++ b/bin/ncp-suggestions @@ -1,7 +1,7 @@ #!/bin/bash # -# NextCloudPi configuration suggestions +# NextCloudPlus configuration suggestions # # Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -14,7 +14,7 @@ OUT="$@" -DNSMASQ_ON="$( grep "^ACTIVE_=" /usr/local/etc/nextcloudpi-config.d/dnsmasq.sh | cut -d'=' -f2 )" +DNSMASQ_ON="$( grep "^ACTIVE_=" /usr/local/etc/ncp-config.d/dnsmasq.sh | cut -d'=' -f2 )" grep -q "distribution|.*bian GNU/Linux 9" <<<"$OUT" || \ echo -e "You are using an unsupported distro release. Please upgrade to latest Debian/Raspbian" diff --git a/bin/ncp-update b/bin/ncp-update index 9b90b054..0df91fa9 100755 --- a/bin/ncp-update +++ b/bin/ncp-update @@ -1,6 +1,6 @@ #!/bin/bash -# update latest NextCloudPi code from github +# update latest NextCloudPlus code from github { [ "$(id -u)" -ne 0 ] && { printf "Must be run as root. Try 'sudo $0'\n"; exit 1; } @@ -32,7 +32,7 @@ sed '/HEAD ->\|origin/s|\[.*\(tag: v[0-9]\+\.[0-9]\+\.[0-9]\+\).*\]|[\1]|' | \ sed 's|* \[tag: |[|' > /usr/local/etc/ncp-changelog } - echo -e "NextCloudPi updated to version $VER" + echo -e "NextCloudPlus updated to version $VER" } cd / diff --git a/build-SD-odroid.sh b/build-SD-odroid.sh index cccdf18f..dd693fdb 100644 --- a/build-SD-odroid.sh +++ b/build-SD-odroid.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi image for the Odroid HC1 +# Batch creation of NextCloudPlus image for the Odroid HC1 # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -27,10 +27,11 @@ armbian/compile.sh docker \ RELEASE=stretch\ BUILD_DESKTOP=no\ CLEAN_LEVEL=""\ + USE_CCACHE=yes\ NO_APT_CACHER=no # pack image -IMGNAME="NextCloudPi_$( date "+%m-%d-%y" )_OdroidHC1" +IMGNAME="NextCloudPlus_$( date "+%m-%d-%y" )_OdroidHC1" IMGFILE="$( ls -1t armbian/output/images/*.img | head -1 )" pack_image "$IMGFILE" "$IMGNAME.img" diff --git a/build-SD.sh b/build-SD.sh index 336ca5ae..b96fbdc3 100755 --- a/build-SD.sh +++ b/build-SD.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi image +# Batch creation of NextCloudPlus image # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -21,10 +21,10 @@ IP=$1 # First argument is the QEMU Raspbian IP address ## BUILDING -NC_INSTALL=etc/nextcloudpi-config.d/nc-nextcloud.sh -NC_CONFIG=etc/nextcloudpi-config.d/nc-init.sh +NC_INSTALL=etc/ncp-config.d/nc-nextcloud.sh +NC_CONFIG=etc/ncp-config.d/nc-init.sh -IMGBASE="NextCloudPi_$( date "+%m-%d-%y" )_base.img" +IMGBASE="NextCloudPlus_$( date "+%m-%d-%y" )_base.img" export NO_CONFIG=1 # skip interactive configuration @@ -35,14 +35,14 @@ download_resize_raspbian_img 1G "$IMGBASE" NO_HALT_STEP=1 ./installer.sh prepare.sh "$IP" "$IMGBASE" ./installer.sh lamp.sh "$IP" "$( ls -1t *.img | head -1 )" ./installer.sh $NC_INSTALL "$IP" "$( ls -1t *.img | head -1 )" - ./installer.sh nextcloudpi.sh "$IP" "$( ls -1t *.img | head -1 )" + ./installer.sh nextcloudplus.sh "$IP" "$( ls -1t *.img | head -1 )" ./installer.sh $NC_CONFIG "$IP" "$( ls -1t *.img | head -1 )" ./installer.sh raspbian-cleanup.sh "$IP" "$( ls -1t *.img | head -1 )" ## PACKING IMGFILE=$( ls -1t *.img | head -1 ) -IMGNAME=$( basename "$IMGFILE" _base_prepare_lamp_nc-nextcloud_nextcloudpi_nc-init_raspbian-cleanup.img ) +IMGNAME=$( basename "$IMGFILE" _base_prepare_lamp_nc-nextcloud_nextcloudplus_nc-init_raspbian-cleanup.img ) [[ "$IMGNAME" != "" ]] || exit 1 @@ -65,7 +65,7 @@ upload_ftp "$IMGNAME" || true ## CLEANUP -mkdir -p partial && mv NextCloudPi*.bz2 partial +mkdir -p partial && mv NextCloudPlus*.bz2 partial rm -f *.img # License diff --git a/buildlib.sh b/buildlib.sh index 4f024818..a7c720f8 100644 --- a/buildlib.sh +++ b/buildlib.sh @@ -155,7 +155,7 @@ function deactivate_unattended_upgrades() [ -f "$IMG" ] || { echo "no image"; return 1; } mkdir -p tmpmnt sudo mount "$IMG" -o offset="$OFFSET" tmpmnt || return 1 - sudo rm -f tmpmnt/etc/apt/apt.conf.d/20nextcloudpi-upgrades + sudo rm -f tmpmnt/etc/apt/apt.conf.d/20ncp-upgrades sudo umount -l tmpmnt rmdir tmpmnt &>/dev/null } @@ -199,7 +199,7 @@ function create_torrent() [[ -d "$DIR" ]] && { echo "dir $DIR already exists"; return 1; } mkdir -p torrent/"$IMGNAME" && cp --reflink=auto "$IMG" torrent/"$IMGNAME" md5sum "$DIR"/*.bz2 > "$DIR"/md5sum - createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextCloudPi. Nextcloud for Raspberry Pi image" "$DIR" "$DIR".torrent + createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextCloudPlus. Nextcloud for Raspberry Pi image" "$DIR" "$DIR".torrent } function generate_changelog() @@ -211,22 +211,6 @@ function generate_changelog() sed 's|* \[tag: |\n[|' > changelog.md } -function deactivate_unattended_upgrades() -{ - local IMG=$1 - local SECTOR - local OFFSET - SECTOR=$( fdisk -l "$IMG" | grep Linux | awk '{ print $2 }' ) - OFFSET=$(( SECTOR * 512 )) - - [ -f "$IMG" ] || { echo "no image"; return 1; } - mkdir -p tmpmnt - sudo mount "$IMG" -o offset="$OFFSET" tmpmnt || return 1 - sudo rm -f tmpmnt/etc/apt/apt.conf.d/20nextcloudpi-upgrades - sudo umount -l tmpmnt - rmdir tmpmnt &>/dev/null -} - function prepare_sshd() { local IMG="$1" diff --git a/changelog.md b/changelog.md index 4ef6a5f9..0ef043b2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v0.53.28](https://github.com/nextcloud/nextcloudpi/commit/1c3532d) (2018-04-18) ncp-web: added spanish translations +[v0.53.29](https://github.com/nextcloud/nextcloudpi/commit/dc1289f) (2018-04-05) renamed to NextCloudPlus + +[v0.53.28](https://github.com/nextcloud/nextcloudpi/commit/ab913c2) (2018-04-18) ncp-web: added spanish translations [v0.53.27](https://github.com/nextcloud/nextcloudpi/commit/24360e0) (2018-04-09) ncp-web: added language dropdown selector diff --git a/docker-armhf/build-container.sh b/docker-armhf/build-container.sh index d7d0eed3..73c3d39c 100644 --- a/docker-armhf/build-container.sh +++ b/docker-armhf/build-container.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Build NextCloudPi ARM docker container in a QEMU Raspbian with docker +# Build NextCloudPlus ARM docker container in a QEMU Raspbian with docker # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -16,10 +16,14 @@ install() git pull origin master docker pull arm32v7/debian:stretch-slim make && { - docker push ownyourbits/nextcloudpi-armhf + docker push ownyourbits/nextcloudplus-armhf docker push ownyourbits/nextcloud-armhf docker push ownyourbits/lamp-armhf docker push ownyourbits/debian-ncp-armhf + + # keep old container updated, at least for a while + docker tag ownyourbits/nextcloudplus-armhf ownyourbits/nextcloudpi-armhf + docker push ownyourbits/nextcloudpi-armhf } } diff --git a/docker-armhf/nextcloud/Dockerfile b/docker-armhf/nextcloud/Dockerfile index ee45e2af..1220909e 100644 --- a/docker-armhf/nextcloud/Dockerfile +++ b/docker-armhf/nextcloud/Dockerfile @@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"] ENV DOCKERBUILD 1 COPY etc/library.sh /usr/local/etc/ -COPY etc/nextcloudpi-config.d/nc-init.sh etc/nextcloudpi-config.d/nc-nextcloud.sh / +COPY etc/ncp-config.d/nc-init.sh etc/ncp-config.d/nc-nextcloud.sh / RUN \ diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudplus/Dockerfile index 9a86616c..652e2ac7 100644 --- a/docker-armhf/nextcloudpi/Dockerfile +++ b/docker-armhf/nextcloudplus/Dockerfile @@ -6,7 +6,7 @@ SHELL ["/bin/bash", "-c"] ENV DOCKERBUILD 1 -COPY nextcloudpi.sh /usr/local/etc/ +COPY nextcloudplus.sh /usr/local/etc/ RUN \ @@ -19,17 +19,17 @@ touch /.docker-image; \ apt-get update; \ apt-get install --no-install-recommends -y wget ca-certificates; \ -# install nextcloudpi +# install nextcloudplus source /usr/local/etc/library.sh; \ set +x; \ cd /usr/local/etc/; \ -install_script nextcloudpi.sh; \ +install_script nextcloudplus.sh; \ # fix default paths -sed -i 's|/media/USBdrive|/data/backups|' nextcloudpi-config.d/nc-backup.sh; \ +sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \ # specific cleanup -rm /usr/local/etc/nextcloudpi.sh; \ +rm /usr/local/etc/nextcloudplus.sh; \ rm /.ncp-image; \ # remove wizard for now @@ -37,7 +37,7 @@ rm -r /var/www/ncp-web/wizard; \ # cleanup all NCP extras source /usr/local/etc/library.sh; \ -cd /usr/local/etc/nextcloudpi-config.d/; \ +cd /usr/local/etc/ncp-config.d/; \ for script in *.sh; do cleanup_script $script; done; \ # letsencrypt build artifacts cleanup @@ -76,7 +76,7 @@ rm -rf /usr/share/doc/*; \ rm -f /var/log/alternatives.log /var/log/apt/*; \ rm /var/cache/debconf/*-old; -COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/ +COPY docker-common/nextcloudplus/000ncp /etc/services-enabled.d/ # 4443 - ncp-web EXPOSE 80 443 4443 diff --git a/docker-common/nextcloudpi/000ncp b/docker-common/nextcloudplus/000ncp index 47c9261f..0d00cb65 100755 --- a/docker-common/nextcloudpi/000ncp +++ b/docker-common/nextcloudplus/000ncp @@ -3,7 +3,7 @@ source /usr/local/etc/library.sh # INIT NCP CONFIG (first run) -persistent_cfg /usr/local/etc/nextcloudpi-config.d /data/ncp +persistent_cfg /usr/local/etc/ncp-config.d /data/ncp persistent_cfg /etc/services-enabled.d persistent_cfg /etc/shadow # persist ncp-web password diff --git a/docker-compose-armhf.yml b/docker-compose-armhf.yml index 8e4fb019..afec1f2c 100644 --- a/docker-compose-armhf.yml +++ b/docker-compose-armhf.yml @@ -1,7 +1,7 @@ version: '3' services: - nextcloudpi: - image: ownyourbits/nextcloudpi-armhf + nextcloudplus: + image: ownyourbits/nextcloudplus-armhf command: "${IP}" ports: - "80:80" diff --git a/docker-compose-ncpdev.yml b/docker-compose-ncpdev.yml index 58dc00de..81f1b41a 100644 --- a/docker-compose-ncpdev.yml +++ b/docker-compose-ncpdev.yml @@ -1,7 +1,7 @@ version: '3' services: - nextcloudpi-dev: - image: ownyourbits/nextcloudpi-x86 + nextcloudplus-dev: + image: ownyourbits/nextcloudplus-x86 command: "${IP}" ports: - "80:80" diff --git a/docker-compose.yml b/docker-compose.yml index 8ec6d990..baf58ca5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: - nextcloudpi: - image: ownyourbits/nextcloudpi-x86 + nextcloudplus: + image: ownyourbits/nextcloudplus-x86 command: "${IP}" ports: - "80:80" diff --git a/docker/devel/Dockerfile b/docker/devel/Dockerfile index 277d87fa..ce65fa97 100644 --- a/docker/devel/Dockerfile +++ b/docker/devel/Dockerfile @@ -1,4 +1,4 @@ -FROM ownyourbits/nextcloudpi-x86 +FROM ownyourbits/nextcloudplus-x86 MAINTAINER Ignacio Núñez Hernanz <nacho@ownyourbits.com> @@ -12,7 +12,7 @@ RUN \ apt-get update; \ apt-get install --no-install-recommends -y wget ca-certificates git; \ -# install nextcloudpi devel +# install nextcloudplus devel source /usr/local/etc/library.sh; \ set +x; \ cd /usr/local/etc/; \ diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index 483aa6f1..214bd74b 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"] ENV DOCKERBUILD 1 COPY etc/library.sh /usr/local/etc/ -COPY etc/nextcloudpi-config.d/nc-init.sh etc/nextcloudpi-config.d/nc-nextcloud.sh / +COPY etc/ncp-config.d/nc-init.sh etc/ncp-config.d/nc-nextcloud.sh / RUN \ diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudplus/Dockerfile index 47574507..a75ef835 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudplus/Dockerfile @@ -6,7 +6,7 @@ SHELL ["/bin/bash", "-c"] ENV DOCKERBUILD 1 -COPY nextcloudpi.sh /usr/local/etc/ +COPY nextcloudplus.sh /usr/local/etc/ RUN \ @@ -19,17 +19,17 @@ touch /.docker-image; \ apt-get update; \ apt-get install --no-install-recommends -y wget ca-certificates; \ -# install nextcloudpi +# install nextcloudplus source /usr/local/etc/library.sh; \ set +x; \ cd /usr/local/etc/; \ -install_script nextcloudpi.sh; \ +install_script nextcloudplus.sh; \ # fix default paths -sed -i 's|/media/USBdrive|/data/backups|' nextcloudpi-config.d/nc-backup.sh; \ +sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \ # specific cleanup -rm /usr/local/etc/nextcloudpi.sh; \ +rm /usr/local/etc/nextcloudplus.sh; \ rm /.ncp-image; \ # remove wizard for now @@ -37,7 +37,7 @@ rm -r /var/www/ncp-web/wizard; \ # cleanup all NCP extras source /usr/local/etc/library.sh; \ -cd /usr/local/etc/nextcloudpi-config.d/; \ +cd /usr/local/etc/ncp-config.d/; \ for script in *.sh; do cleanup_script $script; done; \ # letsencrypt build artifacts cleanup @@ -82,7 +82,7 @@ rm -rf /usr/share/doc/*; \ rm -f /var/log/alternatives.log /var/log/apt/*; \ rm /var/cache/debconf/*-old; -COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/ +COPY docker-common/nextcloudplus/000ncp /etc/services-enabled.d/ # 4443 - ncp-web EXPOSE 80 443 4443 diff --git a/etc/library.sh b/etc/library.sh index a08d6fd4..56ad6b71 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi function library +# NextCloudPlus function library # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -13,7 +13,7 @@ function config() { local INSTALL_SCRIPT="$1" - local BACKTITLE="NextCloudPi installer configuration" + local BACKTITLE="NextCloudPlus installer configuration" type dialog &>/dev/null || { echo "please, install dialog for interactive configuration"; return 1; } @@ -133,12 +133,12 @@ function info_script() { ( local SCRIPT=$1 - cd /usr/local/etc/nextcloudpi-config.d/ || return 1 + cd /usr/local/etc/ncp-config.d/ || return 1 unset show_info INFO INFOTITLE source ./"$SCRIPT" local INFOTITLE="${INFOTITLE:-Info}" [[ "$INFO" == "" ]] && return 0 - whiptail --yesno --backtitle "NextCloudPi configuration" --title "$INFOTITLE" "$INFO" 20 90 + whiptail --yesno --backtitle "NextCloudPlus configuration" --title "$INFOTITLE" "$INFO" 20 90 ) } @@ -146,7 +146,7 @@ function configure_script() { ( local SCRIPT=$1 - cd /usr/local/etc/nextcloudpi-config.d/ || return 1 + cd /usr/local/etc/ncp-config.d/ || return 1 config "$SCRIPT" || return 1 # writes "$INSTALLATION_CODE" echo -e "$INSTALLATION_CODE" > "$SCRIPT" # save configuration source ./"$SCRIPT" # load configuration @@ -162,7 +162,7 @@ function cleanup_script() { ( local SCRIPT=$1 - cd /usr/local/etc/nextcloudpi-config.d/ || return 1 + cd /usr/local/etc/ncp-config.d/ || return 1 unset cleanup source ./"$SCRIPT" if [[ $( type -t cleanup ) == function ]]; then diff --git a/etc/nextcloudpi-config.d/NFS.sh b/etc/ncp-config.d/NFS.sh index 81acf758..e3b64988 100644 --- a/etc/nextcloudpi-config.d/NFS.sh +++ b/etc/ncp-config.d/NFS.sh @@ -24,8 +24,7 @@ INFOTITLE="Instructions for external synchronization" INFO="If we intend to modify the data folder through NFS, then we have to synchronize NextCloud to make it aware of the changes. -This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto' -from 'nextcloudpi-config'" +This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'" install() { diff --git a/etc/nextcloudpi-config.d/SSH.sh b/etc/ncp-config.d/SSH.sh index 2dcdc7d2..2dcdc7d2 100644 --- a/etc/nextcloudpi-config.d/SSH.sh +++ b/etc/ncp-config.d/SSH.sh diff --git a/etc/nextcloudpi-config.d/UFW.sh b/etc/ncp-config.d/UFW.sh index 617e6ed7..617e6ed7 100644 --- a/etc/nextcloudpi-config.d/UFW.sh +++ b/etc/ncp-config.d/UFW.sh diff --git a/etc/nextcloudpi-config.d/dnsmasq.sh b/etc/ncp-config.d/dnsmasq.sh index d022def5..d022def5 100644 --- a/etc/nextcloudpi-config.d/dnsmasq.sh +++ b/etc/ncp-config.d/dnsmasq.sh diff --git a/etc/nextcloudpi-config.d/duckDNS.sh b/etc/ncp-config.d/duckDNS.sh index 4db8772e..90d9c35f 100644 --- a/etc/nextcloudpi-config.d/duckDNS.sh +++ b/etc/ncp-config.d/duckDNS.sh @@ -1,6 +1,6 @@ #!/bin/bash -# DuckDNS installation on Raspbian for NextcloudPi +# DuckDNS installation on Raspbian for NextcloudPlus # # # Copyleft 2017 by Courtney Hicks diff --git a/etc/nextcloudpi-config.d/fail2ban.sh b/etc/ncp-config.d/fail2ban.sh index ddb8511d..99f89760 100644 --- a/etc/nextcloudpi-config.d/fail2ban.sh +++ b/etc/ncp-config.d/fail2ban.sh @@ -62,7 +62,7 @@ EOF # tweak fail2ban email local F=/etc/fail2ban/action.d/sendmail-common.conf - sed -i 's|Fail2Ban|NextCloudPi|' /etc/fail2ban/action.d/sendmail-whois-lines.conf + sed -i 's|Fail2Ban|NextCloudPlus|' /etc/fail2ban/action.d/sendmail-whois-lines.conf grep -q actionstart_ "$F" || sed -i 's|actionstart|actionstart_|' "$F" grep -q actionstop_ "$F" || sed -i 's|actionstop|actionstop_|' "$F" diff --git a/etc/nextcloudpi-config.d/freeDNS.sh b/etc/ncp-config.d/freeDNS.sh index bffc98e1..bffc98e1 100644 --- a/etc/nextcloudpi-config.d/freeDNS.sh +++ b/etc/ncp-config.d/freeDNS.sh diff --git a/etc/nextcloudpi-config.d/l10n/NFS/es.json b/etc/ncp-config.d/l10n/NFS/es.json index 9e413dec..9e413dec 100644 --- a/etc/nextcloudpi-config.d/l10n/NFS/es.json +++ b/etc/ncp-config.d/l10n/NFS/es.json diff --git a/etc/nextcloudpi-config.d/l10n/SSH/es.json b/etc/ncp-config.d/l10n/SSH/es.json index 408891f5..408891f5 100644 --- a/etc/nextcloudpi-config.d/l10n/SSH/es.json +++ b/etc/ncp-config.d/l10n/SSH/es.json diff --git a/etc/nextcloudpi-config.d/l10n/UFW/es.json b/etc/ncp-config.d/l10n/UFW/es.json index 241721d7..241721d7 100644 --- a/etc/nextcloudpi-config.d/l10n/UFW/es.json +++ b/etc/ncp-config.d/l10n/UFW/es.json diff --git a/etc/nextcloudpi-config.d/l10n/dnsmasq/es.json b/etc/ncp-config.d/l10n/dnsmasq/es.json index f4f4844f..f4f4844f 100644 --- a/etc/nextcloudpi-config.d/l10n/dnsmasq/es.json +++ b/etc/ncp-config.d/l10n/dnsmasq/es.json diff --git a/etc/nextcloudpi-config.d/l10n/duckDNS/es.json b/etc/ncp-config.d/l10n/duckDNS/es.json index d2495d2d..d2495d2d 100644 --- a/etc/nextcloudpi-config.d/l10n/duckDNS/es.json +++ b/etc/ncp-config.d/l10n/duckDNS/es.json diff --git a/etc/nextcloudpi-config.d/l10n/fail2ban/es.json b/etc/ncp-config.d/l10n/fail2ban/es.json index 61742a85..61742a85 100644 --- a/etc/nextcloudpi-config.d/l10n/fail2ban/es.json +++ b/etc/ncp-config.d/l10n/fail2ban/es.json diff --git a/etc/nextcloudpi-config.d/l10n/freeDNS/es.json b/etc/ncp-config.d/l10n/freeDNS/es.json index 5d2b3f2c..5d2b3f2c 100644 --- a/etc/nextcloudpi-config.d/l10n/freeDNS/es.json +++ b/etc/ncp-config.d/l10n/freeDNS/es.json diff --git a/etc/nextcloudpi-config.d/l10n/letsencrypt/es.json b/etc/ncp-config.d/l10n/letsencrypt/es.json index 2887f785..2887f785 100644 --- a/etc/nextcloudpi-config.d/l10n/letsencrypt/es.json +++ b/etc/ncp-config.d/l10n/letsencrypt/es.json diff --git a/etc/nextcloudpi-config.d/l10n/modsecurity/es.json b/etc/ncp-config.d/l10n/modsecurity/es.json index 408cdbe0..408cdbe0 100644 --- a/etc/nextcloudpi-config.d/l10n/modsecurity/es.json +++ b/etc/ncp-config.d/l10n/modsecurity/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-admin/es.json b/etc/ncp-config.d/l10n/nc-admin/es.json index 34866b55..34866b55 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-admin/es.json +++ b/etc/ncp-config.d/l10n/nc-admin/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-audit/de.json b/etc/ncp-config.d/l10n/nc-audit/de.json index 8638ebbc..8638ebbc 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-audit/de.json +++ b/etc/ncp-config.d/l10n/nc-audit/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-automount/de.json b/etc/ncp-config.d/l10n/nc-automount/de.json index 8052bd35..8052bd35 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-automount/de.json +++ b/etc/ncp-config.d/l10n/nc-automount/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-automount/es.json b/etc/ncp-config.d/l10n/nc-automount/es.json index 31b15e13..31b15e13 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-automount/es.json +++ b/etc/ncp-config.d/l10n/nc-automount/es.json diff --git a/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json new file mode 100644 index 00000000..2bf06f74 --- /dev/null +++ b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json @@ -0,0 +1,3 @@ +{"translations": { + "nc-autoupdate-ncp": "Automatische NextCloudPlus Updates" +}} diff --git a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/es.json b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/es.json index f59311aa..f59311aa 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/es.json +++ b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/de.json b/etc/ncp-config.d/l10n/nc-backup-auto/de.json index ee2d5513..ee2d5513 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/de.json +++ b/etc/ncp-config.d/l10n/nc-backup-auto/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/es.json b/etc/ncp-config.d/l10n/nc-backup-auto/es.json index f7b7e58f..f7b7e58f 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/es.json +++ b/etc/ncp-config.d/l10n/nc-backup-auto/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup/de.json b/etc/ncp-config.d/l10n/nc-backup/de.json index 401a905e..401a905e 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-backup/de.json +++ b/etc/ncp-config.d/l10n/nc-backup/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup/es.json b/etc/ncp-config.d/l10n/nc-backup/es.json index abb5596f..abb5596f 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-backup/es.json +++ b/etc/ncp-config.d/l10n/nc-backup/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-database/de.json b/etc/ncp-config.d/l10n/nc-database/de.json index 057e758a..057e758a 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-database/de.json +++ b/etc/ncp-config.d/l10n/nc-database/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-database/es.json b/etc/ncp-config.d/l10n/nc-database/es.json index c97a0235..c97a0235 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-database/es.json +++ b/etc/ncp-config.d/l10n/nc-database/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-datadir/de.json b/etc/ncp-config.d/l10n/nc-datadir/de.json index e8e8605f..e8e8605f 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-datadir/de.json +++ b/etc/ncp-config.d/l10n/nc-datadir/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-datadir/es.json b/etc/ncp-config.d/l10n/nc-datadir/es.json index 19aea39f..19aea39f 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-datadir/es.json +++ b/etc/ncp-config.d/l10n/nc-datadir/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/de.json b/etc/ncp-config.d/l10n/nc-export-ncp/de.json index 00f29dda..00f29dda 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/de.json +++ b/etc/ncp-config.d/l10n/nc-export-ncp/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/es.json b/etc/ncp-config.d/l10n/nc-export-ncp/es.json index d05353be..d05353be 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/es.json +++ b/etc/ncp-config.d/l10n/nc-export-ncp/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/de.json b/etc/ncp-config.d/l10n/nc-fix-permissions/de.json index ff44194f..ff44194f 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/de.json +++ b/etc/ncp-config.d/l10n/nc-fix-permissions/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/es.json b/etc/ncp-config.d/l10n/nc-fix-permissions/es.json index 9bcd62a2..9bcd62a2 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/es.json +++ b/etc/ncp-config.d/l10n/nc-fix-permissions/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-format-USB/de.json b/etc/ncp-config.d/l10n/nc-format-USB/de.json index 055f640b..055f640b 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-format-USB/de.json +++ b/etc/ncp-config.d/l10n/nc-format-USB/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-format-USB/es.json b/etc/ncp-config.d/l10n/nc-format-USB/es.json index 43c90d71..43c90d71 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-format-USB/es.json +++ b/etc/ncp-config.d/l10n/nc-format-USB/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/de.json b/etc/ncp-config.d/l10n/nc-forward-ports/de.json index a62d07bd..a62d07bd 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/de.json +++ b/etc/ncp-config.d/l10n/nc-forward-ports/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/es.json b/etc/ncp-config.d/l10n/nc-forward-ports/es.json index b70387d7..b70387d7 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/es.json +++ b/etc/ncp-config.d/l10n/nc-forward-ports/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/de.json b/etc/ncp-config.d/l10n/nc-httpsonly/de.json index f82b4830..f82b4830 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/de.json +++ b/etc/ncp-config.d/l10n/nc-httpsonly/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/es.json b/etc/ncp-config.d/l10n/nc-httpsonly/es.json index ca321088..ca321088 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/es.json +++ b/etc/ncp-config.d/l10n/nc-httpsonly/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/de.json b/etc/ncp-config.d/l10n/nc-import-ncp/de.json index b9880ed1..b9880ed1 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/de.json +++ b/etc/ncp-config.d/l10n/nc-import-ncp/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/es.json b/etc/ncp-config.d/l10n/nc-import-ncp/es.json index 5698394f..5698394f 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/es.json +++ b/etc/ncp-config.d/l10n/nc-import-ncp/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-info/de.json b/etc/ncp-config.d/l10n/nc-info/de.json index 9993d09b..9993d09b 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-info/de.json +++ b/etc/ncp-config.d/l10n/nc-info/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-info/es.json b/etc/ncp-config.d/l10n/nc-info/es.json index e23233a7..e23233a7 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-info/es.json +++ b/etc/ncp-config.d/l10n/nc-info/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-init/de.json b/etc/ncp-config.d/l10n/nc-init/de.json index 9bed233c..9bed233c 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-init/de.json +++ b/etc/ncp-config.d/l10n/nc-init/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-init/es.json b/etc/ncp-config.d/l10n/nc-init/es.json index 0e93e9ff..0e93e9ff 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-init/es.json +++ b/etc/ncp-config.d/l10n/nc-init/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-limits/de.json b/etc/ncp-config.d/l10n/nc-limits/de.json index 705aefe4..705aefe4 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-limits/de.json +++ b/etc/ncp-config.d/l10n/nc-limits/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-limits/es.json b/etc/ncp-config.d/l10n/nc-limits/es.json index 554e07e8..554e07e8 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-limits/es.json +++ b/etc/ncp-config.d/l10n/nc-limits/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/de.json b/etc/ncp-config.d/l10n/nc-nextcloud/de.json index 1ececb2b..1ececb2b 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/de.json +++ b/etc/ncp-config.d/l10n/nc-nextcloud/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/es.json b/etc/ncp-config.d/l10n/nc-nextcloud/es.json index c13bfd7f..c13bfd7f 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/es.json +++ b/etc/ncp-config.d/l10n/nc-nextcloud/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/de.json b/etc/ncp-config.d/l10n/nc-notify-updates/de.json index 21660a30..21660a30 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/de.json +++ b/etc/ncp-config.d/l10n/nc-notify-updates/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/es.json b/etc/ncp-config.d/l10n/nc-notify-updates/es.json index 3f8bfb4a..3f8bfb4a 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/es.json +++ b/etc/ncp-config.d/l10n/nc-notify-updates/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-passwd/de.json b/etc/ncp-config.d/l10n/nc-passwd/de.json index ef69f438..ef69f438 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-passwd/de.json +++ b/etc/ncp-config.d/l10n/nc-passwd/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-passwd/es.json b/etc/ncp-config.d/l10n/nc-passwd/es.json index ba86eb1a..ba86eb1a 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-passwd/es.json +++ b/etc/ncp-config.d/l10n/nc-passwd/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/de.json b/etc/ncp-config.d/l10n/nc-ramlogs/de.json index bc1cb5c3..bc1cb5c3 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/de.json +++ b/etc/ncp-config.d/l10n/nc-ramlogs/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/es.json b/etc/ncp-config.d/l10n/nc-ramlogs/es.json index 4791b091..4791b091 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/es.json +++ b/etc/ncp-config.d/l10n/nc-ramlogs/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-restore/de.json b/etc/ncp-config.d/l10n/nc-restore/de.json index 69d4b619..69d4b619 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-restore/de.json +++ b/etc/ncp-config.d/l10n/nc-restore/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-restore/es.json b/etc/ncp-config.d/l10n/nc-restore/es.json index 977aec85..977aec85 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-restore/es.json +++ b/etc/ncp-config.d/l10n/nc-restore/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-rsync-auto/es.json b/etc/ncp-config.d/l10n/nc-rsync-auto/es.json index 5b9affd8..5b9affd8 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-rsync-auto/es.json +++ b/etc/ncp-config.d/l10n/nc-rsync-auto/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-rsync/es.json b/etc/ncp-config.d/l10n/nc-rsync/es.json index 884c0bc5..884c0bc5 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-rsync/es.json +++ b/etc/ncp-config.d/l10n/nc-rsync/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/de.json b/etc/ncp-config.d/l10n/nc-scan-auto/de.json index cf168150..cf168150 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/de.json +++ b/etc/ncp-config.d/l10n/nc-scan-auto/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/es.json b/etc/ncp-config.d/l10n/nc-scan-auto/es.json index 9b3db338..9b3db338 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/es.json +++ b/etc/ncp-config.d/l10n/nc-scan-auto/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan/de.json b/etc/ncp-config.d/l10n/nc-scan/de.json index 3469297e..3469297e 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-scan/de.json +++ b/etc/ncp-config.d/l10n/nc-scan/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan/es.json b/etc/ncp-config.d/l10n/nc-scan/es.json index 0c30c724..0c30c724 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-scan/es.json +++ b/etc/ncp-config.d/l10n/nc-scan/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/de.json b/etc/ncp-config.d/l10n/nc-snapshot-auto/de.json index 75f71db5..75f71db5 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/de.json +++ b/etc/ncp-config.d/l10n/nc-snapshot-auto/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/es.json b/etc/ncp-config.d/l10n/nc-snapshot-auto/es.json index 31b15e13..31b15e13 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/es.json +++ b/etc/ncp-config.d/l10n/nc-snapshot-auto/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot-sync/es.json b/etc/ncp-config.d/l10n/nc-snapshot-sync/es.json index 963bc8cf..963bc8cf 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-snapshot-sync/es.json +++ b/etc/ncp-config.d/l10n/nc-snapshot-sync/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot/de.json b/etc/ncp-config.d/l10n/nc-snapshot/de.json index b236539b..b236539b 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-snapshot/de.json +++ b/etc/ncp-config.d/l10n/nc-snapshot/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot/es.json b/etc/ncp-config.d/l10n/nc-snapshot/es.json index 50ffa1e8..50ffa1e8 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-snapshot/es.json +++ b/etc/ncp-config.d/l10n/nc-snapshot/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-static-IP/de.json b/etc/ncp-config.d/l10n/nc-static-IP/de.json index 45f0038b..45f0038b 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-static-IP/de.json +++ b/etc/ncp-config.d/l10n/nc-static-IP/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-static-IP/es.json b/etc/ncp-config.d/l10n/nc-static-IP/es.json index 650eba25..650eba25 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-static-IP/es.json +++ b/etc/ncp-config.d/l10n/nc-static-IP/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-swapfile/de.json b/etc/ncp-config.d/l10n/nc-swapfile/de.json index 76fd573d..76fd573d 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-swapfile/de.json +++ b/etc/ncp-config.d/l10n/nc-swapfile/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-swapfile/es.json b/etc/ncp-config.d/l10n/nc-swapfile/es.json index c0269a92..c0269a92 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-swapfile/es.json +++ b/etc/ncp-config.d/l10n/nc-swapfile/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-update/de.json b/etc/ncp-config.d/l10n/nc-update/de.json index 054011ff..054011ff 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-update/de.json +++ b/etc/ncp-config.d/l10n/nc-update/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-webui/de.json b/etc/ncp-config.d/l10n/nc-webui/de.json index 4413d699..4413d699 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-webui/de.json +++ b/etc/ncp-config.d/l10n/nc-webui/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-webui/es.json b/etc/ncp-config.d/l10n/nc-webui/es.json index 9529e1c9..9529e1c9 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-webui/es.json +++ b/etc/ncp-config.d/l10n/nc-webui/es.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-wifi/de.json b/etc/ncp-config.d/l10n/nc-wifi/de.json index 6517b76e..6517b76e 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-wifi/de.json +++ b/etc/ncp-config.d/l10n/nc-wifi/de.json diff --git a/etc/nextcloudpi-config.d/l10n/nc-zram/es.json b/etc/ncp-config.d/l10n/nc-zram/es.json index 31b15e13..31b15e13 100644 --- a/etc/nextcloudpi-config.d/l10n/nc-zram/es.json +++ b/etc/ncp-config.d/l10n/nc-zram/es.json diff --git a/etc/nextcloudpi-config.d/l10n/no-ip/es.json b/etc/ncp-config.d/l10n/no-ip/es.json index 1dd828f8..1dd828f8 100644 --- a/etc/nextcloudpi-config.d/l10n/no-ip/es.json +++ b/etc/ncp-config.d/l10n/no-ip/es.json diff --git a/etc/nextcloudpi-config.d/l10n/samba/es.json b/etc/ncp-config.d/l10n/samba/es.json index 98331947..98331947 100644 --- a/etc/nextcloudpi-config.d/l10n/samba/es.json +++ b/etc/ncp-config.d/l10n/samba/es.json diff --git a/etc/nextcloudpi-config.d/l10n/spDYN/es.json b/etc/ncp-config.d/l10n/spDYN/es.json index 0dae7e41..0dae7e41 100644 --- a/etc/nextcloudpi-config.d/l10n/spDYN/es.json +++ b/etc/ncp-config.d/l10n/spDYN/es.json diff --git a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/de.json b/etc/ncp-config.d/l10n/unattended-upgrades/de.json index 1c63a5a9..1c63a5a9 100644 --- a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/de.json +++ b/etc/ncp-config.d/l10n/unattended-upgrades/de.json diff --git a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/es.json b/etc/ncp-config.d/l10n/unattended-upgrades/es.json index 2e700e3e..2e700e3e 100644 --- a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/es.json +++ b/etc/ncp-config.d/l10n/unattended-upgrades/es.json diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/ncp-config.d/letsencrypt.sh index a0e34015..a0e34015 100644 --- a/etc/nextcloudpi-config.d/letsencrypt.sh +++ b/etc/ncp-config.d/letsencrypt.sh diff --git a/etc/nextcloudpi-config.d/modsecurity.sh b/etc/ncp-config.d/modsecurity.sh index 9047e894..5bc4a4c0 100644 --- a/etc/nextcloudpi-config.d/modsecurity.sh +++ b/etc/ncp-config.d/modsecurity.sh @@ -31,7 +31,7 @@ install() cat >> /etc/modsecurity/crs/crs-setup.conf <<'EOF' - # NextCloudPi: allow PROPFIND for webDAV + # NextCloudPlus: allow PROPFIND for webDAV SecAction "id:900200, phase:1, nolog, pass, t:none, setvar:'tx.allowed_methods=GET HEAD POST OPTIONS PROPFIND'" EOF diff --git a/etc/nextcloudpi-config.d/nc-admin.sh b/etc/ncp-config.d/nc-admin.sh index 16cf79ce..16cf79ce 100644 --- a/etc/nextcloudpi-config.d/nc-admin.sh +++ b/etc/ncp-config.d/nc-admin.sh diff --git a/etc/nextcloudpi-config.d/nc-audit.sh b/etc/ncp-config.d/nc-audit.sh index eb7fc320..69f21b0c 100644 --- a/etc/nextcloudpi-config.d/nc-audit.sh +++ b/etc/ncp-config.d/nc-audit.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Launch security audit reports for NextCloudPi +# Launch security audit reports for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-automount.sh b/etc/ncp-config.d/nc-automount.sh index 08cbc86a..19d91aea 100644 --- a/etc/nextcloudpi-config.d/nc-automount.sh +++ b/etc/ncp-config.d/nc-automount.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Automount configuration for NextCloudPi +# Automount configuration for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-autoupdate-ncp.sh b/etc/ncp-config.d/nc-autoupdate-ncp.sh index e7fdbc5c..29467f28 100644 --- a/etc/nextcloudpi-config.d/nc-autoupdate-ncp.sh +++ b/etc/ncp-config.d/nc-autoupdate-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Automatically apply NextCloudPi updates +# Automatically apply NextCloudPlus updates # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -15,13 +15,13 @@ ACTIVE_=no NOTIFYUSER_=admin -DESCRIPTION="Automatically apply NextCloudPi updates" +DESCRIPTION="Automatically apply NextCloudPlus updates" configure() { [[ $ACTIVE_ != "yes" ]] && { rm /etc/cron.daily/ncp-autoupdate - echo "automatic NextCloudPi updates disabled" + echo "automatic NextCloudPlus updates disabled" return 0 } @@ -30,12 +30,12 @@ configure() /usr/local/bin/ncp-test-updates && { /usr/local/bin/ncp-update sudo -u www-data php /var/www/nextcloud/occ notification:generate \ - "$NOTIFYUSER_" "NextCloudPi " \ - -l "NextCloudPi was updated to \$( cat /usr/local/etc/ncp-version )" + "$NOTIFYUSER_" "NextCloudPlus " \ + -l "NextCloudPlus was updated to \$( cat /usr/local/etc/ncp-version )" } EOF chmod a+x /etc/cron.daily/ncp-autoupdate - echo "automatic NextCloudPi updates enabled" + echo "automatic NextCloudPlus updates enabled" } install() { :; } diff --git a/etc/nextcloudpi-config.d/nc-backup-auto.sh b/etc/ncp-config.d/nc-backup-auto.sh index d785eac9..d785eac9 100644 --- a/etc/nextcloudpi-config.d/nc-backup-auto.sh +++ b/etc/ncp-config.d/nc-backup-auto.sh diff --git a/etc/nextcloudpi-config.d/nc-backup.sh b/etc/ncp-config.d/nc-backup.sh index 0a1c1a3a..0a1c1a3a 100644 --- a/etc/nextcloudpi-config.d/nc-backup.sh +++ b/etc/ncp-config.d/nc-backup.sh diff --git a/etc/nextcloudpi-config.d/nc-database.sh b/etc/ncp-config.d/nc-database.sh index 9ab693c8..21c4ecb8 100644 --- a/etc/nextcloudpi-config.d/nc-database.sh +++ b/etc/ncp-config.d/nc-database.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh index dd21753a..b03bc5ad 100644 --- a/etc/nextcloudpi-config.d/nc-datadir.sh +++ b/etc/ncp-config.d/nc-datadir.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-export-ncp.sh b/etc/ncp-config.d/nc-export-ncp.sh index 70bcfc77..a630ad12 100644 --- a/etc/nextcloudpi-config.d/nc-export-ncp.sh +++ b/etc/ncp-config.d/nc-export-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Export NextCloudPi configuration +# Export NextCloudPlus configuration # # # Copyleft 2017 by Courtney Hicks @@ -9,7 +9,7 @@ DIR_=/media/USBdrive/ -DESCRIPTION="Export NextCloudPi configuration" +DESCRIPTION="Export NextCloudPlus configuration" configure() { @@ -20,7 +20,7 @@ configure() mkdir -p /tmp/ncp-export cd /tmp/ncp-export || return 1 - for file in /usr/local/etc/nextcloudpi-config.d/*; do + for file in /usr/local/etc/ncp-config.d/*; do VARS=( $( grep "^[[:alpha:]]\+_=" "$file" | cut -d= -f1 | sed 's|_$||' ) ) VALS=( $( grep "^[[:alpha:]]\+_=" "$file" | cut -d= -f2 ) ) local CONFIG="" diff --git a/etc/nextcloudpi-config.d/nc-fix-permissions.sh b/etc/ncp-config.d/nc-fix-permissions.sh index 9aa9f1ea..9aa9f1ea 100644 --- a/etc/nextcloudpi-config.d/nc-fix-permissions.sh +++ b/etc/ncp-config.d/nc-fix-permissions.sh diff --git a/etc/nextcloudpi-config.d/nc-format-USB.sh b/etc/ncp-config.d/nc-format-USB.sh index fef1f287..fef1f287 100644 --- a/etc/nextcloudpi-config.d/nc-format-USB.sh +++ b/etc/ncp-config.d/nc-format-USB.sh diff --git a/etc/nextcloudpi-config.d/nc-forward-ports.sh b/etc/ncp-config.d/nc-forward-ports.sh index 09123cb4..9820cd8c 100644 --- a/etc/nextcloudpi-config.d/nc-forward-ports.sh +++ b/etc/ncp-config.d/nc-forward-ports.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Use uPnP to forward router ports for NextCloudPi +# Use uPnP to forward router ports for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -18,7 +18,7 @@ HTTPPORT_=80 DESCRIPTION="Set port forwarding to access from outside (UPnP)" INFOTITLE="Instructions for UPnP Port Forwarding" -INFO="For NextCloudPi to be able to setup your ports, UPnP must be activated +INFO="For NextCloudPlus to be able to setup your ports, UPnP must be activated in your router. Activate it now on your router admin webpage. ** UPnP is considered a security risk ** diff --git a/etc/nextcloudpi-config.d/nc-httpsonly.sh b/etc/ncp-config.d/nc-httpsonly.sh index d015bc46..6f441108 100644 --- a/etc/nextcloudpi-config.d/nc-httpsonly.sh +++ b/etc/ncp-config.d/nc-httpsonly.sh @@ -1,6 +1,6 @@ #!/bin/bash -# HTTPS rewrite configuration script for NextCloudPi +# HTTPS rewrite configuration script for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-import-ncp.sh b/etc/ncp-config.d/nc-import-ncp.sh index afec2072..d33dca68 100644 --- a/etc/nextcloudpi-config.d/nc-import-ncp.sh +++ b/etc/ncp-config.d/nc-import-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Import NextCloudPi configuration +# Import NextCloudPlus configuration # # # Copyleft 2017 by Courtney Hicks @@ -9,14 +9,14 @@ FILE_=/media/USBdrive/ncp-config_xxxxxx.cfg -DESCRIPTION="Import NextCloudPi configuration from file" +DESCRIPTION="Import NextCloudPlus configuration from file" configure() { [[ -f "$FILE_" ]] || { echo "export file $FILE_ does not exist"; return 1; } - source /usr/local/etc/library.sh || return 1 - cd /usr/local/etc/nextcloudpi-config.d || return 1 + source /usr/local/etc/library.sh || return 1 + cd /usr/local/etc/ncp-config.d || return 1 # extract export local TMP="/tmp/ncp-export" @@ -33,7 +33,7 @@ configure() local SCRIPT="$( basename "$file" .cfg ).sh" # restore - [ -f /usr/local/etc/nextcloudpi-config.d/"$SCRIPT" ] && { + [ -f /usr/local/etc/ncp-config.d/"$SCRIPT" ] && { local VARS=( $( grep "^[[:alpha:]]\+=" "$file" | cut -d= -f1 ) ) local VALS=( $( grep "^[[:alpha:]]\+=" "$file" | cut -d= -f2 ) ) for i in $( seq 0 1 ${#VARS[@]} ); do diff --git a/etc/nextcloudpi-config.d/nc-info.sh b/etc/ncp-config.d/nc-info.sh index f31a3054..e4b08f07 100644 --- a/etc/nextcloudpi-config.d/nc-info.sh +++ b/etc/ncp-config.d/nc-info.sh @@ -13,7 +13,7 @@ # More at: https://ownyourbits.com # -DESCRIPTION="Print NextCloudPi system info" +DESCRIPTION="Print NextCloudPlus system info" install() { diff --git a/etc/nextcloudpi-config.d/nc-init.sh b/etc/ncp-config.d/nc-init.sh index 725cd87f..befc0b36 100644 --- a/etc/nextcloudpi-config.d/nc-init.sh +++ b/etc/ncp-config.d/nc-init.sh @@ -20,7 +20,7 @@ DBADMIN=ncadmin DESCRIPTION="(Re)initiate Nextcloud to a clean configuration" INFOTITLE="Clean NextCloud configuration" -INFO="This action will configure NextCloud to NextCloudPi defaults. +INFO="This action will configure NextCloud to NextCloudPlus defaults. ** YOUR CONFIGURATION WILL BE LOST ** @@ -113,11 +113,11 @@ EOF # 4 Byte UTF8 support sudo -u www-data php occ config:system:set mysql.utf8mb4 --type boolean --value="true" - # Default trusted domain ( only from nextcloudpi-config ) + # 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 } - sudo -u www-data php occ config:system:set trusted_domains 5 --value="nextcloudpi.local" + sudo -u www-data php occ config:system:set trusted_domains 5 --value="nextcloudplus.local" # email sudo -u www-data php occ config:system:set mail_smtpmode --value="php" @@ -135,7 +135,7 @@ EOF } mysql nextcloud <<EOF -replace into oc_appconfig values ( 'theming', 'name' , "NextCloudPi" ); +replace into oc_appconfig values ( 'theming', 'name' , "NextCloudPlus" ); replace into oc_appconfig values ( 'theming', 'slogan' , "keep your data close" ); replace into oc_appconfig values ( 'theming', 'url' , "https://ownyourbits.com" ); replace into oc_appconfig values ( 'theming', 'logoMime' , "image/svg+xml" ); diff --git a/etc/nextcloudpi-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh index 0e5e2dc7..8902df5f 100644 --- a/etc/nextcloudpi-config.d/nc-limits.sh +++ b/etc/ncp-config.d/nc-limits.sh @@ -1,6 +1,6 @@ #!/bin/bash -# System limit configurator for NextCloudPi +# System limit configurator for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -19,7 +19,7 @@ MEMORYLIMIT_=768M PHPTHREADS_=0 REDISMEM_=3gb -DESCRIPTION="Configure system limits for NextCloudPi" +DESCRIPTION="Configure system limits for NextCloudPlus" INFO="Set PHP threads to 0 in order to use all cores" configure() diff --git a/etc/nextcloudpi-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh index 0eeea963..856a3799 100644 --- a/etc/nextcloudpi-config.d/nc-nextcloud.sh +++ b/etc/ncp-config.d/nc-nextcloud.sh @@ -31,7 +31,7 @@ INFOTITLE="NextCloud installation" INFO="This new installation will cleanup current NextCloud instance, including files and database. -You can later use nc-init to configure to NextCloudPi defaults +You can later use nc-init to configure to NextCloudPlus defaults ** perform backup before proceding ** @@ -40,7 +40,7 @@ You can use nc-backup " install() { - # During build, this step is run before nextcloudpi.sh. Avoid executing twice + # During build, this step is run before nextcloudplus.sh. Avoid executing twice [[ -f /usr/lib/systemd/system/nc-provisioning.service ]] && return 0 # Optional packets for Nextcloud and Apps diff --git a/etc/nextcloudpi-config.d/nc-notify-updates.sh b/etc/ncp-config.d/nc-notify-updates.sh index 9d8e473d..8caac2e9 100644 --- a/etc/nextcloudpi-config.d/nc-notify-updates.sh +++ b/etc/ncp-config.d/nc-notify-updates.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Use NC notifications to warn about NCP updates +# Install the latest News third party app # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -16,7 +16,7 @@ ACTIVE_=yes USER_=admin -DESCRIPTION="Notify in NC when a NextCloudPi update is available" +DESCRIPTION="Notify in NC when a NextCloudPlus update is available" # check every hour CHECKINTERVAL=1 @@ -39,7 +39,7 @@ 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; } +ncp-test-updates || { echo "NextCloudPlus up to date"; exit 0; } test -e \$NOTIFIED && [[ "\$( cat \$LATEST )" == "\$( cat \$NOTIFIED )" ]] && { echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Already notified" @@ -52,7 +52,7 @@ IFACE=\$( ip r | grep "default via" | awk '{ print \$5 }' ) IP=\$( ip a show dev "\$IFACE" | grep global | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 ) sudo -u www-data php /var/www/nextcloud/occ notification:generate \ - $USER_ "NextCloudPi update" \ + $USER_ "NextCloudPlus update" \ -l "Update from \$( cat \$VERFILE ) to \$( cat \$LATEST ) is available. Update from https://\$IP:4443" cat \$LATEST > \$NOTIFIED @@ -83,7 +83,7 @@ echo -e "Packages automatically upgraded: \$PKGS\\n" # notify sudo -u www-data php /var/www/nextcloud/occ notification:generate \ - $USER_ "NextCloudPi Unattended Upgrades" \ + $USER_ "NextCloudPlus Unattended Upgrades" \ -l "Packages automatically upgraded \$PKGS" EOF chmod +x /usr/local/bin/ncp-notify-unattended-upgrade diff --git a/etc/nextcloudpi-config.d/nc-passwd.sh b/etc/ncp-config.d/nc-passwd.sh index f5604137..ae3831fa 100644 --- a/etc/nextcloudpi-config.d/nc-passwd.sh +++ b/etc/ncp-config.d/nc-passwd.sh @@ -16,7 +16,7 @@ PASSWORD_=ownyourbits CONFIRM_=ownyourbits -DESCRIPTION="Change password for the NextCloudPi Panel" +DESCRIPTION="Change password for the NextCloudPlus Panel" configure() { diff --git a/etc/nextcloudpi-config.d/nc-ramlogs.sh b/etc/ncp-config.d/nc-ramlogs.sh index 18a68fd8..ca5f113f 100644 --- a/etc/nextcloudpi-config.d/nc-ramlogs.sh +++ b/etc/ncp-config.d/nc-ramlogs.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-restore.sh b/etc/ncp-config.d/nc-restore.sh index e613cf32..e613cf32 100644 --- a/etc/nextcloudpi-config.d/nc-restore.sh +++ b/etc/ncp-config.d/nc-restore.sh diff --git a/etc/nextcloudpi-config.d/nc-rsync-auto.sh b/etc/ncp-config.d/nc-rsync-auto.sh index eccddd83..eccddd83 100644 --- a/etc/nextcloudpi-config.d/nc-rsync-auto.sh +++ b/etc/ncp-config.d/nc-rsync-auto.sh diff --git a/etc/nextcloudpi-config.d/nc-rsync.sh b/etc/ncp-config.d/nc-rsync.sh index c978a552..c978a552 100644 --- a/etc/nextcloudpi-config.d/nc-rsync.sh +++ b/etc/ncp-config.d/nc-rsync.sh diff --git a/etc/nextcloudpi-config.d/nc-scan-auto.sh b/etc/ncp-config.d/nc-scan-auto.sh index 87d772a4..87d772a4 100644 --- a/etc/nextcloudpi-config.d/nc-scan-auto.sh +++ b/etc/ncp-config.d/nc-scan-auto.sh diff --git a/etc/nextcloudpi-config.d/nc-scan.sh b/etc/ncp-config.d/nc-scan.sh index 0e30cc25..0e30cc25 100644 --- a/etc/nextcloudpi-config.d/nc-scan.sh +++ b/etc/ncp-config.d/nc-scan.sh diff --git a/etc/nextcloudpi-config.d/nc-snapshot-auto.sh b/etc/ncp-config.d/nc-snapshot-auto.sh index 67efd559..84053656 100644 --- a/etc/nextcloudpi-config.d/nc-snapshot-auto.sh +++ b/etc/ncp-config.d/nc-snapshot-auto.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# NextCloudPi scheduled datadir BTRFS snapshots +# NextCloudPlus scheduled datadir BTRFS snapshots # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-snapshot-sync.sh b/etc/ncp-config.d/nc-snapshot-sync.sh index 9f992f6a..9f992f6a 100644 --- a/etc/nextcloudpi-config.d/nc-snapshot-sync.sh +++ b/etc/ncp-config.d/nc-snapshot-sync.sh diff --git a/etc/nextcloudpi-config.d/nc-snapshot.sh b/etc/ncp-config.d/nc-snapshot.sh index 9059ac7c..9059ac7c 100644 --- a/etc/nextcloudpi-config.d/nc-snapshot.sh +++ b/etc/ncp-config.d/nc-snapshot.sh diff --git a/etc/nextcloudpi-config.d/nc-static-IP.sh b/etc/ncp-config.d/nc-static-IP.sh index 5ae006b7..73a2cc11 100644 --- a/etc/nextcloudpi-config.d/nc-static-IP.sh +++ b/etc/ncp-config.d/nc-static-IP.sh @@ -21,8 +21,8 @@ DESCRIPTION="Set up a static IP address (on), or DHCP (off)" configure() { # delete NCP config - grep -q "^# NextCloudPi autogenerated" /etc/dhcpcd.conf && \ - sed -i '/^# NextCloudPi autogenerated/,+6d' /etc/dhcpcd.conf + grep -q "^# NextCloudPlus autogenerated" /etc/dhcpcd.conf && \ + sed -i '/^# NextCloudPlus autogenerated/,+6d' /etc/dhcpcd.conf [[ $ACTIVE_ != "yes" ]] && { systemctl restart dhcpcd @@ -36,8 +36,8 @@ configure() [[ "$DNS" == "" ]] && DNS="$GW" cat >> /etc/dhcpcd.conf <<EOF -# NextCloudPi autogenerated -# don't modify! better use nextcloudpi-config +# NextCloudPlus autogenerated +# don't modify! better use ncp-config interface eth0 static ip_address=$IP_/24 static routers=$GW diff --git a/etc/nextcloudpi-config.d/nc-swapfile.sh b/etc/ncp-config.d/nc-swapfile.sh index 6f435c06..2852e0ec 100644 --- a/etc/nextcloudpi-config.d/nc-swapfile.sh +++ b/etc/ncp-config.d/nc-swapfile.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-update.sh b/etc/ncp-config.d/nc-update.sh index 13204ba9..056bf620 100644 --- a/etc/nextcloudpi-config.d/nc-update.sh +++ b/etc/ncp-config.d/nc-update.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -14,7 +14,7 @@ # More at https://ownyourbits.com/ # -DESCRIPTION="Update NextCloudPi" +DESCRIPTION="Update NextCloudPlus" configure() { diff --git a/etc/nextcloudpi-config.d/nc-webui.sh b/etc/ncp-config.d/nc-webui.sh index 4a1f7e5e..4a1f7e5e 100644 --- a/etc/nextcloudpi-config.d/nc-webui.sh +++ b/etc/ncp-config.d/nc-webui.sh diff --git a/etc/nextcloudpi-config.d/nc-wifi.sh b/etc/ncp-config.d/nc-wifi.sh index ba0f180a..bac5d8f7 100644 --- a/etc/nextcloudpi-config.d/nc-wifi.sh +++ b/etc/ncp-config.d/nc-wifi.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/nc-zram.sh b/etc/ncp-config.d/nc-zram.sh index 4644ff8d..7bdbfe44 100644 --- a/etc/nextcloudpi-config.d/nc-zram.sh +++ b/etc/ncp-config.d/nc-zram.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi ZRAM settings +# NextCloudPlus ZRAM settings # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! diff --git a/etc/nextcloudpi-config.d/no-ip.sh b/etc/ncp-config.d/no-ip.sh index cf3d8232..cf3d8232 100644 --- a/etc/nextcloudpi-config.d/no-ip.sh +++ b/etc/ncp-config.d/no-ip.sh diff --git a/etc/nextcloudpi-config.d/samba.sh b/etc/ncp-config.d/samba.sh index 6a3910ce..3813de27 100644 --- a/etc/nextcloudpi-config.d/samba.sh +++ b/etc/ncp-config.d/samba.sh @@ -21,8 +21,7 @@ INFOTITLE="Instructions for external synchronization" INFO="If we intend to modify the data folder through SAMBA, then we have to synchronize NextCloud to make it aware of the changes. -This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto' -from 'nextcloudpi-config'" +This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'" install() { @@ -42,7 +41,7 @@ install() cat >> /etc/samba/smb.conf <<EOF -# NextCloudPi automatically generated from here. Do not remove this comment +# NextCloudPlus automatically generated from here. Do not remove this comment EOF } @@ -69,11 +68,11 @@ configure() ################################ # remove files from this line to the end - sed -i '/# NextCloudPi automatically/,/\$/d' /etc/samba/smb.conf + sed -i '/# NextCloudPlus automatically/,/\$/d' /etc/samba/smb.conf # restore this line cat >> /etc/samba/smb.conf <<EOF -# NextCloudPi automatically generated from here. Do not remove this comment +# NextCloudPlus automatically generated from here. Do not remove this comment EOF # create a share per Nextcloud user diff --git a/etc/nextcloudpi-config.d/spDYN.sh b/etc/ncp-config.d/spDYN.sh index 8a929d32..99c63026 100644 --- a/etc/nextcloudpi-config.d/spDYN.sh +++ b/etc/ncp-config.d/spDYN.sh @@ -1,6 +1,6 @@ #!/bin/bash -# spDYN setup for NextcloudPi +# spDYN setup for NextcloudPlus # # # Copyleft 2017 by Timm Goldenstein diff --git a/etc/nextcloudpi-config.d/unattended-upgrades.sh b/etc/ncp-config.d/unattended-upgrades.sh index 92c3249e..4ced697e 100644 --- a/etc/nextcloudpi-config.d/unattended-upgrades.sh +++ b/etc/ncp-config.d/unattended-upgrades.sh @@ -31,7 +31,7 @@ configure() # It seems like the label Raspbian-Security does not work for Raspbian # See https://www.raspberrypi.org/forums/viewtopic.php?t=82863&p=585739 - cat > /etc/apt/apt.conf.d/20nextcloudpi-upgrades <<EOF + cat > /etc/apt/apt.conf.d/20ncp-upgrades <<EOF APT::Periodic::Update-Package-Lists "1"; APT::Periodic::Unattended-Upgrade "$AUTOUPGRADE"; APT::Periodic::MaxAge "14"; diff --git a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/de.json b/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/de.json deleted file mode 100644 index ec3bb9f0..00000000 --- a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/de.json +++ /dev/null @@ -1,3 +0,0 @@ -{"translations": { - "nc-autoupdate-ncp": "Automatische NextCloudPi Updates" -}}
\ No newline at end of file @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi installation script +# NextCloudPlus installation script # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -13,7 +13,7 @@ set -e$DBG -TMPDIR=/tmp/nextcloudpi +TMPDIR=/tmp/nextcloudplus [[ ${EUID} -ne 0 ]] && { printf "Must be run as root. Try 'sudo $0'\n" @@ -40,14 +40,14 @@ git clone -q --depth 1 https://github.com/nextcloud/nextcloudpi.git "$TMPDIR" || cd "$TMPDIR" # install NCP -echo -e "\nInstalling NextCloudPi" +echo -e "\nInstalling NextCloudPlus" source etc/library.sh install_script lamp.sh -install_script etc/nextcloudpi-config.d/nc-nextcloud.sh -activate_script etc/nextcloudpi-config.d/nc-nextcloud.sh -install_script nextcloudpi.sh -activate_script etc/nextcloudpi-config.d/nc-init.sh +install_script etc/ncp-config.d/nc-nextcloud.sh +activate_script etc/ncp-config.d/nc-nextcloud.sh +install_script nextcloudplus.sh +activate_script etc/ncp-config.d/nc-init.sh # re-enable mods disabled during install, in case there's other shared services in apache2 [[ "$APACHE_EXISTS" != "" ]] && \ @@ -58,11 +58,7 @@ rm -rf $TMPDIR echo "Done. -Type 'sudo nextcloudpi-config' to configure NCP - -Access NextCloudPi panel on nextcloudpi.local:4443 - -Access Nextcloud on nextcloudpi.local +Type 'sudo ncp-config' to configure NCP, or access ncp-web on https://<this_ip>:4443 " exit 0 diff --git a/ncp-web/activate/JS.js b/ncp-web/activate/JS.js index e570b204..a46936da 100644 --- a/ncp-web/activate/JS.js +++ b/ncp-web/activate/JS.js @@ -1,5 +1,5 @@ /// -// NextcloudPi Web Panel javascript library +// NextcloudPlus Web Panel javascript library // // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> // GPL licensed (see end of file) * Use at your own risk! @@ -37,7 +37,7 @@ function launch_nc_passwd() var url = window.location.protocol + '//' + window.location.hostname + ':4443'; if ( !window.open( url, '_blank' ) ) // try to open in a new tab first window.location.replace( url ); - }, 3500 ); + }, 4000 ); } else { $('#error-box').fill( "nc-passwd error" ); } @@ -96,7 +96,7 @@ $(function() input.selectionStart = input.selectionEnd; } ); - // activate NextCloudPi + // activate NextCloudPlus $( '#activate-ncp' ).on( 'click', function(e) { $( '#activate-ncp' ).hide(); diff --git a/ncp-web/activate/index.php b/ncp-web/activate/index.php index f1fb697b..bc31bf5c 100644 --- a/ncp-web/activate/index.php +++ b/ncp-web/activate/index.php @@ -44,6 +44,7 @@ <button type="button" id="print-pwd" > Print </button> <button type="button" id="activate-ncp"> Activate </button> </p> +<br> <img id="loading-gif" src="../img/loading-small.gif"> <div id="error-box"></div> HTML; diff --git a/ncp-web/csrf.php b/ncp-web/csrf.php index 68574599..c65653c2 100644 --- a/ncp-web/csrf.php +++ b/ncp-web/csrf.php @@ -1,6 +1,6 @@ <?php /// -// NextcloudPi Web Panel CSRF protection library +// NextcloudPlus Web Panel CSRF protection library // // Inspired by http://blog.ircmaxell.com/2013/02/preventing-csrf-attacks.html // diff --git a/ncp-web/index.php b/ncp-web/index.php index 0764f720..59cd808d 100644 --- a/ncp-web/index.php +++ b/ncp-web/index.php @@ -1,5 +1,5 @@ <!-- - NextcloudPi Web Panel frontend + NextcloudPlus Web Panel frontend Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> GPL licensed (see end of file) * Use at your own risk! @@ -11,7 +11,7 @@ <html class="ng-csp" data-placeholder-focus="false" lang="en"> <head> <meta charset="utf-8"> - <title>NextCloudPi Panel</title> + <title>NextCloudPlus Panel</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta name="referrer" content="never"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"> @@ -26,7 +26,7 @@ session_start(); include('sidebar.php'); - $modules_path = '/usr/local/etc/nextcloudpi-config.d/'; + $modules_path = '/usr/local/etc/ncp-config.d/'; $l10nDir = "l10n"; // security headers @@ -86,7 +86,7 @@ <div id="first-run-wizard"> <div class='dialog'> <br><br> - <h2 id="config-box-title">NextCloudPi First Run</h2> + <h2 id="config-box-title">NextCloudPlus First Run</h2> <p>Click to start the configuration wizard</p> <br> <a href="wizard"><img class="wizard-btn" src="wizard/img/ncp-logo.svg" class="wizard"></a> @@ -104,9 +104,9 @@ HTML; <header role="banner"><div id="header"> <div id="header-left"> - <a href="https://ownyourbits.com" id="nextcloudpi" target="_blank" tabindex="1"> + <a href="https://ownyourbits.com" id="nextcloudplus" target="_blank" tabindex="1"> <div class="logo-icon"> - <h1 class="hidden-visually">NextCloudPi</h1> + <h1 class="hidden-visually">NextCloudPlus</h1> </div> </a> <a id=versionlink target="_blank" href="https://github.com/nextcloud/nextcloudpi/blob/master/changelog.md"> diff --git a/ncp-web/l10n/de.json b/ncp-web/l10n/de.json index 59684a9e..2de6cd1e 100644 --- a/ncp-web/l10n/de.json +++ b/ncp-web/l10n/de.json @@ -5,5 +5,5 @@ "run": "Ausführen", "skip": "Überspringen", "close": "Schließen", - "Configure NextCloudPi features": "NextCloudPi Funktionen konfigurieren" + "Configure NextCloudPlus features": "NextCloudPlus Funktionen konfigurieren" }} diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php index ad1ce062..6062b765 100644 --- a/ncp-web/ncp-launcher.php +++ b/ncp-web/ncp-launcher.php @@ -1,6 +1,6 @@ <?php /// -// NextcloudPi Web Panel backend +// NextcloudPlus Web Panel backend // // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> // GPL licensed (see end of file) * Use at your own risk! @@ -11,7 +11,7 @@ include ('csrf.php'); session_start(); -$modules_path = '/usr/local/etc/nextcloudpi-config.d/'; +$modules_path = '/usr/local/etc/ncp-config.d/'; $l10nDir = "l10n"; ignore_user_abort( true ); @@ -32,7 +32,7 @@ if ( $_POST['action'] == "cfgreq" ) if ( empty($token) || !validateCSRFToken($token) ) exit( '{ "output": "Unauthorized request. Try reloading the page" }' ); - $path = '/usr/local/etc/nextcloudpi-config.d/'; + $path = '/usr/local/etc/ncp-config.d/'; $files = array_diff(scandir($path), array('.', '..')); $fh = fopen( $path . $_POST['ref'] . '.sh' ,'r') @@ -99,7 +99,7 @@ else if ( $_POST['action'] == "launch" && $_POST['config'] ) if ( empty($token) || !validateCSRFToken($token) ) exit( '{ "output": "Unauthorized request. Try reloading the page" }' ); - chdir('/usr/local/etc/nextcloudpi-config.d/'); + chdir('/usr/local/etc/ncp-config.d/'); $file = $_POST['ref'] . '.sh'; diff --git a/ncp-web/ncp.css b/ncp-web/ncp.css index 957a2a5c..8e29f837 100644 --- a/ncp-web/ncp.css +++ b/ncp-web/ncp.css @@ -1,5 +1,5 @@ /* - * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets + * NextcloudPlus Web Panel style sheets. Based on official Nextcloud 12 datasheets * * Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> * GPL licensed (see end of file) * Use at your own risk! @@ -389,7 +389,7 @@ input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after,inpu padding-right:20px } -#nextcloudpi { +#nextcloudplus { padding:5px; padding-bottom:0; height:45px; @@ -397,11 +397,11 @@ input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after,inpu -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity:1 } -#nextcloudpi:focus { +#nextcloudplus:focus { -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)'; opacity:0.75 } -#nextcloudpi:hover,#nextcloudpi:active { +#nextcloudplus:hover,#nextcloudplus:active { -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity:1 } diff --git a/ncp-web/ncp.js b/ncp-web/ncp.js index 51f139f9..b56f7b7a 100644 --- a/ncp-web/ncp.js +++ b/ncp-web/ncp.js @@ -1,5 +1,5 @@ /// -// NextcloudPi Web Panel javascript library +// NextcloudPlus Web Panel javascript library // // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> // GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/sidebar.php b/ncp-web/sidebar.php index 51351b59..06ec51e0 100644 --- a/ncp-web/sidebar.php +++ b/ncp-web/sidebar.php @@ -12,7 +12,7 @@ function print_sidebar( $l /* translations l10n object */, $ticks /* wether to calculate ticks(slow) */ ) { - $modules_path = '/usr/local/etc/nextcloudpi-config.d/'; + $modules_path = '/usr/local/etc/ncp-config.d/'; $files = array_diff(scandir($modules_path), array('.', '..', 'nc-wifi.sh', 'nc-info.sh', 'l10n')); $ret = ""; @@ -23,7 +23,7 @@ function print_sidebar( $l /* translations l10n object */, $ticks /* wether to c $active = ""; if ( $ticks ) { $etc = '/usr/local/etc'; - exec("bash -c \"source $etc/library.sh && is_active_script $etc/nextcloudpi-config.d/$script\".sh", $output, $retval); + exec("bash -c \"source $etc/library.sh && is_active_script $etc/ncp-config.d/$script\".sh", $output, $retval); if ($retval == 0) $active = " ✓"; } else if (preg_match('/^ACTIVE_=yes$/m', $txt, $matches)) diff --git a/ncp-web/wizard/index.php b/ncp-web/wizard/index.php index b96e6839..2e99727d 100644 --- a/ncp-web/wizard/index.php +++ b/ncp-web/wizard/index.php @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>NextCloudPi Wizard</title> + <title>NextCloudPlus Wizard</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> @@ -40,7 +40,7 @@ <!-- Tab 1 content - Welcome --> <div class="tab-pane" id="tab1"> <div class="ncp-tab-pane"> - <h1>Welcome to NextCloudPi</h1> + <h1>Welcome to NextCloudPlus</h1> <img id="ncp-welcome-logo" src="img/ncp-logo.svg"> <p>This wizard will help you configure your personal cloud.</p> </div> @@ -64,7 +64,7 @@ <!-- Format USB drive --> <div class="ncp-hidden" id="format-usb"> <p class="instructions"> - If you want to prepare the USB drive to be used with NextCloudPi hit Format USB. Skip if already formated as ext4. + If you want to prepare the USB drive to be used with NextCloudPlus hit Format USB. Skip if already formated as ext4. <br> <strong>Attention!</strong> This will format your USB drive as ext4 and <strong>will destroy any current data.</strong> </p> @@ -94,7 +94,7 @@ <h3>Port forwarding</h3> <p class="instructions"> To access from the outside, your need to forward ports 80 and 443 to your RPi IP address <br> - You can have NextCloudPi try to do this automatically for you<br> + You can have NextCloudPlus try to do this automatically for you<br> To do it manually yourself, you must access your router interface, usually at <a href="http://192.168.1.1" target="_blank">http://192.168.1.1</a><br> </p> <div class="buttons-area"> @@ -183,7 +183,7 @@ <!-- Tab 4 content - Finish --> <div class="tab-pane" id="tab4"> <div class="ncp-tab-pane"> - <p class="instructions"> NextCloudPi is ready!</p> + <p class="instructions"> NextCloudPlus is ready!</p> <div class="linkbox"> <a id='gotonextcloud' href="#"><img id="nextcloud" src="img/nc-logo.png"></a> @@ -191,7 +191,7 @@ </div> <div class="linkbox"> <a href=".."><img id="ncp-web" src="img/ncp-logo.svg"></a> - <br>go back to NextCloudPi web panel + <br>go back to NextCloudPlus web panel </div> </div> diff --git a/nextcloudpi.sh b/nextcloudplus.sh index 8aaab16f..50c53a1e 100644 --- a/nextcloudpi.sh +++ b/nextcloudplus.sh @@ -1,13 +1,13 @@ #!/bin/bash -# NextcloudPi additions to Raspbian +# NextcloudPlus additions to Raspbian # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! # # Usage: # -# ./installer.sh nextcloudpi.sh <IP> (<img>) +# ./installer.sh nextcloudplus.sh <IP> (<img>) # # See installer.sh instructions for details # @@ -17,7 +17,7 @@ WEBADMIN=ncp WEBPASSWD=ownyourbits -CONFDIR=/usr/local/etc/nextcloudpi-config.d/ +CONFDIR=/usr/local/etc/ncp-config.d/ UPLOADTMPDIR=/var/www/nextcloud/data/tmp APTINSTALL="apt-get install -y --no-install-recommends" export DEBIAN_FRONTEND=noninteractive @@ -25,19 +25,18 @@ export DEBIAN_FRONTEND=noninteractive install() { - # NEXTCLOUDPI-CONFIG + # NCP-CONFIG apt-get update $APTINSTALL dialog whiptail mkdir -p $CONFDIR - ln -sf /usr/local/bin/nextcloudpi-config /usr/local/bin/ncp-config # include option in raspi-config (only Raspbian) test -f /usr/bin/raspi-config && { - sed -i '/Change User Password/i"0 NextCloudPi Configuration" "Configuration of NextCloudPi" \\\\' /usr/bin/raspi-config - sed -i '/1\\\\ \*) do_change_pass ;;/i0\\\\ *) nextcloudpi-config ;;' /usr/bin/raspi-config + sed -i '/Change User Password/i"0 NextCloudPlus Configuration" "Configuration of NextCloudPlus" \\\\' /usr/bin/raspi-config + sed -i '/1\\\\ \*) do_change_pass ;;/i0\\\\ *) ncp-config ;;' /usr/bin/raspi-config } - # NEXTCLOUDPI-CONFIG WEB + # NCP-WEB ## VIRTUAL HOST cat > /etc/apache2/sites-available/ncp-activation.conf <<EOF @@ -129,7 +128,7 @@ EOF cat > /home/www/ncp-launcher.sh <<'EOF' #!/bin/bash -DIR=/usr/local/etc/nextcloudpi-config.d +DIR=/usr/local/etc/ncp-config.d test -f $DIR/$1 || { echo "File not found"; exit 1; } source /usr/local/etc/library.sh cd $DIR @@ -138,7 +137,7 @@ EOF chmod 700 /home/www/ncp-launcher.sh echo "www-data ALL = NOPASSWD: /home/www/ncp-launcher.sh , /sbin/halt, /sbin/reboot" >> /etc/sudoers - # NEXTCLOUDPI AUTO TRUSTED DOMAIN + # NCP AUTO TRUSTED DOMAIN mkdir -p /usr/lib/systemd/system cat > /usr/lib/systemd/system/nextcloud-domain.service <<'EOF' [Unit] @@ -169,7 +168,7 @@ EOF # make sure this is called on last re-boot [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nextcloud-domain - # NEXTCLOUDPI UPDATES + # NEXTCLOUDPLUS UPDATES cat > /etc/cron.daily/ncp-check-version <<EOF #!/bin/sh /usr/local/bin/ncp-check-version @@ -195,7 +194,7 @@ EOF # ONLY FOR IMAGE BUILDS if [[ -f /.ncp-image ]]; then - ## NEXTCLOUDPI MOTD + ## NEXTCLOUDPLUS MOTD rm -rf /etc/update-motd.d mkdir /etc/update-motd.d rm /etc/motd @@ -214,11 +213,11 @@ EOF chmod a+x /etc/update-motd.d/* ## HOSTNAME - echo nextcloudpi > /etc/hostname - sed -i '$c127.0.1.1 nextcloudpi' /etc/hosts + echo nextcloudplus > /etc/hostname + sed -i '$c127.0.1.1 nextcloudplus' /etc/hosts ## tag image - echo "NextCloudPi_$( date "+%m-%d-%y" )" > /usr/local/etc/ncp-baseimage + echo "NextCloudPlus_$( date "+%m-%d-%y" )" > /usr/local/etc/ncp-baseimage ## SSH hardening [[ -f /etc/ssh/sshd_config ]] && { diff --git a/raspbian-cleanup.sh b/raspbian-cleanup.sh index afefd1e5..0fff522e 100644 --- a/raspbian-cleanup.sh +++ b/raspbian-cleanup.sh @@ -21,7 +21,7 @@ cleanup() { # cleanup all NCP extras source /usr/local/etc/library.sh - cd /usr/local/etc/nextcloudpi-config.d/ + cd /usr/local/etc/ncp-config.d/ for script in *.sh; do cleanup_script $script done diff --git a/remote-update.sh b/remote-update.sh deleted file mode 100644 index e1cb888d..00000000 --- a/remote-update.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# Perform a software update in NextCloudPi -# -# Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> -# GPL licensed (see end of file) * Use at your own risk! -# -# Usage: -# -# ./installer.sh remote-update.sh <IP> (<img>) -# -# See installer.sh instructions for details -# -# More at https://ownyourbits.com/ -# - -install() { ncp-update; } - -configure() { :; } - -cleanup() -{ - apt-get autoremove -y - apt-get clean - rm -rf /var/lib/apt/lists/* - systemctl disable ssh - rm -f /etc/udev/rules.d/90-qemu.rules - sudo -u www-data php /var/www/nextcloud/occ config:system:delete trusted_domains 1 -} - - -# License -# -# This script is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This script is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this script; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place, Suite 330, -# Boston, MA 02111-1307 USA - diff --git a/tests/tests.py b/tests/tests.py index 6f521a7f..63a57f83 100755 --- a/tests/tests.py +++ b/tests/tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -Automatic testing for NextCloudPi +Automatic testing for NextCloudPlus Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> GPL licensed (see LICENSE file in repository root). @@ -39,7 +39,7 @@ class AdminWebTest(unittest.TestCase): driver = self.driver driver.implicitly_wait(150) # first run can be really slow on QEMU driver.get("https://" + IP + "/index.php/settings/admin") - self.assertIn("NextCloudPi", driver.title) + self.assertIn("NextCloudPlus", driver.title) trusted_domain_str = "You are accessing the server from an untrusted domain" self.assertNotIn(trusted_domain_str, driver.page_source) driver.find_element_by_id("user").send_keys("ncp") @@ -84,9 +84,9 @@ class CreateUserTest(unittest.TestCase): # navigate a little bit driver.get("https://" + IP + "/index.php/settings/admin") - self.assertIn("NextCloudPi", driver.title) + self.assertIn("NextCloudPlus", driver.title) driver.get("https://" + IP + "/index.php/settings/apps") - self.assertIn("NextCloudPi", driver.title) + self.assertIn("NextCloudPlus", driver.title) def tearDown(self): self.driver.close() @@ -107,7 +107,7 @@ class LoginNewUserTest(unittest.TestCase): driver.implicitly_wait(210) # first run can be really slow on QEMU driver.get("https://" + IP) - self.assertIn("NextCloudPi", driver.title) + self.assertIn("NextCloudPlus", driver.title) driver.find_element_by_id("user").send_keys("test_user1") driver.find_element_by_id("password").send_keys("ownyourbits") driver.find_element_by_id("submit").click() @@ -119,7 +119,7 @@ class LoginNewUserTest(unittest.TestCase): # navigate a little bit driver.get("https://" + IP + "/index.php/settings/personal") - self.assertIn("NextCloudPi", driver.title) + self.assertIn("NextCloudPlus", driver.title) def tearDown(self): self.driver.close() @@ -1,6 +1,6 @@ #!/bin/bash -# Updater for NextCloudPi +# Updater for NextCloudPlus # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> # GPL licensed (see end of file) * Use at your own risk! @@ -8,7 +8,7 @@ # More at https://ownyourbits.com/ # -CONFDIR=/usr/local/etc/nextcloudpi-config.d/ +CONFDIR=/usr/local/etc/ncp-config.d/ # don't make sense in a docker container EXCL_DOCKER=" @@ -43,9 +43,13 @@ cp etc/library.sh /usr/local/etc/ source /usr/local/etc/library.sh +# PROVISIONAL renaming from old directory structure +[[ -d /usr/local/etc/nextcloudpi-config.d ]] && mv /usr/local/etc/nextcloudpi-config.d "$CONFDIR" + +mkdir -p "$CONFDIR" + # prevent installing some apt packages in the docker version [[ -f /.docker-image ]] && { - mkdir -p $CONFDIR for opt in $EXCL_DOCKER; do touch $CONFDIR/$opt done @@ -57,8 +61,8 @@ for file in bin/* etc/*; do cp "$file" /usr/local/"$file" done -# install new entries of nextcloudpi-config and update others -for file in etc/nextcloudpi-config.d/*; do +# install new entries of ncp-config and update others +for file in etc/ncp-config.d/*; do [ -f "$file" ] || continue; # skip dirs [ -f /usr/local/"$file" ] || { # new entry install_script "$file" # install @@ -80,7 +84,7 @@ for file in etc/nextcloudpi-config.d/*; do done # install localization files -cp -rT etc/nextcloudpi-config.d/l10n "$CONFDIR"/l10n +cp -rT etc/ncp-config.d/l10n "$CONFDIR"/l10n # these files can contain sensitive information, such as passwords chown -R root:www-data "$CONFDIR" @@ -165,6 +169,13 @@ EOF grep -q rmdir "$UNIT" || sed -i '/^ExecStart=/iExecStartPre=/bin/bash -c "rmdir /media/* || true"' "$UNIT" } + # Update files after renaming to NCPlus + sed -i 's|NextCloudPi automatically|NextCloudPlus automatically|' /etc/samba/smb.conf + sed -i 's|NextCloudPi autogenerated|NextCloudPlus autogenerated|' /etc/dhcpcd.conf + sed -i 's|NextCloudPi|NextCloudPlus|' /etc/fail2ban/action.d/sendmail-whois-lines.conf + sed -i 's|nextcloudpi-config.d|ncp-config.d|' /home/www/ncp-launcher.sh + mv /etc/apt/apt.conf.d/20nextcloudpi-upgrades /etc/apt/apt.conf.d/20ncp-upgrades &>/dev/null + } # end - only live updates exit 0 |