re-rename to NCPi

Makefile

@@ -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
 #

batch.sh

@@ -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

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

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[@]}" \

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

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
 

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!

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 /

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!

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!

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!

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()

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 
   }
 }

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>

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"

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"

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"

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/; \

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
   )
 }
 

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

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"
 

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"
 }}

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"
     }
 }

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",

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"
     }
 }

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"
     }
 }

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",

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"
     }

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