diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-05-27 22:33:03 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-05-28 12:32:13 +0300 |
| commit | a070860a58440326861583958d7186cc568eef48 (patch) | |
| tree | 3ad3dab8a66238a53cde38d0e57f2bac7a87e090 | |
| parent | 003c29c016b1b6223425662212a0c76b4ccee829 (diff) | |
re-rename to NCPiv0.56.14
70 files changed, 135 insertions, 134 deletions
@@ -1,12 +1,12 @@ -# Batch-build docker container layers for NextCloudPlus +# Batch-build docker container layers for 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! # -nextcloudplus-armhf: nextcloud-armhf - docker build . -f docker-armhf/nextcloudplus/Dockerfile -t ownyourbits/nextcloudplus-armhf:latest --no-cache +nextcloudpi-armhf: nextcloud-armhf + docker build . -f docker-armhf/nextcloudpi/Dockerfile -t ownyourbits/nextcloudpi-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 -nextcloudplus-x86: nextcloud-x86 - docker build . -f docker/nextcloudplus/Dockerfile -t ownyourbits/nextcloudplus-x86:latest --no-cache +nextcloudpi-x86: nextcloud-x86 + docker build . -f docker/nextcloudpi/Dockerfile -t ownyourbits/nextcloudpi-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/nextcloudplus-x86:devel + docker build . -f docker/devel/Dockerfile -t ownyourbits/nextcloudpi-x86:devel # License # @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPlus images and containers +# Batch creation of NextCloudPi 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! @@ -25,15 +25,11 @@ source buildlib.sh # initializes $IMGNAME # Docker x86 docker pull debian:stretch-slim -make nextcloudplus-x86 && { - docker push ownyourbits/nextcloudplus-x86 +make nextcloudpi-x86 && { + docker push ownyourbits/nextcloudpi-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 34275228..3a70b357 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 "\nNextCloudPlus \e[1m$( cat $VERFILE)\e[0m is outdated" + echo -e "\nNextCloudPi \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 "\nNextCloudPlus \e[1m$( cat $VERFILE)\e[0m is up to date" + echo -e "\nNextCloudPi \e[1m$( cat $VERFILE)\e[0m is up to date" fi diff --git a/bin/ncp-config b/bin/ncp-config index b898bb9d..ef36ddfa 100755 --- a/bin/ncp-config +++ b/bin/ncp-config @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPlus software configuration +# NextCloudPi 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! @@ -18,7 +18,7 @@ function nextcloud-config() { local DIALOG_OK=0 local VERFILE=/var/run/.ncp-latest-version - local BACKTITLE="NextCloudPlus configuration ver. " + local BACKTITLE="NextCloudPi configuration ver. " local CONFDIR=/usr/local/etc/ncp-config.d/ local DESC @@ -27,7 +27,7 @@ function nextcloud-config() local CHANGELOG=$( head -4 /usr/local/etc/ncp-changelog ) ncp-test-updates 2>/dev/null && \ whiptail --backtitle "$BACKTITLE $( cat /usr/local/etc/ncp-version )" \ - --title "NextCloudPlus update available" \ + --title "NextCloudPi 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 "NextCloudPlus Software Configuration Tool (ncp-config)" \ + --title "NextCloudPi 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 4d9159bb..746080f9 100644 --- a/bin/ncp-diag +++ b/bin/ncp-diag @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPlus diagnostics report +# NextCloudPi 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 "NextCloudPlus version|$( cat /usr/local/etc/ncp-version )" -[[ -f /usr/local/etc/ncp-baseimage ]] && echo "NextCloudPlus image|$( cat /usr/local/etc/ncp-baseimage )" +echo "NextCloudPi version|$( cat /usr/local/etc/ncp-version )" +[[ -f /usr/local/etc/ncp-baseimage ]] && echo "NextCloudPi image|$( cat /usr/local/etc/ncp-baseimage )" echo "distribution|$( cat /etc/issue )" # Data diff --git a/bin/ncp-report b/bin/ncp-report index 65881d6a..0556423b 100755 --- a/bin/ncp-report +++ b/bin/ncp-report @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPlus diagnostics report +# NextCloudPi 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 "NextCloudPlus diagnostics" +open_summary "NextCloudPi diagnostics" bash /usr/local/bin/ncp-diag | column -t -s'|' close_summary diff --git a/bin/ncp-suggestions b/bin/ncp-suggestions index 76498103..52fd62d2 100644 --- a/bin/ncp-suggestions +++ b/bin/ncp-suggestions @@ -1,7 +1,7 @@ #!/bin/bash # -# NextCloudPlus configuration suggestions +# NextCloudPi 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! diff --git a/bin/ncp-update b/bin/ncp-update index 9e753e80..b2bf6d72 100755 --- a/bin/ncp-update +++ b/bin/ncp-update @@ -1,6 +1,6 @@ #!/bin/bash -# update latest NextCloudPlus code from github +# update latest NextCloudPi code from github { [ "$(id -u)" -ne 0 ] && { printf "Must be run as root. Try 'sudo $0'\n"; exit 1; } @@ -33,7 +33,7 @@ sed '/HEAD ->\|origin/s|\[.*\(tag: v[0-9]\+\.[0-9]\+\.[0-9]\+\).*\]|[\1]|' | \ sed 's|* \[tag: |[|' > /usr/local/etc/ncp-changelog } - echo -e "NextCloudPlus updated to version $VER" + echo -e "NextCloudPi updated to version $VER" } cd / diff --git a/build-SD-bananapi.sh b/build-SD-bananapi.sh index 9ec1fe9d..f57271e3 100755 --- a/build-SD-bananapi.sh +++ b/build-SD-bananapi.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPlus image for the Banana Pi +# Batch creation of NextCloudPi image for the Banana Pi # # 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/build-SD-odroidHC2.sh b/build-SD-odroidHC2.sh index 5956b167..27c42d3a 100755 --- a/build-SD-odroidHC2.sh +++ b/build-SD-odroidHC2.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPlus image for the Odroid HC1 +# Batch creation of NextCloudPi 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! diff --git a/build-SD-rock64.sh b/build-SD-rock64.sh index a2ddc991..67cbcc2e 100755 --- a/build-SD-rock64.sh +++ b/build-SD-rock64.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPlus image for the Odroid HC1 +# Batch creation of NextCloudPi image for the Odroid HC1 # # 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! diff --git a/buildlib.sh b/buildlib.sh index 356455b1..0d091607 100644 --- a/buildlib.sh +++ b/buildlib.sh @@ -294,7 +294,7 @@ function create_torrent() [[ -d "$DIR" ]] && { echo "dir $DIR already exists"; return 1; } mkdir -p torrent/"$IMGNAME" && cp -v --reflink=auto "$TAR" torrent/"$IMGNAME" md5sum "$DIR"/*.bz2 > "$DIR"/md5sum - createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextCloudPlus. Nextcloud for Raspberry Pi image" "$DIR" "$DIR".torrent + createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextCloudPi. Nextcloud for Raspberry Pi image" "$DIR" "$DIR".torrent } function generate_changelog() diff --git a/docker-armhf/build-container.sh b/docker-armhf/build-container.sh index 73c3d39c..46cd10cc 100644 --- a/docker-armhf/build-container.sh +++ b/docker-armhf/build-container.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Build NextCloudPlus ARM docker container in a QEMU Raspbian with docker +# Build NextCloudPi 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,13 +16,13 @@ install() git pull origin master docker pull arm32v7/debian:stretch-slim make && { - docker push ownyourbits/nextcloudplus-armhf + docker push ownyourbits/nextcloudpi-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 tag ownyourbits/nextcloudpi-armhf ownyourbits/nextcloudpi-armhf docker push ownyourbits/nextcloudpi-armhf } } diff --git a/docker-armhf/nextcloudplus/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile index 01cc58d9..01cc58d9 100644 --- a/docker-armhf/nextcloudplus/Dockerfile +++ b/docker-armhf/nextcloudpi/Dockerfile diff --git a/docker-common/nextcloud/ncp-wait-msg.html b/docker-common/nextcloud/ncp-wait-msg.html index 99270ba0..37c6f5bd 100644 --- a/docker-common/nextcloud/ncp-wait-msg.html +++ b/docker-common/nextcloud/ncp-wait-msg.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta charset="utf-8"> - <title> NextCloudPlus Initialization </title> + <title> NextCloudPi Initialization </title> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="referrer" content="never"> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> @@ -14,7 +14,7 @@ <div class="v-align"> <header role="banner"> <div id="header"> - <p style="font-size:130%">Initializing NextCloudPlus for the first time</p> + <p style="font-size:130%">Initializing NextCloudPi for the first time</p> <p style="font-size:130%">Please wait...</p> </div> </header> diff --git a/docker-common/nextcloudplus/000ncp b/docker-common/nextcloudpi/000ncp index 0d00cb65..0d00cb65 100755 --- a/docker-common/nextcloudplus/000ncp +++ b/docker-common/nextcloudpi/000ncp diff --git a/docker-compose-armhf.yml b/docker-compose-armhf.yml index afec1f2c..8e4fb019 100644 --- a/docker-compose-armhf.yml +++ b/docker-compose-armhf.yml @@ -1,7 +1,7 @@ version: '3' services: - nextcloudplus: - image: ownyourbits/nextcloudplus-armhf + nextcloudpi: + image: ownyourbits/nextcloudpi-armhf command: "${IP}" ports: - "80:80" diff --git a/docker-compose-ncpdev.yml b/docker-compose-ncpdev.yml index 81f1b41a..58dc00de 100644 --- a/docker-compose-ncpdev.yml +++ b/docker-compose-ncpdev.yml @@ -1,7 +1,7 @@ version: '3' services: - nextcloudplus-dev: - image: ownyourbits/nextcloudplus-x86 + nextcloudpi-dev: + image: ownyourbits/nextcloudpi-x86 command: "${IP}" ports: - "80:80" diff --git a/docker-compose.yml b/docker-compose.yml index baf58ca5..8ec6d990 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: - nextcloudplus: - image: ownyourbits/nextcloudplus-x86 + nextcloudpi: + image: ownyourbits/nextcloudpi-x86 command: "${IP}" ports: - "80:80" diff --git a/docker/devel/Dockerfile b/docker/devel/Dockerfile index ce65fa97..277d87fa 100644 --- a/docker/devel/Dockerfile +++ b/docker/devel/Dockerfile @@ -1,4 +1,4 @@ -FROM ownyourbits/nextcloudplus-x86 +FROM ownyourbits/nextcloudpi-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 nextcloudplus devel +# install nextcloudpi devel source /usr/local/etc/library.sh; \ set +x; \ cd /usr/local/etc/; \ diff --git a/docker/nextcloudplus/Dockerfile b/docker/nextcloudpi/Dockerfile index 08dffc6f..08dffc6f 100644 --- a/docker/nextcloudplus/Dockerfile +++ b/docker/nextcloudpi/Dockerfile diff --git a/etc/library.sh b/etc/library.sh index 56ad6b71..dc3fe457 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPlus function library +# NextCloudPi 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="NextCloudPlus installer configuration" + local BACKTITLE="NextCloudPi installer configuration" type dialog &>/dev/null || { echo "please, install dialog for interactive configuration"; return 1; } @@ -138,7 +138,7 @@ function info_script() source ./"$SCRIPT" local INFOTITLE="${INFOTITLE:-Info}" [[ "$INFO" == "" ]] && return 0 - whiptail --yesno --backtitle "NextCloudPlus configuration" --title "$INFOTITLE" "$INFO" 20 90 + whiptail --yesno --backtitle "NextCloudPi configuration" --title "$INFOTITLE" "$INFO" 20 90 ) } diff --git a/etc/ncp-config.d/duckDNS.sh b/etc/ncp-config.d/duckDNS.sh index bac8776e..2ff2f13b 100644 --- a/etc/ncp-config.d/duckDNS.sh +++ b/etc/ncp-config.d/duckDNS.sh @@ -1,6 +1,6 @@ #!/bin/bash -# DuckDNS installation on Raspbian for NextcloudPlus +# DuckDNS installation on Raspbian for NextCloudPi # # # Copyleft 2017 by Courtney Hicks diff --git a/etc/ncp-config.d/fail2ban.sh b/etc/ncp-config.d/fail2ban.sh index d7667a12..fe7c16ce 100644 --- a/etc/ncp-config.d/fail2ban.sh +++ b/etc/ncp-config.d/fail2ban.sh @@ -57,7 +57,7 @@ EOF # tweak fail2ban email local F=/etc/fail2ban/action.d/sendmail-common.conf - sed -i 's|Fail2Ban|NextCloudPlus|' /etc/fail2ban/action.d/sendmail-whois-lines.conf + sed -i 's|Fail2Ban|NextCloudPi|' /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/ncp-config.d/l10n/nc-autoupdate-ncp/de.json b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json index 2bf06f74..03f31940 100644 --- a/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json +++ b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json @@ -1,3 +1,3 @@ {"translations": { - "nc-autoupdate-ncp": "Automatische NextCloudPlus Updates" + "nc-autoupdate-ncp": "Automatische NextCloudPi Updates" }} diff --git a/etc/ncp-config.d/l10n/nc-export-ncp/es.json b/etc/ncp-config.d/l10n/nc-export-ncp/es.json index d05353be..7dfd6215 100644 --- a/etc/ncp-config.d/l10n/nc-export-ncp/es.json +++ b/etc/ncp-config.d/l10n/nc-export-ncp/es.json @@ -1,7 +1,7 @@ { "translations": { "DIR": "Directorio", - "Export NextCloudPlus configuration": "Exportar la configuración de NextCloudPlus", + "Export NextCloudPi configuration": "Exportar la configuración de NextCloudPi", "nc-export-ncp": "nc-export-ncp" } } diff --git a/etc/ncp-config.d/l10n/nc-forward-ports/es.json b/etc/ncp-config.d/l10n/nc-forward-ports/es.json index b70387d7..aea32821 100644 --- a/etc/ncp-config.d/l10n/nc-forward-ports/es.json +++ b/etc/ncp-config.d/l10n/nc-forward-ports/es.json @@ -1,6 +1,6 @@ { "translations": { - "For NextCloudPlus to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para que NextCloudPlus sea capaz de configurar tus puertos, UPnP debe estar activado\nen tu router. Actívalo ahora en la página de administración de tu router\n\n** UPnP se considera un riesgo de seguridad\n\nNo olvides deshabilitarlo más tarde", + "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para que NextCloudPi sea capaz de configurar tus puertos, UPnP debe estar activado\nen tu router. Actívalo ahora en la página de administración de tu router\n\n** UPnP se considera un riesgo de seguridad\n\nNo olvides deshabilitarlo más tarde", "HTTPPORT": "Puerto HTTP", "HTTPSPORT": "Puerto HTTPS", "Instructions for UPnP Port Forwarding": "Instrucciones para UPnP Port Forwarding", diff --git a/etc/ncp-config.d/l10n/nc-import-ncp/es.json b/etc/ncp-config.d/l10n/nc-import-ncp/es.json index 5698394f..75bcc246 100644 --- a/etc/ncp-config.d/l10n/nc-import-ncp/es.json +++ b/etc/ncp-config.d/l10n/nc-import-ncp/es.json @@ -1,7 +1,7 @@ { "translations": { "FILE": "Fichero", - "Import NextCloudPlus configuration from file": "Importa la configuración de NextCloudPlus desde un fichero", + "Import NextCloudPi configuration from file": "Importa la configuración de NextCloudPi desde un fichero", "nc-import-ncp": "nc-import-ncp" } } diff --git a/etc/ncp-config.d/l10n/nc-info/es.json b/etc/ncp-config.d/l10n/nc-info/es.json index e23233a7..6bfc5546 100644 --- a/etc/ncp-config.d/l10n/nc-info/es.json +++ b/etc/ncp-config.d/l10n/nc-info/es.json @@ -1,6 +1,6 @@ { "translations": { - "Print NextCloudPlus system info": "Muestra información de sistema de NCP", + "Print NextCloudPi system info": "Muestra información de sistema de NCP", "nc-info": "nc-info" } } diff --git a/etc/ncp-config.d/l10n/nc-limits/es.json b/etc/ncp-config.d/l10n/nc-limits/es.json index 554e07e8..ddf6529c 100644 --- a/etc/ncp-config.d/l10n/nc-limits/es.json +++ b/etc/ncp-config.d/l10n/nc-limits/es.json @@ -1,6 +1,6 @@ { "translations": { - "Configure system limits for NextCloudPlus": "Configura los límites de sistema para NextCloudPlus", + "Configure system limits for NextCloudPi": "Configura los límites de sistema para NextCloudPi", "MAXFILESIZE":"Tamaño máximo de archivo en subida", "MEMORYLIMIT": "Límite de memoria", "PHPTHREADS": "Hilos PHP", diff --git a/etc/ncp-config.d/l10n/nc-passwd/es.json b/etc/ncp-config.d/l10n/nc-passwd/es.json index ba86eb1a..f0b73aa2 100644 --- a/etc/ncp-config.d/l10n/nc-passwd/es.json +++ b/etc/ncp-config.d/l10n/nc-passwd/es.json @@ -1,7 +1,7 @@ { "translations": { "CONFIRM": "Confirmar", - "Change password for the NextCloudPlus Panel": "Cambiar la contraseña para el Panel de NextCloudPlus", + "Change password for the NextCloudPi Panel": "Cambiar la contraseña para el Panel de NextCloudPi", "PASSWORD": "Contraseña", "nc-passwd": "nc-passwd" } diff --git a/etc/ncp-config.d/modsecurity.sh b/etc/ncp-config.d/modsecurity.sh index fa1184f9..86d239e8 100644 --- a/etc/ncp-config.d/modsecurity.sh +++ b/etc/ncp-config.d/modsecurity.sh @@ -25,7 +25,7 @@ install() cat >> /etc/modsecurity/crs/crs-setup.conf <<'EOF' - # NextCloudPlus: allow PROPFIND for webDAV + # NextCloudPi: 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/ncp-config.d/nc-audit.sh b/etc/ncp-config.d/nc-audit.sh index 70df02a8..5b032527 100644 --- a/etc/ncp-config.d/nc-audit.sh +++ b/etc/ncp-config.d/nc-audit.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Launch security audit reports for NextCloudPlus +# Launch security audit reports for 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! diff --git a/etc/ncp-config.d/nc-automount.sh b/etc/ncp-config.d/nc-automount.sh index d16a0bc2..14c5437b 100644 --- a/etc/ncp-config.d/nc-automount.sh +++ b/etc/ncp-config.d/nc-automount.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Automount configuration for NextCloudPlus +# Automount configuration for 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! diff --git a/etc/ncp-config.d/nc-autoupdate-nc.sh b/etc/ncp-config.d/nc-autoupdate-nc.sh index 11ac884c..11636d02 100644 --- a/etc/ncp-config.d/nc-autoupdate-nc.sh +++ b/etc/ncp-config.d/nc-autoupdate-nc.sh @@ -26,7 +26,7 @@ configure() if /usr/local/bin/ncp-update-nc "$VERSION"; then VER="\$( sudo -u www-data php /var/www/nextcloud/occ status | grep "version:" | awk '{ print \$3 }' )" sudo -u www-data php /var/www/nextcloud/occ notification:generate \ - "$NOTIFYUSER_" "NextCloudPlus" -l "Nextcloud was updated to \$VER" + "$NOTIFYUSER_" "NextCloudPi" -l "Nextcloud was updated to \$VER" fi EOF chmod a+x /etc/cron.daily/ncp-autoupdate-nc diff --git a/etc/ncp-config.d/nc-autoupdate-ncp.sh b/etc/ncp-config.d/nc-autoupdate-ncp.sh index 5f1430ab..aa304cef 100644 --- a/etc/ncp-config.d/nc-autoupdate-ncp.sh +++ b/etc/ncp-config.d/nc-autoupdate-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Automatically apply NextCloudPlus updates +# Automatically apply NextCloudPi 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! @@ -10,13 +10,13 @@ ACTIVE_=no NOTIFYUSER_=ncp -DESCRIPTION="Automatically apply NextCloudPlus updates" +DESCRIPTION="Automatically apply NextCloudPi updates" configure() { [[ $ACTIVE_ != "yes" ]] && { rm /etc/cron.daily/ncp-autoupdate - echo "automatic NextCloudPlus updates disabled" + echo "automatic NextCloudPi updates disabled" return 0 } @@ -25,12 +25,12 @@ configure() if /usr/local/bin/ncp-test-updates; then /usr/local/bin/ncp-update || exit 1 sudo -u www-data php /var/www/nextcloud/occ notification:generate \ - "$NOTIFYUSER_" "NextCloudPlus" \ - -l "NextCloudPlus was updated to \$( cat /usr/local/etc/ncp-version )" + "$NOTIFYUSER_" "NextCloudPi" \ + -l "NextCloudPi was updated to \$( cat /usr/local/etc/ncp-version )" fi EOF chmod a+x /etc/cron.daily/ncp-autoupdate - echo "automatic NextCloudPlus updates enabled" + echo "automatic NextCloudPi updates enabled" } install() { :; } diff --git a/etc/ncp-config.d/nc-database.sh b/etc/ncp-config.d/nc-database.sh index bc1f651e..c715811b 100644 --- a/etc/ncp-config.d/nc-database.sh +++ b/etc/ncp-config.d/nc-database.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPlus +# Data dir configuration script for 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! diff --git a/etc/ncp-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh index d39e7a83..2be3c9f9 100644 --- a/etc/ncp-config.d/nc-datadir.sh +++ b/etc/ncp-config.d/nc-datadir.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPlus +# Data dir configuration script for 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! diff --git a/etc/ncp-config.d/nc-export-ncp.sh b/etc/ncp-config.d/nc-export-ncp.sh index a630ad12..ca1548e1 100644 --- a/etc/ncp-config.d/nc-export-ncp.sh +++ b/etc/ncp-config.d/nc-export-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Export NextCloudPlus configuration +# Export NextCloudPi configuration # # # Copyleft 2017 by Courtney Hicks @@ -9,7 +9,7 @@ DIR_=/media/USBdrive/ -DESCRIPTION="Export NextCloudPlus configuration" +DESCRIPTION="Export NextCloudPi configuration" configure() { diff --git a/etc/ncp-config.d/nc-forward-ports.sh b/etc/ncp-config.d/nc-forward-ports.sh index b8e15ae8..70560434 100644 --- a/etc/ncp-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 NextCloudPlus +# Use uPnP to forward router ports for 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! @@ -13,7 +13,7 @@ HTTPPORT_=80 DESCRIPTION="Set port forwarding to access from outside (UPnP)" INFOTITLE="Instructions for UPnP Port Forwarding" -INFO="For NextCloudPlus to be able to setup your ports, UPnP must be activated +INFO="For NextCloudPi 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/ncp-config.d/nc-httpsonly.sh b/etc/ncp-config.d/nc-httpsonly.sh index 856642b2..9e544897 100644 --- a/etc/ncp-config.d/nc-httpsonly.sh +++ b/etc/ncp-config.d/nc-httpsonly.sh @@ -1,6 +1,6 @@ #!/bin/bash -# HTTPS rewrite configuration script for NextCloudPlus +# HTTPS rewrite configuration script for 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! diff --git a/etc/ncp-config.d/nc-import-ncp.sh b/etc/ncp-config.d/nc-import-ncp.sh index d33dca68..97e9de99 100644 --- a/etc/ncp-config.d/nc-import-ncp.sh +++ b/etc/ncp-config.d/nc-import-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Import NextCloudPlus configuration +# Import NextCloudPi configuration # # # Copyleft 2017 by Courtney Hicks @@ -9,7 +9,7 @@ FILE_=/media/USBdrive/ncp-config_xxxxxx.cfg -DESCRIPTION="Import NextCloudPlus configuration from file" +DESCRIPTION="Import NextCloudPi configuration from file" configure() { diff --git a/etc/ncp-config.d/nc-info.sh b/etc/ncp-config.d/nc-info.sh index e9653138..d03c53c1 100644 --- a/etc/ncp-config.d/nc-info.sh +++ b/etc/ncp-config.d/nc-info.sh @@ -8,7 +8,7 @@ # More at: https://ownyourbits.com # -DESCRIPTION="Print NextCloudPlus system info" +DESCRIPTION="Print NextCloudPi system info" install() { diff --git a/etc/ncp-config.d/nc-init.sh b/etc/ncp-config.d/nc-init.sh index ad28c0b5..d1ebdaf0 100644 --- a/etc/ncp-config.d/nc-init.sh +++ b/etc/ncp-config.d/nc-init.sh @@ -14,7 +14,7 @@ DBADMIN=ncadmin DESCRIPTION="(Re)initiate Nextcloud to a clean configuration" INFOTITLE="Clean NextCloud configuration" -INFO="This action will configure NextCloud to NextCloudPlus defaults. +INFO="This action will configure NextCloud to NextCloudPi defaults. ** YOUR CONFIGURATION WILL BE LOST ** @@ -111,7 +111,7 @@ EOF 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="nextcloudplus.local" + sudo -u www-data php occ config:system:set trusted_domains 5 --value="nextcloudpi.local" # email sudo -u www-data php occ config:system:set mail_smtpmode --value="php" @@ -129,7 +129,7 @@ EOF } mysql nextcloud <<EOF -replace into oc_appconfig values ( 'theming', 'name' , "NextCloudPlus" ); +replace into oc_appconfig values ( 'theming', 'name' , "NextCloudPi" ); 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/ncp-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh index 60da4d8e..8a7386b8 100644 --- a/etc/ncp-config.d/nc-limits.sh +++ b/etc/ncp-config.d/nc-limits.sh @@ -1,6 +1,6 @@ #!/bin/bash -# System limit configurator for NextCloudPlus +# System limit configurator for 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! @@ -13,7 +13,7 @@ MEMORYLIMIT_=768M PHPTHREADS_=0 REDISMEM_=3gb -DESCRIPTION="Configure system limits for NextCloudPlus" +DESCRIPTION="Configure system limits for NextCloudPi" INFO="Set PHP threads to 0 in order to use all cores" configure() diff --git a/etc/ncp-config.d/nc-notify-updates.sh b/etc/ncp-config.d/nc-notify-updates.sh index b69023dd..556260da 100644 --- a/etc/ncp-config.d/nc-notify-updates.sh +++ b/etc/ncp-config.d/nc-notify-updates.sh @@ -11,7 +11,7 @@ ACTIVE_=yes USER_=ncp -DESCRIPTION="Notify in NC when a NextCloudPlus update is available" +DESCRIPTION="Notify in NC when a NextCloudPi update is available" # check every hour CHECKINTERVAL=1 @@ -34,7 +34,7 @@ LATEST=/var/run/.ncp-latest-version NOTIFIED=/var/run/.ncp-version-notified test -e \$LATEST || exit 0; -/usr/local/bin/ncp-test-updates || { echo "NextCloudPlus up to date"; exit 0; } +/usr/local/bin/ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; } test -e \$NOTIFIED && [[ "\$( cat \$LATEST )" == "\$( cat \$NOTIFIED )" ]] && { echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Already notified" @@ -47,7 +47,7 @@ IFACE=\$( ip r | grep "default via" | awk '{ print \$5 }' | head -1 ) 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_ "NextCloudPlus update" \ + $USER_ "NextCloudPi update" \ -l "Update from \$( cat \$VERFILE ) to \$( cat \$LATEST ) is available. Update from https://\$IP:4443" cat \$LATEST > \$NOTIFIED @@ -78,7 +78,7 @@ echo -e "Packages automatically upgraded: \$PKGS\\n" # notify sudo -u www-data php /var/www/nextcloud/occ notification:generate \ - $USER_ "NextCloudPlus Unattended Upgrades" \ + $USER_ "NextCloudPi Unattended Upgrades" \ -l "Packages automatically upgraded \$PKGS" EOF chmod +x /usr/local/bin/ncp-notify-unattended-upgrade diff --git a/etc/ncp-config.d/nc-passwd.sh b/etc/ncp-config.d/nc-passwd.sh index b65a557a..4d9243ee 100644 --- a/etc/ncp-config.d/nc-passwd.sh +++ b/etc/ncp-config.d/nc-passwd.sh @@ -11,7 +11,7 @@ PASSWORD_=ownyourbits CONFIRM_=ownyourbits -DESCRIPTION="Change password for the NextCloudPlus Panel" +DESCRIPTION="Change password for the NextCloudPi Panel" configure() { diff --git a/etc/ncp-config.d/nc-ramlogs.sh b/etc/ncp-config.d/nc-ramlogs.sh index d9008a6c..b3dee909 100644 --- a/etc/ncp-config.d/nc-ramlogs.sh +++ b/etc/ncp-config.d/nc-ramlogs.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPlus +# Data dir configuration script for 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! diff --git a/etc/ncp-config.d/nc-snapshot-auto.sh b/etc/ncp-config.d/nc-snapshot-auto.sh index 03c5e58e..d486a5a0 100644 --- a/etc/ncp-config.d/nc-snapshot-auto.sh +++ b/etc/ncp-config.d/nc-snapshot-auto.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# NextCloudPlus scheduled datadir BTRFS snapshots +# NextCloudPi 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/ncp-config.d/nc-static-IP.sh b/etc/ncp-config.d/nc-static-IP.sh index a76c8963..30f5e9bd 100644 --- a/etc/ncp-config.d/nc-static-IP.sh +++ b/etc/ncp-config.d/nc-static-IP.sh @@ -22,8 +22,8 @@ configure() ## DHCPCD [[ -f /etc/dhcpcd.conf ]] && { # delete NCP config - grep -q "^# NextCloudPlus autogenerated" /etc/dhcpcd.conf && \ - sed -i '/^# NextCloudPlus autogenerated/,+6d' /etc/dhcpcd.conf + grep -q "^# NextCloudPi autogenerated" /etc/dhcpcd.conf && \ + sed -i '/^# NextCloudPi autogenerated/,+6d' /etc/dhcpcd.conf [[ $ACTIVE_ != "yes" ]] && { systemctl restart dhcpcd @@ -32,7 +32,7 @@ configure() } cat >> /etc/dhcpcd.conf <<EOF -# NextCloudPlus autogenerated +# NextCloudPi autogenerated # don't modify! better use ncp-config interface eth0 static ip_address=$IP_/24 diff --git a/etc/ncp-config.d/nc-swapfile.sh b/etc/ncp-config.d/nc-swapfile.sh index b71b976c..e2799235 100644 --- a/etc/ncp-config.d/nc-swapfile.sh +++ b/etc/ncp-config.d/nc-swapfile.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPlus +# Data dir configuration script for 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! diff --git a/etc/ncp-config.d/nc-update.sh b/etc/ncp-config.d/nc-update.sh index 61387133..6f297dd3 100644 --- a/etc/ncp-config.d/nc-update.sh +++ b/etc/ncp-config.d/nc-update.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPlus +# Data dir configuration script for 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! @@ -8,7 +8,7 @@ # More at https://ownyourbits.com/ # -DESCRIPTION="Update NextCloudPlus" +DESCRIPTION="Update NextCloudPi" configure() { diff --git a/etc/ncp-config.d/nc-wifi.sh b/etc/ncp-config.d/nc-wifi.sh index 2914a845..81f051d0 100644 --- a/etc/ncp-config.d/nc-wifi.sh +++ b/etc/ncp-config.d/nc-wifi.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPlus +# Data dir configuration script for 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! diff --git a/etc/ncp-config.d/nc-zram.sh b/etc/ncp-config.d/nc-zram.sh index ccf595cf..a7d57037 100644 --- a/etc/ncp-config.d/nc-zram.sh +++ b/etc/ncp-config.d/nc-zram.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPlus ZRAM settings +# NextCloudPi 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/ncp-config.d/samba.sh b/etc/ncp-config.d/samba.sh index 3898b1a9..aac737dd 100644 --- a/etc/ncp-config.d/samba.sh +++ b/etc/ncp-config.d/samba.sh @@ -36,7 +36,7 @@ install() cat >> /etc/samba/smb.conf <<EOF -# NextCloudPlus automatically generated from here. Do not remove this comment +# NextCloudPi automatically generated from here. Do not remove this comment EOF } @@ -63,11 +63,11 @@ configure() ################################ # remove files from this line to the end - sed -i '/# NextCloudPlus automatically/,/\$/d' /etc/samba/smb.conf + sed -i '/# NextCloudPi automatically/,/\$/d' /etc/samba/smb.conf # restore this line cat >> /etc/samba/smb.conf <<EOF -# NextCloudPlus automatically generated from here. Do not remove this comment +# NextCloudPi automatically generated from here. Do not remove this comment EOF # create a share per Nextcloud user diff --git a/etc/ncp-config.d/spDYN.sh b/etc/ncp-config.d/spDYN.sh index ec27a3dc..f9dcd471 100644 --- a/etc/ncp-config.d/spDYN.sh +++ b/etc/ncp-config.d/spDYN.sh @@ -1,6 +1,6 @@ #!/bin/bash -# spDYN setup for NextcloudPlus +# spDYN setup for NextCloudPi # # # Copyleft 2017 by Timm Goldenstein diff --git a/ncp-web/activate/CSS.css b/ncp-web/activate/CSS.css index a32b2dc5..2cb5638e 100644 --- a/ncp-web/activate/CSS.css +++ b/ncp-web/activate/CSS.css @@ -1,5 +1,5 @@ /* - * NextcloudPlus Web Panel style sheets. Based on official Nextcloud 12 datasheets + * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets * * 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! diff --git a/ncp-web/activate/JS.js b/ncp-web/activate/JS.js index a46936da..3432dbe1 100644 --- a/ncp-web/activate/JS.js +++ b/ncp-web/activate/JS.js @@ -1,5 +1,5 @@ /// -// NextcloudPlus Web Panel javascript library +// NextCloudPi 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! @@ -52,7 +52,7 @@ function nc_admin_ok_cb( result ) if ( ret.ret == '0' ) { launch_nc_passwd(); } else { - $('#error-box').fill( "NextCloudPlus not yet initialized, trying again in a few seconds ..." ); + $('#error-box').fill( "NextCloudPi not yet initialized, trying again in a few seconds ..." ); setTimeout( launch_activation, 10000 ); } } @@ -96,7 +96,7 @@ $(function() input.selectionStart = input.selectionEnd; } ); - // activate NextCloudPlus + // activate NextCloudPi $( '#activate-ncp' ).on( 'click', function(e) { $( '#activate-ncp' ).hide(); diff --git a/ncp-web/csrf.php b/ncp-web/csrf.php index c65653c2..34d0fc03 100644 --- a/ncp-web/csrf.php +++ b/ncp-web/csrf.php @@ -1,6 +1,6 @@ <?php /// -// NextcloudPlus Web Panel CSRF protection library +// NextCloudPi 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 29ceaf8e..24a24f7a 100644 --- a/ncp-web/index.php +++ b/ncp-web/index.php @@ -1,5 +1,5 @@ <!-- - NextcloudPlus Web Panel frontend + NextCloudPi 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>NextCloudPlus Panel</title> + <title>NextCloudPi 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"> @@ -86,7 +86,7 @@ <div id="first-run-wizard"> <div class='dialog'> <br><br> - <h2 id="config-box-title">NextCloudPlus First Run</h2> + <h2 id="config-box-title">NextCloudPi 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="nextcloudplus" target="_blank" tabindex="1"> + <a href="https://ownyourbits.com" id="nextcloudpi" target="_blank" tabindex="1"> <div class="logo-icon"> - <h1 class="hidden-visually">NextCloudPlus</h1> + <h1 class="hidden-visually">NextCloudPi</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 2de6cd1e..59684a9e 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 NextCloudPlus features": "NextCloudPlus Funktionen konfigurieren" + "Configure NextCloudPi features": "NextCloudPi Funktionen konfigurieren" }} diff --git a/ncp-web/l10n/es.json b/ncp-web/l10n/es.json index b077401d..25ed9ea0 100644 --- a/ncp-web/l10n/es.json +++ b/ncp-web/l10n/es.json @@ -1,6 +1,6 @@ { "translations": { - "Configure NextCloudPlus features": "Configurar NextCloudPlus", + "Configure NextCloudPi features": "Configurar NextCloudPi", "Run": "Ejecutar", "This application requires JavaScript for correct operation. Please %s enable JavaScript %s and reload the page.": "Esta aplicación requiere Javascript para un funcionamiento correcto. Por favor %s active Javascript %s y recarge la página." } diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php index 6062b765..5e8ceafc 100644 --- a/ncp-web/ncp-launcher.php +++ b/ncp-web/ncp-launcher.php @@ -1,6 +1,6 @@ <?php /// -// NextcloudPlus Web Panel backend +// NextCloudPi 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! diff --git a/ncp-web/ncp-wait-msg.php b/ncp-web/ncp-wait-msg.php index 8cdc978b..c0ba2671 100644 --- a/ncp-web/ncp-wait-msg.php +++ b/ncp-web/ncp-wait-msg.php @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta charset="utf-8"> - <title> NextCloudPlus Initialization </title> + <title> NextCloudPi Initialization </title> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="referrer" content="never"> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> @@ -14,7 +14,7 @@ <div class="v-align"> <header role="banner"> <div id="header"> - <p style="font-size:130%">Initializing NextCloudPlus for the first time</p> + <p style="font-size:130%">Initializing NextCloudPi for the first time</p> <p style="font-size:130%">Please wait...</p> </div> </header> diff --git a/ncp-web/ncp.css b/ncp-web/ncp.css index 8e29f837..e379824f 100644 --- a/ncp-web/ncp.css +++ b/ncp-web/ncp.css @@ -1,5 +1,5 @@ /* - * NextcloudPlus Web Panel style sheets. Based on official Nextcloud 12 datasheets + * NextCloudPi 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 } -#nextcloudplus { +#nextcloudpi { 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 } -#nextcloudplus:focus { +#nextcloudpi:focus { -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)'; opacity:0.75 } -#nextcloudplus:hover,#nextcloudplus:active { +#nextcloudpi:hover,#nextcloudpi:active { -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity:1 } diff --git a/ncp-web/ncp.js b/ncp-web/ncp.js index e2e54cca..fa53b714 100644 --- a/ncp-web/ncp.js +++ b/ncp-web/ncp.js @@ -1,5 +1,5 @@ /// -// NextcloudPlus Web Panel javascript library +// NextCloudPi 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 06ec51e0..c90a509c 100644 --- a/ncp-web/sidebar.php +++ b/ncp-web/sidebar.php @@ -1,6 +1,6 @@ <?php /// -// NextcloudPlus Web Panel Side bar +// NextCloudPi Web Panel Side bar // // 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! diff --git a/ncp-web/wizard/index.php b/ncp-web/wizard/index.php index 2e99727d..b96e6839 100644 --- a/ncp-web/wizard/index.php +++ b/ncp-web/wizard/index.php @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>NextCloudPlus Wizard</title> + <title>NextCloudPi 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 NextCloudPlus</h1> + <h1>Welcome to NextCloudPi</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 NextCloudPlus hit Format USB. Skip if already formated as ext4. + If you want to prepare the USB drive to be used with NextCloudPi 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 NextCloudPlus try to do this automatically for you<br> + You can have NextCloudPi 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"> NextCloudPlus is ready!</p> + <p class="instructions"> NextCloudPi 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 NextCloudPlus web panel + <br>go back to NextCloudPi web panel </div> </div> diff --git a/tests/tests.py b/tests/tests.py index 63a57f83..6f521a7f 100755 --- a/tests/tests.py +++ b/tests/tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -Automatic testing for NextCloudPlus +Automatic testing for NextCloudPi 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("NextCloudPlus", driver.title) + self.assertIn("NextCloudPi", 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("NextCloudPlus", driver.title) + self.assertIn("NextCloudPi", driver.title) driver.get("https://" + IP + "/index.php/settings/apps") - self.assertIn("NextCloudPlus", driver.title) + self.assertIn("NextCloudPi", 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("NextCloudPlus", driver.title) + self.assertIn("NextCloudPi", 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("NextCloudPlus", driver.title) + self.assertIn("NextCloudPi", driver.title) def tearDown(self): self.driver.close() @@ -1,6 +1,6 @@ #!/bin/bash -# Updater for NextCloudPlus +# Updater for 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! @@ -228,6 +228,11 @@ done rm -f /etc/systemd/system/nc-notify-updates.timer } + # Update files after re-renaming to NCPi + sed -i 's|NextCloudPlus automatically|NextCloudPi automatically|' /etc/samba/smb.conf + sed -i 's|NextCloudPlus autogenerated|NextCloudPi autogenerated|' /etc/dhcpcd.conf + sed -i 's|NextCloudPlus|NextCloudPi|' /etc/fail2ban/action.d/sendmail-whois-lines.conf + } # end - only live updates exit 0 |