fix version, provisioning and more

Author: nachoparker

bin/ncp-provisioning.sh

@@ -50,7 +50,7 @@ EOF
 ## nc.limits.sh (auto)adjustments: number of threads, memory limits...
 
 source /usr/local/etc/library.sh
-run_app nc-limits
+configure_app nc-limits && run_app nc-limits
 
 ## Check for interrupted upgrades and rollback
 BKP="$( ls -1t /var/www/nextcloud-bkp_*.tar.gz 2>/dev/null | head -1 )"

bin/ncp-update

@@ -16,7 +16,7 @@
     echo "No internet connectivity"
     exit 1
   }
-  [[ -f /.ncp-image ]] || cd "$TMPDIR"         # update locally during build
+  cd "$TMPDIR"         # update locally during build
 
   echo -e "Performing updates"
   ./update.sh && {

bin/ncp/CONFIG/nc-limits.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# System limit configurator for NextCloudPi
+# System limits 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!

etc/ncp-config.d/letsencrypt.cfg

@@ -3,9 +3,7 @@
   "name": "Let's Encrypt, Automatic signed SSL certificates",
   "title": "letsencrypt",
   "description": "Automatic signed SSL certificates. Let’s Encrypt is a free, automated, and open Certificate Authority.",
-  "info": "Internet access is required for this configuration to complete\n
-  Both ports 80 and 443 need to be accessible from the internet\n \n
-  Your certificate will be automatically renewed every month",
+  "info": "Internet access is required for this configuration to complete\nBoth ports 80 and 443 need to be accessible from the internet\n\nYour certificate will be automatically renewed every month",
   "infotitle": "Warning",
   "params": [
     {

etc/ncp-config.d/nc-limits.cfg

@@ -13,7 +13,7 @@
     },
     {
       "id": "MEMORYLIMIT",
-      "name": "Memory limit,
+      "name": "Memory limit",
       "value": "0"
     },
     {

etc/ncp-config.d/spDYN.cfg

@@ -14,7 +14,7 @@
     },
     {
       "id": "DOMAIN",
-      "name": "Domain,
+      "name": "Domain",
       "value": "mycloud.spdns.de"
     },
     {

ncp.sh

@@ -178,8 +178,11 @@ EOF
   chown root:www-data /var/run/.ncp-latest-version
   chmod g+w           /var/run/.ncp-latest-version
 
-  # update to latest version from github as part of the build process
-  bin/ncp-update $BRANCH
+  # Install all ncp-apps
+  ./update.sh || exit 1
+  local VER=$( git describe --always --tags | grep -oP "v\d+\.\d+\.\d+" )
+  grep -qP "v\d+\.\d+\.\d+" <<< "$VER" || { echo "Invalid format"; exit 1; }
+  echo "$VER" > /usr/local/etc/ncp-version
 
   # LIMIT LOG SIZE
   grep -q maxsize /etc/logrotate.d/apache2 || sed -i /weekly/amaxsize2M /etc/logrotate.d/apache2