From d5c1f0058b43c22ebb132f51df0ea144fbd927ec Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sun, 9 Dec 2018 18:08:33 -0700
Subject: rework to use JSON based cfg and more

---
 Vagrantfile                              |    2 +-
 armbian.sh                               |   12 +-
 bin/ncp-config                           |  133 ++-
 bin/ncp-diag                             |    3 +-
 bin/ncp-provisioning.sh                  |   12 +-
 bin/ncp-suggestions                      |    4 +-
 bin/ncp/BACKUPS/nc-backup-auto.sh        |   51 ++
 bin/ncp/BACKUPS/nc-backup.sh             |  125 +++
 bin/ncp/BACKUPS/nc-export-ncp.sh         |   43 +
 bin/ncp/BACKUPS/nc-import-ncp.sh         |   57 ++
 bin/ncp/BACKUPS/nc-restore.sh            |  180 ++++
 bin/ncp/BACKUPS/nc-rsync-auto.sh         |   59 ++
 bin/ncp/BACKUPS/nc-rsync.sh              |   50 ++
 bin/ncp/BACKUPS/nc-snapshot-auto.sh      |   68 ++
 bin/ncp/BACKUPS/nc-snapshot-sync.sh      |   67 ++
 bin/ncp/BACKUPS/nc-snapshot.sh           |   58 ++
 bin/ncp/CONFIG/nc-admin.sh               |   39 +
 bin/ncp/CONFIG/nc-autoupdate-nc.sh       |   60 ++
 bin/ncp/CONFIG/nc-autoupdate-ncp.sh      |   51 ++
 bin/ncp/CONFIG/nc-database.sh            |   71 ++
 bin/ncp/CONFIG/nc-datadir.sh             |  123 +++
 bin/ncp/CONFIG/nc-httpsonly.sh           |   40 +
 bin/ncp/CONFIG/nc-init.sh                |  180 ++++
 bin/ncp/CONFIG/nc-limits.sh              |   74 ++
 bin/ncp/CONFIG/nc-nextcloud.sh           |  248 ++++++
 bin/ncp/CONFIG/nc-notify-updates.sh      |  108 +++
 bin/ncp/CONFIG/nc-passwd.sh              |   52 ++
 bin/ncp/CONFIG/nc-prettyURL.sh           |   65 ++
 bin/ncp/CONFIG/nc-scan-auto.sh           |   59 ++
 bin/ncp/CONFIG/nc-webui.sh               |   49 ++
 bin/ncp/NETWORKING/DDNS_duckDNS.sh       |   71 ++
 bin/ncp/NETWORKING/DDNS_freeDNS.sh       |   66 ++
 bin/ncp/NETWORKING/DDNS_no-ip.sh         |  118 +++
 bin/ncp/NETWORKING/DDNS_spDYN.sh         |  135 +++
 bin/ncp/NETWORKING/NFS.sh                |   67 ++
 bin/ncp/NETWORKING/SSH.sh                |   97 +++
 bin/ncp/NETWORKING/dnsmasq.sh            |   96 +++
 bin/ncp/NETWORKING/letsencrypt.sh        |  116 +++
 bin/ncp/NETWORKING/nc-forward-ports.sh   |   46 +
 bin/ncp/NETWORKING/nc-static-IP.sh       |  112 +++
 bin/ncp/NETWORKING/samba.sh              |  125 +++
 bin/ncp/SECURITY/UFW.sh                  |   75 ++
 bin/ncp/SECURITY/fail2ban.sh             |  174 ++++
 bin/ncp/SECURITY/modsecurity.sh          |  115 +++
 bin/ncp/SECURITY/nc-audit.sh             |   86 ++
 bin/ncp/SYSTEM/nc-automount.sh           |  122 +++
 bin/ncp/SYSTEM/nc-hdd-monitor.sh         |   83 ++
 bin/ncp/SYSTEM/nc-hdd-test.sh            |   62 ++
 bin/ncp/SYSTEM/nc-info.sh                |   48 ++
 bin/ncp/SYSTEM/nc-ramlogs.sh             |   77 ++
 bin/ncp/SYSTEM/nc-swapfile.sh            |   73 ++
 bin/ncp/SYSTEM/nc-wifi.sh                |   59 ++
 bin/ncp/SYSTEM/nc-zram.sh                |   93 +++
 bin/ncp/SYSTEM/unattended-upgrades.sh    |   82 ++
 bin/ncp/TOOLS/nc-fix-permissions.sh      |   42 +
 bin/ncp/TOOLS/nc-format-USB.sh           |   69 ++
 bin/ncp/TOOLS/nc-previews.sh             |   35 +
 bin/ncp/TOOLS/nc-scan.sh                 |   42 +
 bin/ncp/TOOLS/nc-update-nextcloud.sh     |   36 +
 bin/ncp/TOOLS/nc-update.sh               |   35 +
 build-SD-rpi.sh                          |   12 +-
 docker-armhf/lamp/Dockerfile             |    2 +-
 docker-armhf/nextcloud/Dockerfile        |   11 +-
 docker-armhf/nextcloudpi/Dockerfile      |   14 +-
 docker-common/debian-ncp/run-parts.sh    |    1 -
 docker-common/nextcloud/020nextcloud     |    2 +-
 docker/lamp/Dockerfile                   |    2 +-
 docker/nextcloud/Dockerfile              |   11 +-
 docker/nextcloudpi/Dockerfile            |   14 +-
 etc/library.sh                           |  259 +++---
 etc/ncp-config.d/DDNS_duckDNS.cfg        |   26 +
 etc/ncp-config.d/DDNS_duckDNS.sh         |   75 --
 etc/ncp-config.d/DDNS_freeDNS.cfg        |   31 +
 etc/ncp-config.d/DDNS_freeDNS.sh         |   71 --
 etc/ncp-config.d/DDNS_no-ip.cfg          |   36 +
 etc/ncp-config.d/DDNS_no-ip.sh           |  127 ---
 etc/ncp-config.d/DDNS_spDYN.cfg          |   26 +
 etc/ncp-config.d/DDNS_spDYN.sh           |  140 ----
 etc/ncp-config.d/NFS.cfg                 |   36 +
 etc/ncp-config.d/NFS.sh                  |   79 --
 etc/ncp-config.d/SSH.cfg                 |   31 +
 etc/ncp-config.d/SSH.sh                  |  108 ---
 etc/ncp-config.d/UFW.cfg                 |   31 +
 etc/ncp-config.d/UFW.sh                  |   81 --
 etc/ncp-config.d/dnsmasq.cfg             |   31 +
 etc/ncp-config.d/dnsmasq.sh              |  104 ---
 etc/ncp-config.d/fail2ban.cfg            |   42 +
 etc/ncp-config.d/fail2ban.sh             |  181 ----
 etc/ncp-config.d/letsencrypt.cfg         |   25 +
 etc/ncp-config.d/letsencrypt.sh          |  126 ---
 etc/ncp-config.d/modsecurity.cfg         |   16 +
 etc/ncp-config.d/modsecurity.sh          |  121 ---
 etc/ncp-config.d/nc-admin.cfg            |   25 +
 etc/ncp-config.d/nc-admin.sh             |   43 -
 etc/ncp-config.d/nc-audit.cfg            |    9 +
 etc/ncp-config.d/nc-audit.sh             |   87 --
 etc/ncp-config.d/nc-automount.cfg        |   16 +
 etc/ncp-config.d/nc-automount.sh         |  133 ---
 etc/ncp-config.d/nc-autoupdate-nc.cfg    |   21 +
 etc/ncp-config.d/nc-autoupdate-nc.sh     |   63 --
 etc/ncp-config.d/nc-autoupdate-ncp.cfg   |   21 +
 etc/ncp-config.d/nc-autoupdate-ncp.sh    |   54 --
 etc/ncp-config.d/nc-backup-auto.cfg      |   43 +
 etc/ncp-config.d/nc-backup-auto.sh       |   60 --
 etc/ncp-config.d/nc-backup.cfg           |   32 +
 etc/ncp-config.d/nc-backup.sh            |  132 ---
 etc/ncp-config.d/nc-database.cfg         |   15 +
 etc/ncp-config.d/nc-database.sh          |   84 --
 etc/ncp-config.d/nc-datadir.cfg          |   15 +
 etc/ncp-config.d/nc-datadir.sh           |  131 ---
 etc/ncp-config.d/nc-export-ncp.cfg       |   15 +
 etc/ncp-config.d/nc-export-ncp.sh        |   58 --
 etc/ncp-config.d/nc-fix-permissions.cfg  |    9 +
 etc/ncp-config.d/nc-fix-permissions.sh   |   43 -
 etc/ncp-config.d/nc-format-USB.cfg       |   15 +
 etc/ncp-config.d/nc-format-USB.sh        |   77 --
 etc/ncp-config.d/nc-forward-ports.cfg    |   20 +
 etc/ncp-config.d/nc-forward-ports.sh     |   57 --
 etc/ncp-config.d/nc-hdd-monitor.cfg      |   26 +
 etc/ncp-config.d/nc-hdd-monitor.sh       |   88 --
 etc/ncp-config.d/nc-hdd-test.cfg         |   22 +
 etc/ncp-config.d/nc-hdd-test.sh          |   66 --
 etc/ncp-config.d/nc-httpsonly.cfg        |   16 +
 etc/ncp-config.d/nc-httpsonly.sh         |   42 -
 etc/ncp-config.d/nc-import-ncp.cfg       |   15 +
 etc/ncp-config.d/nc-import-ncp.sh        |   76 --
 etc/ncp-config.d/nc-info.cfg             |    9 +
 etc/ncp-config.d/nc-info.sh              |   49 --
 etc/ncp-config.d/nc-init.cfg             |   20 +
 etc/ncp-config.d/nc-init.sh              |  191 -----
 etc/ncp-config.d/nc-limits.cfg           |   30 +
 etc/ncp-config.d/nc-limits.sh            |   81 --
 etc/ncp-config.d/nc-nextcloud.cfg        |   36 +
 etc/ncp-config.d/nc-nextcloud.sh         |  266 ------
 etc/ncp-config.d/nc-notify-updates.cfg   |   21 +
 etc/ncp-config.d/nc-notify-updates.sh    |  111 ---
 etc/ncp-config.d/nc-passwd.cfg           |   20 +
 etc/ncp-config.d/nc-passwd.sh            |   55 --
 etc/ncp-config.d/nc-prettyURL.cfg        |   16 +
 etc/ncp-config.d/nc-prettyURL.sh         |   68 --
 etc/ncp-config.d/nc-previews.cfg         |    9 +
 etc/ncp-config.d/nc-previews.sh          |   39 -
 etc/ncp-config.d/nc-ramlogs.cfg          |   16 +
 etc/ncp-config.d/nc-ramlogs.sh           |   87 --
 etc/ncp-config.d/nc-restore.cfg          |   15 +
 etc/ncp-config.d/nc-restore.sh           |  192 -----
 etc/ncp-config.d/nc-rsync-auto.cfg       |   26 +
 etc/ncp-config.d/nc-rsync-auto.sh        |   67 --
 etc/ncp-config.d/nc-rsync.cfg            |   15 +
 etc/ncp-config.d/nc-rsync.sh             |   56 --
 etc/ncp-config.d/nc-scan-auto.cfg        |   21 +
 etc/ncp-config.d/nc-scan-auto.sh         |   66 --
 etc/ncp-config.d/nc-scan.cfg             |    9 +
 etc/ncp-config.d/nc-scan.sh              |   43 -
 etc/ncp-config.d/nc-snapshot-auto.cfg    |   16 +
 etc/ncp-config.d/nc-snapshot-auto.sh     |   70 --
 etc/ncp-config.d/nc-snapshot-sync.cfg    |   37 +
 etc/ncp-config.d/nc-snapshot-sync.sh     |   78 --
 etc/ncp-config.d/nc-snapshot.cfg         |   15 +
 etc/ncp-config.d/nc-snapshot.sh          |   63 --
 etc/ncp-config.d/nc-static-IP.cfg        |   21 +
 etc/ncp-config.d/nc-static-IP.sh         |  115 ---
 etc/ncp-config.d/nc-swapfile.cfg         |   20 +
 etc/ncp-config.d/nc-swapfile.sh          |   76 --
 etc/ncp-config.d/nc-update-nextcloud.cfg |   15 +
 etc/ncp-config.d/nc-update-nextcloud.sh  |   40 -
 etc/ncp-config.d/nc-update.cfg           |    9 +
 etc/ncp-config.d/nc-update.sh            |   36 -
 etc/ncp-config.d/nc-webui.cfg            |   16 +
 etc/ncp-config.d/nc-webui.sh             |   51 --
 etc/ncp-config.d/nc-wifi.cfg             |   16 +
 etc/ncp-config.d/nc-wifi.sh              |   71 --
 etc/ncp-config.d/nc-zram.cfg             |   16 +
 etc/ncp-config.d/nc-zram.sh              |   95 ---
 etc/ncp-config.d/samba.cfg               |   21 +
 etc/ncp-config.d/samba.sh                |  134 ---
 etc/ncp-config.d/unattended-upgrades.cfg |   22 +
 etc/ncp-config.d/unattended-upgrades.sh  |   85 --
 install.sh                               |   11 +-
 ncp-web/L10N.php                         |    9 +-
 ncp-web/css/ncp.css                      | 1338 ++++++++++++++++++++++++++++++
 ncp-web/elements.php                     |  154 ++++
 ncp-web/img/files.svg                    |    1 +
 ncp-web/index.php                        |   91 +-
 ncp-web/js/minified.js                   |    1 +
 ncp-web/js/ncp.js                        |  411 +++++++++
 ncp-web/minified.js                      |    1 -
 ncp-web/ncp-launcher.php                 |  289 +++----
 ncp-web/ncp-output.php                   |    7 +-
 ncp-web/ncp.css                          | 1324 -----------------------------
 ncp-web/ncp.js                           |  422 ----------
 ncp-web/sidebar.php                      |   64 --
 ncp.sh                                   |   12 +-
 post-inst.sh                             |    8 +-
 update.sh                                |  119 +--
 195 files changed, 8004 insertions(+), 7131 deletions(-)
 create mode 100644 bin/ncp/BACKUPS/nc-backup-auto.sh
 create mode 100644 bin/ncp/BACKUPS/nc-backup.sh
 create mode 100644 bin/ncp/BACKUPS/nc-export-ncp.sh
 create mode 100644 bin/ncp/BACKUPS/nc-import-ncp.sh
 create mode 100644 bin/ncp/BACKUPS/nc-restore.sh
 create mode 100644 bin/ncp/BACKUPS/nc-rsync-auto.sh
 create mode 100644 bin/ncp/BACKUPS/nc-rsync.sh
 create mode 100644 bin/ncp/BACKUPS/nc-snapshot-auto.sh
 create mode 100644 bin/ncp/BACKUPS/nc-snapshot-sync.sh
 create mode 100644 bin/ncp/BACKUPS/nc-snapshot.sh
 create mode 100644 bin/ncp/CONFIG/nc-admin.sh
 create mode 100644 bin/ncp/CONFIG/nc-autoupdate-nc.sh
 create mode 100644 bin/ncp/CONFIG/nc-autoupdate-ncp.sh
 create mode 100644 bin/ncp/CONFIG/nc-database.sh
 create mode 100644 bin/ncp/CONFIG/nc-datadir.sh
 create mode 100644 bin/ncp/CONFIG/nc-httpsonly.sh
 create mode 100644 bin/ncp/CONFIG/nc-init.sh
 create mode 100644 bin/ncp/CONFIG/nc-limits.sh
 create mode 100644 bin/ncp/CONFIG/nc-nextcloud.sh
 create mode 100644 bin/ncp/CONFIG/nc-notify-updates.sh
 create mode 100644 bin/ncp/CONFIG/nc-passwd.sh
 create mode 100644 bin/ncp/CONFIG/nc-prettyURL.sh
 create mode 100644 bin/ncp/CONFIG/nc-scan-auto.sh
 create mode 100644 bin/ncp/CONFIG/nc-webui.sh
 create mode 100644 bin/ncp/NETWORKING/DDNS_duckDNS.sh
 create mode 100644 bin/ncp/NETWORKING/DDNS_freeDNS.sh
 create mode 100644 bin/ncp/NETWORKING/DDNS_no-ip.sh
 create mode 100644 bin/ncp/NETWORKING/DDNS_spDYN.sh
 create mode 100644 bin/ncp/NETWORKING/NFS.sh
 create mode 100644 bin/ncp/NETWORKING/SSH.sh
 create mode 100644 bin/ncp/NETWORKING/dnsmasq.sh
 create mode 100644 bin/ncp/NETWORKING/letsencrypt.sh
 create mode 100644 bin/ncp/NETWORKING/nc-forward-ports.sh
 create mode 100644 bin/ncp/NETWORKING/nc-static-IP.sh
 create mode 100644 bin/ncp/NETWORKING/samba.sh
 create mode 100644 bin/ncp/SECURITY/UFW.sh
 create mode 100644 bin/ncp/SECURITY/fail2ban.sh
 create mode 100644 bin/ncp/SECURITY/modsecurity.sh
 create mode 100644 bin/ncp/SECURITY/nc-audit.sh
 create mode 100644 bin/ncp/SYSTEM/nc-automount.sh
 create mode 100644 bin/ncp/SYSTEM/nc-hdd-monitor.sh
 create mode 100644 bin/ncp/SYSTEM/nc-hdd-test.sh
 create mode 100644 bin/ncp/SYSTEM/nc-info.sh
 create mode 100644 bin/ncp/SYSTEM/nc-ramlogs.sh
 create mode 100644 bin/ncp/SYSTEM/nc-swapfile.sh
 create mode 100644 bin/ncp/SYSTEM/nc-wifi.sh
 create mode 100644 bin/ncp/SYSTEM/nc-zram.sh
 create mode 100644 bin/ncp/SYSTEM/unattended-upgrades.sh
 create mode 100644 bin/ncp/TOOLS/nc-fix-permissions.sh
 create mode 100644 bin/ncp/TOOLS/nc-format-USB.sh
 create mode 100644 bin/ncp/TOOLS/nc-previews.sh
 create mode 100644 bin/ncp/TOOLS/nc-scan.sh
 create mode 100644 bin/ncp/TOOLS/nc-update-nextcloud.sh
 create mode 100644 bin/ncp/TOOLS/nc-update.sh
 create mode 100644 etc/ncp-config.d/DDNS_duckDNS.cfg
 delete mode 100644 etc/ncp-config.d/DDNS_duckDNS.sh
 create mode 100644 etc/ncp-config.d/DDNS_freeDNS.cfg
 delete mode 100644 etc/ncp-config.d/DDNS_freeDNS.sh
 create mode 100644 etc/ncp-config.d/DDNS_no-ip.cfg
 delete mode 100644 etc/ncp-config.d/DDNS_no-ip.sh
 create mode 100644 etc/ncp-config.d/DDNS_spDYN.cfg
 delete mode 100644 etc/ncp-config.d/DDNS_spDYN.sh
 create mode 100644 etc/ncp-config.d/NFS.cfg
 delete mode 100644 etc/ncp-config.d/NFS.sh
 create mode 100644 etc/ncp-config.d/SSH.cfg
 delete mode 100644 etc/ncp-config.d/SSH.sh
 create mode 100644 etc/ncp-config.d/UFW.cfg
 delete mode 100644 etc/ncp-config.d/UFW.sh
 create mode 100644 etc/ncp-config.d/dnsmasq.cfg
 delete mode 100644 etc/ncp-config.d/dnsmasq.sh
 create mode 100644 etc/ncp-config.d/fail2ban.cfg
 delete mode 100644 etc/ncp-config.d/fail2ban.sh
 create mode 100644 etc/ncp-config.d/letsencrypt.cfg
 delete mode 100644 etc/ncp-config.d/letsencrypt.sh
 create mode 100644 etc/ncp-config.d/modsecurity.cfg
 delete mode 100644 etc/ncp-config.d/modsecurity.sh
 create mode 100644 etc/ncp-config.d/nc-admin.cfg
 delete mode 100644 etc/ncp-config.d/nc-admin.sh
 create mode 100644 etc/ncp-config.d/nc-audit.cfg
 delete mode 100644 etc/ncp-config.d/nc-audit.sh
 create mode 100644 etc/ncp-config.d/nc-automount.cfg
 delete mode 100644 etc/ncp-config.d/nc-automount.sh
 create mode 100644 etc/ncp-config.d/nc-autoupdate-nc.cfg
 delete mode 100644 etc/ncp-config.d/nc-autoupdate-nc.sh
 create mode 100644 etc/ncp-config.d/nc-autoupdate-ncp.cfg
 delete mode 100644 etc/ncp-config.d/nc-autoupdate-ncp.sh
 create mode 100644 etc/ncp-config.d/nc-backup-auto.cfg
 delete mode 100644 etc/ncp-config.d/nc-backup-auto.sh
 create mode 100644 etc/ncp-config.d/nc-backup.cfg
 delete mode 100644 etc/ncp-config.d/nc-backup.sh
 create mode 100644 etc/ncp-config.d/nc-database.cfg
 delete mode 100644 etc/ncp-config.d/nc-database.sh
 create mode 100644 etc/ncp-config.d/nc-datadir.cfg
 delete mode 100644 etc/ncp-config.d/nc-datadir.sh
 create mode 100644 etc/ncp-config.d/nc-export-ncp.cfg
 delete mode 100644 etc/ncp-config.d/nc-export-ncp.sh
 create mode 100644 etc/ncp-config.d/nc-fix-permissions.cfg
 delete mode 100644 etc/ncp-config.d/nc-fix-permissions.sh
 create mode 100644 etc/ncp-config.d/nc-format-USB.cfg
 delete mode 100644 etc/ncp-config.d/nc-format-USB.sh
 create mode 100644 etc/ncp-config.d/nc-forward-ports.cfg
 delete mode 100644 etc/ncp-config.d/nc-forward-ports.sh
 create mode 100644 etc/ncp-config.d/nc-hdd-monitor.cfg
 delete mode 100644 etc/ncp-config.d/nc-hdd-monitor.sh
 create mode 100644 etc/ncp-config.d/nc-hdd-test.cfg
 delete mode 100644 etc/ncp-config.d/nc-hdd-test.sh
 create mode 100644 etc/ncp-config.d/nc-httpsonly.cfg
 delete mode 100644 etc/ncp-config.d/nc-httpsonly.sh
 create mode 100644 etc/ncp-config.d/nc-import-ncp.cfg
 delete mode 100644 etc/ncp-config.d/nc-import-ncp.sh
 create mode 100644 etc/ncp-config.d/nc-info.cfg
 delete mode 100644 etc/ncp-config.d/nc-info.sh
 create mode 100644 etc/ncp-config.d/nc-init.cfg
 delete mode 100644 etc/ncp-config.d/nc-init.sh
 create mode 100644 etc/ncp-config.d/nc-limits.cfg
 delete mode 100644 etc/ncp-config.d/nc-limits.sh
 create mode 100644 etc/ncp-config.d/nc-nextcloud.cfg
 delete mode 100644 etc/ncp-config.d/nc-nextcloud.sh
 create mode 100644 etc/ncp-config.d/nc-notify-updates.cfg
 delete mode 100644 etc/ncp-config.d/nc-notify-updates.sh
 create mode 100644 etc/ncp-config.d/nc-passwd.cfg
 delete mode 100644 etc/ncp-config.d/nc-passwd.sh
 create mode 100644 etc/ncp-config.d/nc-prettyURL.cfg
 delete mode 100644 etc/ncp-config.d/nc-prettyURL.sh
 create mode 100644 etc/ncp-config.d/nc-previews.cfg
 delete mode 100644 etc/ncp-config.d/nc-previews.sh
 create mode 100644 etc/ncp-config.d/nc-ramlogs.cfg
 delete mode 100644 etc/ncp-config.d/nc-ramlogs.sh
 create mode 100644 etc/ncp-config.d/nc-restore.cfg
 delete mode 100644 etc/ncp-config.d/nc-restore.sh
 create mode 100644 etc/ncp-config.d/nc-rsync-auto.cfg
 delete mode 100644 etc/ncp-config.d/nc-rsync-auto.sh
 create mode 100644 etc/ncp-config.d/nc-rsync.cfg
 delete mode 100644 etc/ncp-config.d/nc-rsync.sh
 create mode 100644 etc/ncp-config.d/nc-scan-auto.cfg
 delete mode 100644 etc/ncp-config.d/nc-scan-auto.sh
 create mode 100644 etc/ncp-config.d/nc-scan.cfg
 delete mode 100644 etc/ncp-config.d/nc-scan.sh
 create mode 100644 etc/ncp-config.d/nc-snapshot-auto.cfg
 delete mode 100644 etc/ncp-config.d/nc-snapshot-auto.sh
 create mode 100644 etc/ncp-config.d/nc-snapshot-sync.cfg
 delete mode 100644 etc/ncp-config.d/nc-snapshot-sync.sh
 create mode 100644 etc/ncp-config.d/nc-snapshot.cfg
 delete mode 100644 etc/ncp-config.d/nc-snapshot.sh
 create mode 100644 etc/ncp-config.d/nc-static-IP.cfg
 delete mode 100644 etc/ncp-config.d/nc-static-IP.sh
 create mode 100644 etc/ncp-config.d/nc-swapfile.cfg
 delete mode 100644 etc/ncp-config.d/nc-swapfile.sh
 create mode 100644 etc/ncp-config.d/nc-update-nextcloud.cfg
 delete mode 100644 etc/ncp-config.d/nc-update-nextcloud.sh
 create mode 100644 etc/ncp-config.d/nc-update.cfg
 delete mode 100644 etc/ncp-config.d/nc-update.sh
 create mode 100644 etc/ncp-config.d/nc-webui.cfg
 delete mode 100644 etc/ncp-config.d/nc-webui.sh
 create mode 100644 etc/ncp-config.d/nc-wifi.cfg
 delete mode 100644 etc/ncp-config.d/nc-wifi.sh
 create mode 100644 etc/ncp-config.d/nc-zram.cfg
 delete mode 100644 etc/ncp-config.d/nc-zram.sh
 create mode 100644 etc/ncp-config.d/samba.cfg
 delete mode 100644 etc/ncp-config.d/samba.sh
 create mode 100644 etc/ncp-config.d/unattended-upgrades.cfg
 delete mode 100644 etc/ncp-config.d/unattended-upgrades.sh
 create mode 100644 ncp-web/css/ncp.css
 create mode 100644 ncp-web/elements.php
 create mode 100644 ncp-web/img/files.svg
 create mode 100644 ncp-web/js/minified.js
 create mode 100644 ncp-web/js/ncp.js
 delete mode 100644 ncp-web/minified.js
 delete mode 100644 ncp-web/ncp.css
 delete mode 100644 ncp-web/ncp.js
 delete mode 100644 ncp-web/sidebar.php

diff --git a/Vagrantfile b/Vagrantfile
index 4915c5f4..6a0d4577 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -40,7 +40,7 @@ Vagrant.configure("2") do |config|
 
     # cleanup
     source etc/library.sh
-    install_script post-inst.sh
+    run_app post-inst.sh
     cd -
     rm -r /tmp/nextcloudpi
     systemctl disable sshd
diff --git a/armbian.sh b/armbian.sh
index e567f662..62953efb 100644
--- a/armbian.sh
+++ b/armbian.sh
@@ -29,12 +29,12 @@ cd /tmp/overlay
 echo -e "\nInstalling NextCloudPi"
 source etc/library.sh
 
-install_script  lamp.sh
-install_script  etc/ncp-config.d/nc-nextcloud.sh
-activate_script etc/ncp-config.d/nc-nextcloud.sh
-install_script  ncp.sh
-activate_script etc/ncp-config.d/nc-init.sh
-install_script  post-inst.sh
+install_app  lamp.sh
+install_app  etc/ncp-config.d/nc-nextcloud.sh
+run_app      etc/ncp-config.d/nc-nextcloud.sh
+install_app  ncp.sh
+run_app      etc/ncp-config.d/nc-init.sh
+run_app      post-inst.sh
 
 cd -
 
diff --git a/bin/ncp-config b/bin/ncp-config
index 40b69b51..6dd36171 100755
--- a/bin/ncp-config
+++ b/bin/ncp-config
@@ -11,55 +11,96 @@
 # More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/
 #
 
+BINDIR=/usr/local/bin/ncp
+
 source /usr/local/etc/library.sh
 {
+  # ask for update if outdated
+  ncp-test-updates 2>/dev/null && {
+    [[ -f "$chlogfile" ]] && local changelog=$( head -4 "$chlogfile" )
+
+    whiptail --backtitle "$backtitle $ncpversion" \
+             --title "NextCloudPi update available" \
+             --clear --yesno "Update to $latest_ver?\n\n$changelog" \
+             15 70
+
+    [[ $? -eq $dialog_ok ]] && ncp-update
+  }
+
+function generate_list()
+{
+  local dir="$1"
+  unset list
+  for item in "$dir"/*; do
+
+    # directories
+    [[ -d "$item" ]] && {
+      local dir="$( basename "$item" )"
+      list+=("  $dir" "")
+      continue
+    }
+
+    [[ "$item" =~ ".sh" ]] || continue
+
+    # regular ncp_apps
+    local app="$( basename "$item" .sh )"
+    local cfg="$cfgdir/$app".cfg
+
+    [[ -f "$cfg" ]] && local desc=$( jq -r .description "$cfg" ) || local desc="No description."
+    is_active_app "$app" "$dir" && local on="*" || local on=" "
 
-function nextcloud-config()
+    list+=( "$on $app" "$desc" )
+  done
+}
+
+function config_menu()
 {
-    local DIALOG_OK=0
-    local VERFILE=/var/run/.ncp-latest-version
-    local BACKTITLE="NextCloudPi configuration ver. "
-    local CONFDIR=/usr/local/etc/ncp-config.d/ 
-    local DESC
-
-    # ask for update if outdated
-    test -f /usr/local/etc/ncp-changelog && \
-      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 "NextCloudPi update available" \
-      --clear --yesno "Update to $( cat $VERFILE )?\n\n$CHANGELOG" \
-      15 70
-    [[ $? -eq $DIALOG_OK ]] && ncp-update
-
-    while true; do
-
-      # fill options
-      local LIST=()
-      for item in $CONFDIR/*.sh; do
-        DESC=$( grep "DESCRIPTION=" "$item" | sed 's|^DESCRIPTION="||;s|"$||' )
-        is_active_script "$item" &>/dev/null && local ON="*" || local ON=" "
-        LIST+=( "$ON $( basename "$item" .sh )" "$DESC" )
-      done
-
-      # launch the selection menu
-      local script
-      script=$( whiptail --backtitle "$BACKTITLE $( cat /usr/local/etc/ncp-version )" \
-                         --title "NextCloudPi Software Configuration Tool (ncp-config)" \
-                         --cancel-button Finish --ok-button Select \
-                         --menu "Select program to configure and activate:" 20 105 10 \
-                         "${LIST[@]}" \
-                3>&1 1>&2 2>&3 )
-
-      [[ $? -ne $DIALOG_OK ]] || [[ "$script" == "" ]] && return 0
-
-      # remove ✓ and spaces
-      script=$( sed  's=*\| ==g' <<< "$script" )
-
-      # launch selected script
-      info_script      "$script".sh || continue;
-      configure_script "$script".sh && { echo "Done. Press any key..."; read -r; }
-    done
+  local dir="$1"
+  local backtitle="NextCloudPi configuration ver. "
+  local latest_ver="$(cat /var/run/.ncp-latest-version)"
+  local ncpversion="$(cat /usr/local/etc/ncp-version  )"
+  local cfgdir=/usr/local/etc/ncp-config.d
+  local chlogfile=/usr/local/etc/ncp-changelog
+  local dialog_ok=0
+  local desc cfg ncp_app
+
+  while true; do
+
+    # menu items
+    generate_list "$dir"
+
+    # launch the selection menu
+    [[ "$dir" == "$BINDIR" ]] && local cancel_btn="Finish" || local cancel_btn="Back"
+    ncp_app=$( whiptail --backtitle "$backtitle $ncpversion" \
+                       --title "NextCloudPi Configuration Tool (ncp-config)" \
+                       --cancel-button $cancel_btn --ok-button Select \
+                       --menu "Select ncp-app to configure or activate:" 20 105 10 \
+                       "${list[@]}" \
+              3>&1 1>&2 2>&3 )
+
+    [[ $? -ne $dialog_ok ]] || [[ "$ncp_app" == "" ]] && {
+      [[ "$dir" == "$BINDIR" ]] && return 0
+      dir="$(dirname "$dir")"
+      continue
+    }
+
+    # remove * and spaces
+    ncp_app=$( sed  's=*\| ==g' <<< "$ncp_app" )
+
+    # directory selection
+    [[ -d "$dir/$ncp_app" ]] && {
+      dir="$dir/$ncp_app"
+      config_menu "$dir"
+      return
+    }
+
+    # launch selected ncp_app
+    info_app      "$ncp_app" || continue
+    configure_app "$ncp_app" || continue
+    run_app       "$ncp_app"
+    echo "Done. Press any key..."
+    read -r
+  done
 }
 
 if [[ ${EUID} -ne 0 ]]; then
@@ -67,7 +108,7 @@ if [[ ${EUID} -ne 0 ]]; then
   exit 1
 fi
 
-nextcloud-config
+config_menu "$BINDIR"
 
 exit $?
 } # force to read the whole thing into memory, as its contents might change in update.sh
diff --git a/bin/ncp-diag b/bin/ncp-diag
index 4e646c0f..7e9e2a63 100644
--- a/bin/ncp-diag
+++ b/bin/ncp-diag
@@ -23,7 +23,8 @@ test -d "$DATADIR" || DIRINFO=" (doesn't exist)"
 USBDEVS="$( lsblk -S -o  NAME,TRAN | awk '{ if ( $2 == "usb" ) print $1; }' | tr '\n' ' ' )"
 [[ "$USBDEVS" == "" ]] && USBDEVS="none"
 
-[[ -f /usr/local/etc/ncp-config.d/nc-automount.sh ]] && echo "automount|$( grep "^ACTIVE_" /usr/local/etc/ncp-config.d/nc-automount.sh | cut -d'=' -f2 )"
+am_cfg="/usr/local/etc/nc-automount.cfg"
+[[ -f "$am_cfg" ]] && [[ "$(jq -r ".params[0].value" "$am_cfg")" == "yes" ]] && echo "automount|yes" || echo "automount|no"
 echo "USB devices|$USBDEVS"
 echo "datadir|$DATADIR$DIRINFO"
 [[ "$DIRINFO" == "" ]] && {
diff --git a/bin/ncp-provisioning.sh b/bin/ncp-provisioning.sh
index c905a01b..7316fa4b 100644
--- a/bin/ncp-provisioning.sh
+++ b/bin/ncp-provisioning.sh
@@ -5,7 +5,6 @@
 ## redis provisioning
 
 CFG=/var/www/nextcloud/config/config.php
-CONFDIR=/usr/local/etc/ncp-config.d/
 REDISPASS="$( grep "^requirepass" /etc/redis/redis.conf | cut -f2 -d' ' )"
 
 ### IF redis password is the default one, generate a new one
@@ -51,9 +50,7 @@ EOF
 ## nc.limits.sh (auto)adjustments: number of threads, memory limits...
 
 source /usr/local/etc/library.sh
-cd "$CONFDIR" &>/dev/null
-activate_script nc-limits.sh
-cd -          &>/dev/null
+run_app nc-limits
 
 ## Check for interrupted upgrades and rollback
 BKP="$( ls -1t /var/www/nextcloud-bkp_*.tar.gz 2>/dev/null | head -1 )"
@@ -62,11 +59,4 @@ BKP="$( ls -1t /var/www/nextcloud-bkp_*.tar.gz 2>/dev/null | head -1 )"
   ncp-restore "$BKP" && rm "$BKP"
 }
 
-## Fix permissions on NCP folders. The main reason for this is to make devel docker container work
-[[ -e $CONFDIR ]] && {
-  chown -R root:www-data "$CONFDIR"/*
-  chmod 660              "$CONFDIR"/*
-  chmod 750              "$CONFDIR"/l10n
-}
-
 exit 0
diff --git a/bin/ncp-suggestions b/bin/ncp-suggestions
index 77559732..5f20bd85 100644
--- a/bin/ncp-suggestions
+++ b/bin/ncp-suggestions
@@ -14,12 +14,12 @@
 
 OUT="$@"
 
-DNSMASQ_ON="$( grep "^ACTIVE_=" /usr/local/etc/ncp-config.d/dnsmasq.sh | cut -d'=' -f2 )"
+source /usr/local/etc/library.sh
   
 grep -q "distribution|.*bian GNU/Linux 9,*" <<<"$OUT" || \
   echo -e "You are using an unsupported distro release. Please upgrade to latest Debian/Raspbian"
 
-[[ $DNSMASQ_ON != "yes" ]] && \
+is_active_app dnsmasq && \
   grep -q "NAT loopback|no" <<<"$OUT" && \
     echo -e "\nYou should enable dnsmasq to use your domain inside home"
 
diff --git a/bin/ncp/BACKUPS/nc-backup-auto.sh b/bin/ncp/BACKUPS/nc-backup-auto.sh
new file mode 100644
index 00000000..ef9c8a91
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-backup-auto.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# Nextcloud backups
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && {
+    rm -f /etc/cron.d/ncp-backup-auto
+    service cron restart
+    echo "automatic backups disabled"
+    return 0
+  }
+
+  cat > /usr/local/bin/ncp-backup-auto <<EOF
+#!/bin/bash
+sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --on
+/usr/local/bin/ncp-backup "$DESTDIR" "$INCLUDEDATA" "$COMPRESS" "$BACKUPLIMIT"
+sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --off
+EOF
+  chmod +x /usr/local/bin/ncp-backup-auto
+
+  echo "0  3  */${BACKUPDAYS}  *  *  root  /usr/local/bin/ncp-backup-auto" > /etc/cron.d/ncp-backup-auto
+  service cron restart
+
+  echo "automatic backups enabled"
+}
+
+install() { :; }
+
+# 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/bin/ncp/BACKUPS/nc-backup.sh b/bin/ncp/BACKUPS/nc-backup.sh
new file mode 100644
index 00000000..09c36c4f
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-backup.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# Nextcloud backups
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+install()
+{
+  cat > /usr/local/bin/ncp-backup <<'EOF'
+#!/bin/bash
+set -eE
+
+DESTDIR="${1:-/media/USBdrive/ncp-backups}"
+INCLUDEDATA="${2:-no}"
+COMPRESS="${3:-no}"
+BACKUPLIMIT="${4:-0}"
+
+DESTFILE="$DESTDIR"/nextcloud-bkp_$( date +"%Y%m%d_%s" ).tar 
+DBBACKUP=nextcloud-sqlbkp_$( date +"%Y%m%d" ).bak
+OCC="sudo -u www-data php /var/www/nextcloud/occ"
+
+DATADIR=$( $OCC config:system:get datadirectory ) || {
+  echo "Error reading data directory. Is NextCloud running and configured?";
+  exit 1;
+}
+
+cleanup(){ local RET=$?;                    rm -f "${DBBACKUP}"              ;[[ -f /.docker-image ]] && mv /data/nextcloud /data/app; $OCC maintenance:mode --off; exit $RET; }
+fail()   { local RET=$?; echo "Abort..."  ; rm -f "${DBBACKUP}" "${DESTFILE}";[[ -f /.docker-image ]] && mv /data/nextcloud /data/app; $OCC maintenance:mode --off; exit $RET; }
+trap cleanup EXIT
+trap fail INT TERM HUP ERR
+
+echo "check free space..." # allow at least ~500 MiB for backups without data
+mkdir -p "$DESTDIR"
+[[ "$INCLUDEDATA" == "yes" ]] && SIZE=$( du -s "$DATADIR" | awk '{ print $1 }' ) || SIZE=500000
+FREE=$( df    "$DESTDIR" | tail -1 | awk '{ print $4 }' )
+
+[ $SIZE -ge $FREE ] && { 
+  echo "free space check failed. Need $SIZE Bytes";
+  exit 1; 
+}
+
+# delete older backups
+[[ $BACKUPLIMIT != 0 ]] && {
+  NUMBKPS=$( ls "$DESTDIR"/nextcloud-bkp_* 2>/dev/null | wc -l )
+  [[ $NUMBKPS -ge $BACKUPLIMIT ]] && \
+    ls -t $DESTDIR/nextcloud-bkp_* | tail -$(( NUMBKPS - BACKUPLIMIT + 1 )) | while read -r f; do
+      echo "clean up old backup $f"
+      rm "$f"
+    done
+}
+
+# database
+$OCC maintenance:mode --on
+[[ -f /.docker-image ]] && mv /data/app /data/nextcloud && DATADIR=/data/nextcloud/data
+[[ -f /.docker-image ]] && BASEDIR=/data || BASEDIR=/var/www
+cd "$BASEDIR" || exit 1
+echo "backup database..."
+mysqldump -u root --single-transaction nextcloud > "$DBBACKUP"
+
+# files
+echo "backup base files..."
+mkdir -p "$DESTDIR"
+tar --exclude "nextcloud/data/*/files/*" \
+    --exclude "nextcloud/data/.opcache" \
+    --exclude "nextcloud/data/{access,error,nextcloud}.log" \
+    --exclude "nextcloud/data/access.log" \
+    --exclude "nextcloud/data/ncp-update-backups/" \
+    -cf "$DESTFILE" "$DBBACKUP" "nextcloud"/ \
+  || {
+        echo "error generating backup"
+        exit 1
+      }
+rm "$DBBACKUP"
+
+[[ "$INCLUDEDATA" == "yes" ]] && {
+  echo "backup data files..."
+  tar --exclude "data/.opcache" \
+      --exclude "data/{access,error,nextcloud}.log" \
+      --exclude "data/access.log" \
+      --exclude "data/ncp-update-backups/" \
+      -rf "$DESTFILE" -C "$DATADIR"/.. "$( basename "$DATADIR" )" \
+  || {
+        echo "error generating backup"
+        exit 1
+      }
+} 
+
+[[ "$COMPRESS" == "yes" ]] && {
+  echo "compressing backup file..."
+  tar -czf "${DESTFILE}.gz" -C "$( dirname "$DESTFILE" )" "$( basename "$DESTFILE" )"
+  rm "$DESTFILE"
+  DESTFILE="${DESTFILE}.gz"
+}
+chmod 600 "$DESTFILE"
+
+echo "backup $DESTFILE generated"
+EOF
+  chmod +x /usr/local/bin/ncp-backup
+}
+
+configure()
+{
+  ncp-backup "$DESTDIR" "$INCLUDEDATA" "$COMPRESS" "$BACKUPLIMIT"
+}
+
+# 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/bin/ncp/BACKUPS/nc-export-ncp.sh b/bin/ncp/BACKUPS/nc-export-ncp.sh
new file mode 100644
index 00000000..ce2e9308
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-export-ncp.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Export NextCloudPi configuration
+#
+#
+# Copyleft 2017 by Courtney Hicks
+# GPL licensed (see end of file) * Use at your own risk!
+#
+
+
+
+configure() 
+{
+  [[ -d "$DIR" ]] || { echo "directory $DIR does not exist"; return 1; }
+
+  local destfile="$DIR"/ncp-config_$( date +"%Y%m%d" ).tar 
+
+  tar -cf "$destfile" -C /usr/local/etc/ncp-config.d .
+  chmod 600 "$destfile"
+
+  cd $OLDPWD
+  rm -rf /tmp/ncp-export
+  echo -e "configuration exported to $destfile"
+}
+
+install() { :; }
+
+# 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/bin/ncp/BACKUPS/nc-import-ncp.sh b/bin/ncp/BACKUPS/nc-import-ncp.sh
new file mode 100644
index 00000000..7c83da24
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-import-ncp.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Import NextCloudPi configuration
+#
+#
+# Copyleft 2017 by Courtney Hicks
+# GPL licensed (see end of file) * Use at your own risk!
+#
+
+
+
+CFGDIR="/usr/local/etc/ncp-config.d"
+
+configure() 
+{
+  [[ -f "$FILE" ]] || { echo "export file $FILE does not exist"; return 1; }
+
+  source /usr/local/etc/library.sh || return 1
+  cd "$CFGDIR"   || return 1
+
+  # extract export
+  tar -xf "$FILE" -C "$CFGDIR"
+
+  # UGLY workaround to prevent apache from restarting upon activating some extras
+  # which leads to the operation appearing to fail in ncp-web
+  #echo "invalid_op" >> /etc/apache2/sites-available/000-default.conf
+
+  # activate
+  # TODO
+
+  # Fix invalid configuration
+  #sed -i "/^invalid_op/d" /etc/apache2/sites-available/000-default.conf
+
+  echo -e "\nconfiguration restored"
+
+  # delayed in bg so it does not kill the connection, and we get AJAX response
+  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+}
+
+install() { :; }
+
+# 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/bin/ncp/BACKUPS/nc-restore.sh b/bin/ncp/BACKUPS/nc-restore.sh
new file mode 100644
index 00000000..fff6aafa
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-restore.sh
@@ -0,0 +1,180 @@
+#!/bin/bash
+
+#!/bin/bash
+# Nextcloud restore backup
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+install()
+{ 
+  cat > /usr/local/bin/ncp-restore <<'EOF'
+#!/bin/bash
+set -eE
+
+BACKUPFILE="$1"
+
+DBADMIN=ncadmin
+DBPASSWD="$( grep password /root/.my.cnf | sed 's|password=||' )"
+PHPVER=7.2
+
+DIR="$( cd "$( dirname "$BACKUPFILE" )" &>/dev/null && pwd )" #abspath
+
+[[ -f /.docker-image ]] && NCDIR=/data/app || NCDIR=/var/www/nextcloud
+
+[[ $# -eq 0           ]] && { echo "missing first argument"         ; exit 1; }
+[[ -f "$BACKUPFILE"   ]] || { echo "$BACKUPFILE not found"          ; exit 1; }
+[[ "$DIR" =~ "$NCDIR" ]] && { echo "Refusing to restore from $NCDIR"; exit 1; }
+
+TMPDIR="$( mktemp -d "$( dirname "$BACKUPFILE" )"/ncp-restore.XXXXXX )" || { echo "Failed to create temp dir" >&2; exit 1; }
+grep -q -e ext -e btrfs <( stat -fc%T "$TMPDIR" ) || { echo "Can only restore from ext/btrfs filesystems"     >&2; exit 1; }
+
+TMPDIR="$( cd "$TMPDIR" &>/dev/null && pwd )" || { echo "$TMPDIR not found"; exit 1; } #abspath
+cleanup(){  local RET=$?; echo "Cleanup..."; rm -rf "${TMPDIR}"; trap "" EXIT; exit $RET; }
+trap cleanup INT TERM HUP ERR EXIT
+rm -rf "$TMPDIR" && mkdir -p "$TMPDIR"
+
+# EXTRACT FILES
+[[ "$BACKUPFILE" =~ ".tar.gz" ]] && COMPRESSED=1 || COMPRESSED=0
+[[ "$COMPRESSED" == "1" ]] && {
+  echo "decompressing backup file $BACKUPFILE..."
+  tar -xzf "$BACKUPFILE" -C "$TMPDIR" || exit 1
+  BACKUPFILE="$( ls "$TMPDIR"/*.tar 2>/dev/null )"
+  [[ -f "$BACKUPFILE" ]] || { echo "$BACKUPFILE not found"; exit 1; }
+}
+
+echo "extracting backup file $BACKUPFILE..."
+tar -xf "$BACKUPFILE" -C "$TMPDIR" || exit 1
+
+## SANITY CHECKS
+[[ -d "$TMPDIR"/nextcloud ]] && [[ -f "$( ls "$TMPDIR"/nextcloud-sqlbkp_*.bak 2>/dev/null )" ]] || {
+  echo "invalid backup file. Abort"
+  exit 1
+}
+
+## RESTORE FILES
+
+echo "restore files..."
+rm -rf "$NCDIR"
+mv -T "$TMPDIR"/nextcloud "$NCDIR" || { echo "Error restoring base files"; exit 1; }
+
+# update NC database password to this instance
+sed -i "s|'dbpassword' =>.*|'dbpassword' => '$DBPASSWD',|" /var/www/nextcloud/config/config.php
+
+# update redis credentials
+REDISPASS="$( grep "^requirepass" /etc/redis/redis.conf | cut -f2 -d' ' )"
+[[ "$REDISPASS" != "" ]] && \
+  sed -i "s|'password'.*|'password' => '$REDISPASS',|" /var/www/nextcloud/config/config.php
+service redis-server restart
+
+## RE-CREATE DATABASE TABLE
+
+echo "restore database..."
+mysql -u root <<EOFMYSQL
+DROP DATABASE IF EXISTS nextcloud;
+CREATE DATABASE nextcloud;
+GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
+DROP USER '$DBADMIN'@'localhost';
+CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
+GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
+EXIT
+EOFMYSQL
+[ $? -ne 0 ] && { echo "Error configuring nextcloud database"; exit 1; }
+
+mysql -u root nextcloud <  "$TMPDIR"/nextcloud-sqlbkp_*.bak || { echo "Error restoring nextcloud database"; exit 1; }
+
+## RESTORE DATADIR
+
+cd "$NCDIR"
+
+### INCLUDEDATA=yes situation
+
+NUMFILES=$(( 2 + COMPRESSED ))
+if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then
+
+  DATADIR=$( grep datadirectory "$NCDIR"/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 ) 
+  [[ "$DATADIR" == "" ]] && { echo "Error reading data directory"; exit 1; }
+
+  echo "restore datadir to $DATADIR..."
+
+  [[ -e "$DATADIR" ]] && { 
+    echo "backing up existing $DATADIR"
+    mv "$DATADIR" "$DATADIR-$( date "+%m-%d-%y" )" || exit 1
+  }
+
+  mkdir -p "$DATADIR"
+  [[ "$( stat -fc%T "$DATADIR" )" == "btrfs" ]] && {
+    rmdir "$DATADIR"                  || exit 1
+    btrfs subvolume create "$DATADIR" || exit 1
+  }
+  chown www-data:www-data "$DATADIR"
+  TMPDATA="$TMPDIR/$( basename "$DATADIR" )"
+  mv "$TMPDATA"/* "$TMPDATA"/.[!.]* "$DATADIR" || exit 1
+  rmdir "$TMPDATA"                             || exit 1
+
+  sudo -u www-data php occ maintenance:mode --off
+
+### INCLUDEDATA=no situation
+
+else      
+  echo "no datadir found in backup"
+  DATADIR="$NCDIR"/data
+
+  sudo -u www-data php occ maintenance:mode --off
+  sudo -u www-data php occ files:scan --all
+
+  # cache needs to be cleaned as of NC 12
+  NEED_RESTART=1
+fi
+
+# Just in case we moved the opcache dir
+sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$DATADIR/.opcache|" /etc/php/${PHPVER}/mods-available/opcache.ini
+
+# tmp upload dir
+mkdir -p "$DATADIR/tmp" 
+chown www-data:www-data "$DATADIR/tmp"
+sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/cli/php.ini
+sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/fpm/php.ini
+sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR/tmp|"     /etc/php/${PHPVER}/fpm/php.ini
+
+# update fail2ban logpath
+[[ ! -f /.docker-image ]] && {
+  sed -i "s|logpath  =.*|logpath  = $DATADIR/nextcloud.log|" /etc/fail2ban/jail.conf
+  pgrep fail2ban &>/dev/null && service fail2ban restart
+}
+
+# refresh nextcloud trusted domains
+bash /usr/local/bin/nextcloud-domain.sh
+
+# restart PHP if needed
+[[ "$NEED_RESTART" == "1" ]] && \
+  bash -c " sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
+EOF
+  chmod +x /usr/local/bin/ncp-restore
+}
+
+configure()
+{
+  ncp-restore "$BACKUPFILE"
+}
+
+# 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/bin/ncp/BACKUPS/nc-rsync-auto.sh b/bin/ncp/BACKUPS/nc-rsync-auto.sh
new file mode 100644
index 00000000..a1da426d
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-rsync-auto.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Periodically sync Nextcloud datafolder through rsync
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y rsync
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    rm -f /etc/cron.d/ncp-rsync-auto
+    echo "automatic rsync disabled"
+    return 0
+  }
+
+  local DATADIR
+  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
+    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    return 1;
+  }
+
+  [[ "$DESTINATION" =~ : ]] && {
+    local NET="$( sed 's|:.*||' <<<"$DESTINATION" )"
+    local SSH=( ssh -o "BatchMode=yes" "$NET" )
+    ${SSH[@]} : || { echo "SSH non-interactive not properly configured"; return 1; }
+  }
+
+  echo "0  5  */${SYNCDAYS}  *  *  root  /usr/bin/rsync -ax --delete \"$DATADIR\" \"$DESTINATION\"" > /etc/cron.d/ncp-rsync-auto
+  service cron restart
+
+  echo "automatic rsync enabled"
+}
+
+# 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/bin/ncp/BACKUPS/nc-rsync.sh b/bin/ncp/BACKUPS/nc-rsync.sh
new file mode 100644
index 00000000..4b1fef96
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-rsync.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Sync Nextcloud datafolder through rsync
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+BASEDIR=/var/www
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y rsync
+}
+
+configure()
+{
+  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --on
+
+  local DATADIR
+  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
+    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    return 1;
+  }
+
+  rsync -ax --delete "$DATADIR" "$DESTINATION"
+
+  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
+}
+
+# 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/bin/ncp/BACKUPS/nc-snapshot-auto.sh b/bin/ncp/BACKUPS/nc-snapshot-auto.sh
new file mode 100644
index 00000000..2f12cd46
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-snapshot-auto.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+
+install()
+{
+  wget https://raw.githubusercontent.com/nachoparker/btrfs-snp/master/btrfs-snp -O /usr/local/bin/btrfs-snp
+  chmod +x /usr/local/bin/btrfs-snp
+}
+
+configure()
+{ 
+  [[ $ACTIVE != "yes" ]] && { 
+    rm -f /etc/cron.hourly/btrfs-snp
+    echo "automatic snapshots disabled"
+    return 0
+  }
+
+  local DATADIR MOUNTPOINT
+  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
+    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    return 1;
+  }
+
+  # file system check
+  MOUNTPOINT="$( stat -c "%m" "$DATADIR" )" || return 1
+  [[ "$( stat -fc%T "$MOUNTPOINT" )" != "btrfs" ]] && {
+    echo "$MOUNTPOINT is not in a BTRFS filesystem"
+    return 1
+  }
+
+  cat > /etc/cron.hourly/btrfs-snp <<EOF
+#!/bin/bash
+/usr/local/bin/btrfs-snp $MOUNTPOINT hourly  24 3600    ../ncp-snapshots
+/usr/local/bin/btrfs-snp $MOUNTPOINT daily    7 86400   ../ncp-snapshots
+/usr/local/bin/btrfs-snp $MOUNTPOINT weekly   4 604800  ../ncp-snapshots
+/usr/local/bin/btrfs-snp $MOUNTPOINT monthly 12 2592000 ../ncp-snapshots
+EOF
+  chmod +x /etc/cron.hourly/btrfs-snp
+  echo "automatic snapshots enabled"
+}
+
+
+# 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/bin/ncp/BACKUPS/nc-snapshot-sync.sh b/bin/ncp/BACKUPS/nc-snapshot-sync.sh
new file mode 100644
index 00000000..fb43ffd7
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-snapshot-sync.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Sync Nextcloud 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+
+install()
+{
+  apt-get update
+  apt-get install -y --no-install-recommends pv openssh-client
+  wget https://raw.githubusercontent.com/nachoparker/btrfs-sync/master/btrfs-sync -O /usr/local/bin/btrfs-sync
+  chmod +x /usr/local/bin/btrfs-sync
+  ssh-keygen -N "" -f /root/.ssh/id_rsa 
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    rm -f /etc/cron.d/ncp-snapsync-auto
+    service cron restart
+    echo "snapshot sync disabled"
+    return 0
+  }
+
+  # checks
+  [[ -d "$SNAPDIR" ]] || { echo "$SNAPDIR does not exist"; return 1; }
+
+  [[ "$DESTINATION" =~ : ]] && {
+    local NET="$( sed 's|:.*||' <<<"$DESTINATION" )"
+    local DST="$( sed 's|.*:||' <<<"$DESTINATION" )"
+    local SSH=( ssh -o "BatchMode=yes" "$NET" )
+    ${SSH[@]} : || { echo "SSH non-interactive not properly configured"; return 1; }
+  } || DST="$DESTINATION"
+  [[ "$( ${SSH[@]} stat -fc%T "$DST" )" != "btrfs" ]] && {
+    echo "$DESTINATION is not in a BTRFS filesystem"
+    return 1
+  }
+
+  [[ "$COMPRESSION" == "yes" ]] && ZIP="-z"
+
+  echo "30  4  */${SYNCDAYS}  *  *  root  /usr/local/bin/btrfs-sync -qd $ZIP \"$SNAPDIR\" \"$DESTINATION\"" > /etc/cron.d/ncp-snapsync-auto
+  service cron restart
+  echo "snapshot sync enabled"
+}
+
+# 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/bin/ncp/BACKUPS/nc-snapshot.sh b/bin/ncp/BACKUPS/nc-snapshot.sh
new file mode 100644
index 00000000..df3bdfac
--- /dev/null
+++ b/bin/ncp/BACKUPS/nc-snapshot.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# Nextcloud 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+
+BASEDIR=/var/www
+
+install()
+{
+  wget https://raw.githubusercontent.com/nachoparker/btrfs-snp/master/btrfs-snp -O /usr/local/bin/btrfs-snp
+  chmod +x /usr/local/bin/btrfs-snp
+}
+
+configure()
+{
+  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --on
+
+  local DATADIR MOUNTPOINT
+  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
+    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    return 1;
+  }
+
+  # file system check
+  MOUNTPOINT="$( stat -c "%m" "$DATADIR" )" || return 1
+  [[ "$( stat -fc%T "$MOUNTPOINT" )" != "btrfs" ]] && {
+    echo "$MOUNTPOINT is not in a BTRFS filesystem"
+    return 1
+  }
+
+  btrfs-snp $MOUNTPOINT manual $LIMIT 0 ../ncp-snapshots
+
+  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
+}
+
+# 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/bin/ncp/CONFIG/nc-admin.sh b/bin/ncp/CONFIG/nc-admin.sh
new file mode 100644
index 00000000..2bdf9128
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-admin.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Change password for the Nextcloud admin user
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+
+configure()
+{
+  [[ "$PASSWORD" == "$CONFIRM" ]] || { echo "passwords do not match"; return 1; }
+
+  OC_PASS="$PASSWORD" \
+    sudo -E -u www-data php /var/www/nextcloud/occ \
+    user:resetpassword --password-from-env "$USER"
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-autoupdate-nc.sh b/bin/ncp/CONFIG/nc-autoupdate-nc.sh
new file mode 100644
index 00000000..2e90b533
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-autoupdate-nc.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Automatically apply Nextcloud updates
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+# just change this value and re-activate in update.sh to upgrade users
+VERSION=14.0.4
+
+configure() 
+{
+  [[ "$ACTIVE" != "yes" ]] && { 
+    rm -f /etc/cron.daily/ncp-autoupdate-nc
+    echo "automatic Nextcloud updates disabled"
+    return 0
+  }
+
+  cat > /etc/cron.daily/ncp-autoupdate-nc <<EOF
+#!/bin/bash
+
+echo -e "[ncp-update-nc]"                          >> /var/log/ncp.log
+/usr/local/bin/ncp-update-nc "$VERSION" 2>&1 | tee -a /var/log/ncp.log
+
+if [[ \${PIPESTATUS[0]} -eq 0 ]]; 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" "NextCloudPi" -l "Nextcloud was updated to \$VER"
+fi
+echo "" >> /var/log/ncp.log
+EOF
+  chmod a+x /etc/cron.daily/ncp-autoupdate-nc
+  echo "automatic Nextcloud updates enabled"
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-autoupdate-ncp.sh b/bin/ncp/CONFIG/nc-autoupdate-ncp.sh
new file mode 100644
index 00000000..d7b9a13f
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-autoupdate-ncp.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    rm -f /etc/cron.daily/ncp-autoupdate
+    echo "automatic NextCloudPi updates disabled"
+    return 0
+  }
+
+  cat > /etc/cron.daily/ncp-autoupdate <<EOF
+#!/bin/bash
+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" "NextCloudPi" \
+       -l "NextCloudPi was updated to \$( cat /usr/local/etc/ncp-version )"
+fi
+EOF
+  chmod a+x /etc/cron.daily/ncp-autoupdate
+  echo "automatic NextCloudPi updates enabled"
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-database.sh b/bin/ncp/CONFIG/nc-database.sh
new file mode 100644
index 00000000..26a53663
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-database.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/
+#
+
+
+is_active()
+{
+  local SRCDIR=$( grep datadir /etc/mysql/mariadb.conf.d/90-ncp.cnf | awk -F "= " '{ print $2 }' )
+  [[ "$SRCDIR" != "/var/lib/mysql" ]]
+}
+
+configure()
+{
+  local SRCDIR=$( grep datadir /etc/mysql/mariadb.conf.d/90-ncp.cnf | awk -F "= " '{ print $2 }' )
+  [ -d "$SRCDIR" ] || { echo -e "database directory $SRCDIR not found"; return 1; }
+
+  [ -d "$DBDIR" ] && {
+    [[ $( find "$DBDIR" -maxdepth 0 -empty | wc -l ) == 0 ]] && {
+      echo "$DBDIR is not empty"
+      return 1
+    }
+    rmdir "$DBDIR" 
+  }
+
+  local BASEDIR=$( dirname "$DBDIR" )
+  mkdir -p "$BASEDIR"
+
+  grep -q -e ext -e btrfs <( stat -fc%T "$BASEDIR" ) || { echo -e "Only ext/btrfs filesystems can hold the data directory"; return 1; }
+  
+  sudo -u mysql test -x "$BASEDIR" || { echo -e "ERROR: the user mysql does not have access permissions over $BASEDIR"; return 1; }
+
+  [[ $( stat -fc%d / ) == $( stat -fc%d "$BASEDIR" ) ]] && \
+    echo -e "INFO: moving database to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up"
+
+  cd /var/www/nextcloud
+  sudo -u www-data php occ maintenance:mode --on
+
+  echo "moving database to $DBDIR..."
+  service mysql stop
+  mv "$SRCDIR" "$DBDIR" && \
+    sed -i "s|^datadir.*|datadir = $DBDIR|" /etc/mysql/mariadb.conf.d/90-ncp.cnf
+  service mysql start 
+
+  sudo -u www-data php occ maintenance:mode --off
+}
+
+install(){ :; }
+
+# 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/bin/ncp/CONFIG/nc-datadir.sh b/bin/ncp/CONFIG/nc-datadir.sh
new file mode 100644
index 00000000..f64861b9
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-datadir.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/
+#
+
+
+PHPVER=7.2
+
+is_active()
+{
+  local SRCDIR
+  SRCDIR="$( grep datadirectory /var/www/nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 )" || return 1
+  [[ "$SRCDIR" != "/var/www/nextcloud/data" ]]
+}
+
+install() 
+{ 
+  apt-get update 
+  apt-get install -y --no-install-recommends btrfs-tools
+}
+
+configure()
+{
+  ## CHECKS
+  local SRCDIR
+  SRCDIR=$( cd /var/www/nextcloud; sudo -u www-data php occ config:system:get datadirectory ) || {
+    echo -e "Error reading data directory. Is NextCloud running and configured?"; 
+    return 1;
+  }
+  [ -d "$SRCDIR" ] || { echo -e "data directory $SRCDIR not found"; return 1; }
+
+  [[ "$SRCDIR" == "$DATADIR" ]] && { echo -e "INFO: data already there"; return 0; }
+
+  # checks
+  local BASEDIR=$( dirname "$DATADIR" )
+
+  [ -d "$BASEDIR" ] || { echo "$BASEDIR does not exist"; return 1; }
+
+  # If the user chooses the root of the mountpoint, force a folder
+  mountpoint -q "$DATADIR" && {
+    BASEDIR="$DATADIR"
+  }
+
+  grep -q -e ext -e btrfs <( stat -fc%T "$BASEDIR" ) || {
+    echo -e "Only ext/btrfs filesystems can hold the data directory"
+    return 1
+  }
+
+  sudo -u www-data test -x "$BASEDIR" || {
+    echo -e "ERROR: the user www-data does not have access permissions over $BASEDIR"
+    return 1
+  }
+
+  [[ $( stat -fc%d / ) == $( stat -fc%d "$BASEDIR" ) ]] && {
+    echo "Refusing to move to the SD card. Abort"
+    return 1
+  }
+
+  # backup possibly existing datadir
+  [ -d $DATADIR ] && {
+    local BKP="${DATADIR}-$( date "+%m-%d-%y" )" 
+    echo "INFO: $DATADIR is not empty. Creating backup $BKP"
+    mv "$DATADIR" "$BKP"
+  }
+
+
+  ## COPY
+  cd /var/www/nextcloud
+  sudo -u www-data php occ maintenance:mode --on
+
+  echo "moving data dir from $SRCDIR to $DATADIR..."
+
+  # use subvolumes, if BTRFS
+  [[ "$( stat -fc%T "$BASEDIR" )" == "btrfs" ]] && {
+    echo "BTRFS filesystem detected"
+    btrfs subvolume create "$DATADIR" || return 1
+  }
+
+  cp --reflink=auto -raT "$SRCDIR" "$DATADIR" || return 1
+  chown www-data:www-data "$DATADIR"
+ 
+  # tmp upload dir
+  mkdir -p "$DATADIR/tmp" 
+  chown www-data:www-data "$DATADIR/tmp"
+  sudo -u www-data php occ config:system:set tempdirectory --value "$DATADIR/tmp"
+  sed -i "s|^;\?upload_tmp_dir =.*$|uploadtmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/cli/php.ini
+  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/fpm/php.ini
+  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR/tmp|"     /etc/php/${PHPVER}/fpm/php.ini
+
+  # opcache dir
+  sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$DATADIR/.opcache|" /etc/php/${PHPVER}/mods-available/opcache.ini
+
+  # update fail2ban logpath
+  sed -i "s|logpath  =.*nextcloud.log|logpath  = $DATADIR/nextcloud.log|" /etc/fail2ban/jail.conf
+
+  # datadir
+  sudo -u www-data php occ config:system:set datadirectory --value="$DATADIR"
+  sudo -u www-data php occ config:system:set logfile --value="$DATADIR/nextcloud.log"
+  sudo -u www-data php occ maintenance:mode --off
+}
+
+# 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/bin/ncp/CONFIG/nc-httpsonly.sh b/bin/ncp/CONFIG/nc-httpsonly.sh
new file mode 100644
index 00000000..cb30b2bd
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-httpsonly.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/
+#
+
+
+configure()
+{
+  [[ $ACTIVE == "no" ]] && local OPT=Off || local OPT=On
+  sed -i "s|RewriteEngine .*|RewriteEngine $OPT|" /etc/apache2/sites-available/000-default.conf
+  echo "Forcing HTTPS $OPT"
+
+  # delayed in bg so it does not kill the connection, and we get AJAX response
+  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh
new file mode 100644
index 00000000..64c85c67
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-init.sh
@@ -0,0 +1,180 @@
+#!/bin/bash
+
+# Init NextCloud database and perform initial 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+DBADMIN=ncadmin
+PHPVER=7.2
+
+configure()
+{
+  echo "Setting up a clean Nextcloud instance... wait until message 'NC init done'"
+
+  # checks
+  local REDISPASS=$( grep "^requirepass" /etc/redis/redis.conf  | cut -d' ' -f2 )
+  [[ "$REDISPASS" == "" ]] && { echo "redis server without a password. Abort"; return 1; }
+
+  ## RE-CREATE DATABASE TABLE 
+
+  echo "Setting up database..."
+
+  # launch mariadb if not already running
+  if ! pgrep -c mysqld &>/dev/null; then
+    mysqld & 
+  fi
+
+  # wait for mariadb
+  pgrep -x mysqld &>/dev/null || { 
+    echo "mariaDB process not found. Waiting..."
+    while :; do
+      [[ -S /run/mysqld/mysqld.sock ]] && break
+      sleep 0.5
+    done
+  }
+
+  # workaround to emulate DROP USER IF EXISTS ..;)
+  local DBPASSWD=$( grep password /root/.my.cnf | sed 's|password=||' )
+  mysql <<EOF
+DROP DATABASE IF EXISTS nextcloud;
+CREATE DATABASE nextcloud
+    CHARACTER SET utf8mb4
+    COLLATE utf8mb4_unicode_ci;
+GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
+DROP USER '$DBADMIN'@'localhost';
+CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
+GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
+EXIT
+EOF
+
+  ## INITIALIZE NEXTCLOUD
+
+  # make sure redis is running first
+  if ! pgrep -c redis-server &>/dev/null; then
+    mkdir -p /var/run/redis
+    chown redis /var/run/redis
+    sudo -u redis redis-server /etc/redis/redis.conf &
+  fi
+
+  while :; do
+    [[ -S /run/redis/redis.sock ]] && break
+    sleep 0.5
+  done
+
+
+  echo "Setting up Nextcloud..."
+
+  cd /var/www/nextcloud/
+  rm -f config/config.php
+  sudo -u www-data php occ maintenance:install --database \
+    "mysql" --database-name "nextcloud"  --database-user "$DBADMIN" --database-pass \
+    "$DBPASSWD" --admin-user "$ADMINUSER" --admin-pass "$ADMINPASS"
+
+  # cron jobs
+  sudo -u www-data php occ background:cron
+
+  # redis cache
+  sed -i '$d' config/config.php
+  cat >> config/config.php <<EOF
+  'memcache.local' => '\\OC\\Memcache\\Redis',
+  'memcache.locking' => '\\OC\\Memcache\\Redis',
+  'redis' =>
+  array (
+    'host' => '/var/run/redis/redis.sock',
+    'port' => 0,
+    'timeout' => 0.0,
+    'password' => '$REDISPASS',
+  ),
+);
+EOF
+
+  # tmp upload dir
+  local UPLOADTMPDIR=/var/www/nextcloud/data/tmp
+  mkdir -p "$UPLOADTMPDIR"
+  chown www-data:www-data "$UPLOADTMPDIR"
+  sudo -u www-data php occ config:system:set tempdirectory --value "$UPLOADTMPDIR"
+  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/${PHPVER}/cli/php.ini
+  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/${PHPVER}/fpm/php.ini
+  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $UPLOADTMPDIR|"     /etc/php/${PHPVER}/fpm/php.ini
+
+
+  # 4 Byte UTF8 support
+  sudo -u www-data php occ config:system:set mysql.utf8mb4 --type boolean --value="true"
+
+  # 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"
+  # trusted_domains 6 used by docker
+  sudo -u www-data php occ config:system:set trusted_domains 7 --value="nextcloudpi"
+  sudo -u www-data php occ config:system:set trusted_domains 8 --value="nextcloudpi.lan"
+
+  # email
+  sudo -u www-data php occ config:system:set mail_smtpmode     --value="sendmail"
+  sudo -u www-data php occ config:system:set mail_smtpauthtype --value="LOGIN"
+  sudo -u www-data php occ config:system:set mail_from_address --value="admin"
+  sudo -u www-data php occ config:system:set mail_domain       --value="ownyourbits.com"
+
+  # NCP theme
+  [[ -e /usr/local/etc/logo ]] && {
+    local ID=$( grep instanceid config/config.php | awk -F "=> " '{ print $2 }' | sed "s|[,']||g" )
+    [[ "$ID" == "" ]] && { echo "failed to get ID"; return 1; }
+    mkdir -p data/appdata_${ID}/theming/images
+    cp /usr/local/etc/logo /usr/local/etc/background data/appdata_${ID}/theming/images
+    chown -R www-data:www-data data/appdata_${ID}
+  }
+
+  mysql nextcloud <<EOF
+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"           );
+replace into  oc_appconfig values ( 'theming', 'backgroundMime', "image/png"               );
+EOF
+
+  # enable some apps by default
+  sudo -u www-data php /var/www/nextcloud/occ app:install calendar
+  sudo -u www-data php /var/www/nextcloud/occ app:install contacts
+  sudo -u www-data php /var/www/nextcloud/occ app:install notes
+  sudo -u www-data php /var/www/nextcloud/occ app:install tasks
+  sudo -u www-data php /var/www/nextcloud/occ app:install news
+  sudo -u www-data php /var/www/nextcloud/occ app:install admin_notifications
+  sudo -u www-data php /var/www/nextcloud/occ app:install previewgenerator
+
+  sudo -u www-data php /var/www/nextcloud/occ app:enable calendar
+  sudo -u www-data php /var/www/nextcloud/occ app:enable contacts
+  sudo -u www-data php /var/www/nextcloud/occ app:enable notes
+  sudo -u www-data php /var/www/nextcloud/occ app:enable tasks
+  sudo -u www-data php /var/www/nextcloud/occ app:enable news
+  sudo -u www-data php /var/www/nextcloud/occ app:enable admin_notifications
+  sudo -u www-data php /var/www/nextcloud/occ app:enable previewgenerator
+
+  # other
+  sudo -u www-data php /var/www/nextcloud/occ config:system:set overwriteprotocol --value=https
+
+  echo "NC init done"
+}
+
+install(){ :; }
+
+# 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/bin/ncp/CONFIG/nc-limits.sh b/bin/ncp/CONFIG/nc-limits.sh
new file mode 100644
index 00000000..ec198707
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-limits.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/
+#
+
+PHPVER=7.2
+
+
+configure()
+{
+  # Set auto memory limit to 75% of the total memory
+  local TOTAL_MEM="$( free -b | sed -n 2p | awk '{ print $2 }' )"
+  AUTOMEM=$(( TOTAL_MEM * 75 / 100 ))
+
+  # MAX FILESIZE
+  local CONF=/var/www/nextcloud/.user.ini
+  local CURRENT_FILE_SIZE="$( grep "^upload_max_filesize" "$CONF" | sed 's|.*=||' )"
+  [[ "$MAXFILESIZE" == "0" ]] && MAXFILESIZE=10G
+
+  # MAX PHP MEMORY
+  local CONF=/var/www/nextcloud/.user.ini
+  local CURRENT_PHP_MEM="$( grep "^memory_limit" "$CONF" | sed 's|.*=||' )"
+  [[ "$MEMORYLIMIT" == "0" ]] && MEMORYLIMIT=$AUTOMEM && echo "Using ${AUTOMEM}B for PHP"
+  sed -i "s/^post_max_size=.*/post_max_size=$MAXFILESIZE/"             "$CONF" 
+  sed -i "s/^upload_max_filesize=.*/upload_max_filesize=$MAXFILESIZE/" "$CONF" 
+  sed -i "s/^memory_limit=.*/memory_limit=$MEMORYLIMIT/"               "$CONF" 
+
+  # MAX PHP THREADS
+  local CONF=/etc/php/${PHPVER}/fpm/pool.d/www.conf
+  local CURRENT_THREADS=$( grep "^pm.max_children" "$CONF" | awk '{ print $3 }' )
+  [[ "$PHPTHREADS" == "0" ]] && PHPTHREADS=$( nproc ) && echo "Using $PHPTHREADS PHP threads"
+  sed -i "s|^pm.max_children =.*|pm.max_children = $PHPTHREADS|"           "$CONF"
+  sed -i "s|^pm.max_spare_servers =.*|pm.max_spare_servers = $PHPTHREADS|" "$CONF"
+  sed -i "s|^pm.start_servers =.*|pm.start_servers = $PHPTHREADS|"         "$CONF"
+
+  # RESTART PHP
+  [[ "$PHPTHREADS"  != "$CURRENT_THREADS"   ]] || \
+  [[ "$MEMORYLIMIT" != "$CURRENT_PHP_MEM"   ]] || \
+  [[ "$MAXFILESIZE" != "$CURRENT_FILE_SIZE" ]] && \
+    bash -c "sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
+
+  # redis max memory
+  local CONF=/etc/redis/redis.conf
+  local CURRENT_REDIS_MEM=$( grep "^maxmemory" "$CONF" | awk '{ print $2 }' )
+  [[ "$REDISMEM" != "$CURRENT_REDIS_MEM" ]] && {
+    sed -i "s|^maxmemory .*|maxmemory $REDISMEM|" "$CONF"
+    service redis-server restart
+  }
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh
new file mode 100644
index 00000000..960e5a4b
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-nextcloud.sh
@@ -0,0 +1,248 @@
+#!/bin/bash
+
+# Nextcloud installation on Raspbian over LAMP base
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+DBADMIN=ncadmin
+REDIS_MEM=3gb
+PHPVER=7.2
+
+APTINSTALL="apt-get install -y --no-install-recommends"
+export DEBIAN_FRONTEND=noninteractive
+
+install()
+{
+  # During build, this step is run before ncp.sh. Avoid executing twice
+  [[ -f /usr/lib/systemd/system/nc-provisioning.service ]] && return 0
+
+  local RELEASE=stretch
+
+  # Optional packets for Nextcloud and Apps
+  apt-get update
+  $APTINSTALL lbzip2 iputils-ping
+  $APTINSTALL -t $RELEASE php-smbclient                                         # for external storage
+  $APTINSTALL -t $RELEASE imagemagick php${PHPVER}-imagick php${PHPVER}-exif    # for gallery
+
+
+  # POSTFIX
+  $APTINSTALL postfix || {
+    # [armbian] workaround for bug - https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1531299
+    echo "[NCP] Please, ignore the previous postfix installation error ..."
+    mv /usr/bin/newaliases /
+    ln -s /bin/true /usr/bin/newaliases
+    $APTINSTALL postfix
+    rm /usr/bin/newaliases
+    mv /newaliases /usr/bin/newaliases
+  }
+ 
+  $APTINSTALL redis-server
+  $APTINSTALL -t $RELEASE php${PHPVER}-redis
+
+  local REDIS_CONF=/etc/redis/redis.conf
+  local REDISPASS="default"
+  sed -i "s|# unixsocket .*|unixsocket /var/run/redis/redis.sock|" $REDIS_CONF
+  sed -i "s|# unixsocketperm .*|unixsocketperm 770|"               $REDIS_CONF
+  sed -i "s|# requirepass .*|requirepass $REDISPASS|"              $REDIS_CONF
+  sed -i 's|# maxmemory-policy .*|maxmemory-policy allkeys-lru|'   $REDIS_CONF
+  sed -i 's|# rename-command CONFIG ""|rename-command CONFIG ""|'  $REDIS_CONF
+  sed -i "s|^port.*|port 0|"                                       $REDIS_CONF
+  echo "maxmemory $REDIS_MEM" >> $REDIS_CONF
+  echo 'vm.overcommit_memory = 1' >> /etc/sysctl.conf
+
+  usermod -a -G redis www-data
+
+  service redis-server restart
+  update-rc.d redis-server enable
+  service php${PHPVER}-fpm restart
+  
+  # service to randomize passwords on first boot
+  mkdir -p /usr/lib/systemd/system
+  cat > /usr/lib/systemd/system/nc-provisioning.service <<'EOF'
+[Unit]
+Description=Randomize passwords on first boot
+Requires=network.target
+After=mysql.service redis.service
+
+[Service]
+ExecStart=/bin/bash /usr/local/bin/ncp-provisioning.sh
+
+[Install]
+WantedBy=multi-user.target
+EOF
+  [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nc-provisioning
+  return 0
+}
+
+configure()
+{
+  ## IF BETA SELECTED ADD "pre" to DOWNLOAD PATH
+  [[ "$BETA" == yes ]] && local PREFIX="pre"
+    
+  ## DOWNLOAD AND (OVER)WRITE NEXTCLOUD
+  cd /var/www/
+
+  local URL="https://download.nextcloud.com/server/${PREFIX}releases/nextcloud-$VER.tar.bz2"
+  echo "Downloading Nextcloud $VER..."
+  wget -q "$URL" -O nextcloud.tar.bz2 || {
+    echo "couldn't download $URL"
+    return 1
+  }
+  rm -rf nextcloud
+
+  echo "Installing  Nextcloud $VER..."
+  tar -xf nextcloud.tar.bz2
+  rm nextcloud.tar.bz2
+
+  ## CONFIGURE FILE PERMISSIONS
+  local ocpath='/var/www/nextcloud'
+  local htuser='www-data'
+  local htgroup='www-data'
+  local rootuser='root'
+
+  printf "Creating possible missing Directories\n"
+  mkdir -p $ocpath/data
+  mkdir -p $ocpath/updater
+
+  printf "chmod Files and Directories\n"
+  find ${ocpath}/ -type f -print0 | xargs -0 chmod 0640
+  find ${ocpath}/ -type d -print0 | xargs -0 chmod 0750
+
+  printf "chown Directories\n"
+
+  chown -R ${htuser}:${htgroup} ${ocpath}/
+  chown -R ${htuser}:${htgroup} ${ocpath}/apps/
+  chown -R ${htuser}:${htgroup} ${ocpath}/config/
+  chown -R ${htuser}:${htgroup} ${ocpath}/data/
+  chown -R ${htuser}:${htgroup} ${ocpath}/themes/
+  chown -R ${htuser}:${htgroup} ${ocpath}/updater/
+
+  chmod +x ${ocpath}/occ
+
+  printf "chmod/chown .htaccess\n"
+  if [ -f ${ocpath}/.htaccess ]; then
+    chmod 0644 ${ocpath}/.htaccess
+    chown ${htuser}:${htgroup} ${ocpath}/.htaccess
+  fi
+  if [ -f ${ocpath}/data/.htaccess ]; then
+    chmod 0644 ${ocpath}/data/.htaccess
+    chown ${htuser}:${htgroup} ${ocpath}/data/.htaccess
+  fi
+
+  # create and configure opcache dir
+  local OPCACHEDIR=/var/www/nextcloud/data/.opcache
+  sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$OPCACHEDIR|" /etc/php/${PHPVER}/mods-available/opcache.ini
+  mkdir -p $OPCACHEDIR
+  chown -R www-data:www-data $OPCACHEDIR
+
+  ## RE-CREATE DATABASE TABLE 
+  # launch mariadb if not already running (for docker build)
+  if ! pgrep -c mysqld &>/dev/null; then
+    echo "Starting mariaDB"
+    mysqld & 
+  fi
+
+  # wait for mariadb
+  pgrep -x mysqld &>/dev/null || echo "mariaDB process not found"
+
+  while :; do
+    [[ -S /var/run/mysqld/mysqld.sock ]] && break
+    sleep 0.5
+  done
+
+  echo "Setting up database..."
+
+  # workaround to emulate DROP USER IF EXISTS ..;)
+  local DBPASSWD=$( grep password /root/.my.cnf | sed 's|password=||' )
+  mysql <<EOF
+DROP DATABASE IF EXISTS nextcloud;
+CREATE DATABASE nextcloud
+    CHARACTER SET utf8mb4
+    COLLATE utf8mb4_unicode_ci;
+GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
+DROP USER '$DBADMIN'@'localhost';
+CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
+GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
+EXIT
+EOF
+
+## SET APACHE VHOST
+  echo "Setting up Apache..."
+  cat > /etc/apache2/sites-available/nextcloud.conf <<'EOF'
+<IfModule mod_ssl.c>
+  <VirtualHost _default_:443>
+    DocumentRoot /var/www/nextcloud
+    CustomLog /var/log/apache2/nc-access.log combined
+    ErrorLog  /var/log/apache2/nc-error.log
+    SSLEngine on
+    SSLCertificateFile      /etc/ssl/certs/ssl-cert-snakeoil.pem
+    SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+  </VirtualHost>
+  <Directory /var/www/nextcloud/>
+    Options +FollowSymlinks
+    AllowOverride All
+    <IfModule mod_dav.c>
+      Dav off
+    </IfModule>
+    LimitRequestBody 0
+    SSLRenegBufferSize 10486000
+  </Directory>
+</IfModule>
+EOF
+  a2ensite nextcloud
+
+  cat > /etc/apache2/sites-available/000-default.conf <<'EOF'
+<VirtualHost _default_:80>
+  DocumentRoot /var/www/nextcloud
+  <IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{HTTPS} !=on
+    RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+  </IfModule>
+</VirtualHost>
+EOF
+
+  # some added security
+  sed -i 's|^ServerSignature .*|ServerSignature Off|' /etc/apache2/conf-enabled/security.conf
+  sed -i 's|^ServerTokens .*|ServerTokens Prod|'      /etc/apache2/conf-enabled/security.conf
+
+  echo "Setting up system..."
+
+  ## SET LIMITS
+  sed -i "s/post_max_size=.*/post_max_size=$MAXFILESIZE/"             /var/www/nextcloud/.user.ini 
+  sed -i "s/upload_max_filesize=.*/upload_max_filesize=$MAXFILESIZE/" /var/www/nextcloud/.user.ini 
+  sed -i "s/memory_limit=.*/memory_limit=$MEMORYLIMIT/"               /var/www/nextcloud/.user.ini 
+
+  # slow transfers will be killed after this time
+  cat >> /var/www/nextcloud/.user.ini <<< "max_execution_time=$MAXTRANSFERTIME"
+  cat >> /var/www/nextcloud/.user.ini <<< "max_input_time=$MAXTRANSFERTIME"
+
+  ## SET CRON
+  echo "*/15  *  *  *  * php -f /var/www/nextcloud/cron.php" > /tmp/crontab_http
+  crontab -u www-data /tmp/crontab_http
+  rm /tmp/crontab_http
+  
+  echo "Don't forget to run nc-init"
+}
+
+# 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/bin/ncp/CONFIG/nc-notify-updates.sh b/bin/ncp/CONFIG/nc-notify-updates.sh
new file mode 100644
index 00000000..b61a8311
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-notify-updates.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+
+# check every hour
+CHECKINTERVAL=1
+NCDIR=/var/www/nextcloud
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && {
+    rm -f /etc/cron.d/ncp-notify-updates
+    service cron restart
+    echo "update web notifications disabled"
+    return 0
+  }
+
+  # code
+  cat > /usr/local/bin/ncp-notify-update <<EOF
+#!/bin/bash
+VERFILE=/usr/local/etc/ncp-version
+LATEST=/var/run/.ncp-latest-version
+NOTIFIED=/var/run/.ncp-version-notified
+
+test -e \$LATEST || 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" 
+  exit 0
+}
+
+echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Sending notification..."
+
+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 "NextCloudPi update" \
+     -l "Update from \$( cat \$VERFILE ) to \$( cat \$LATEST ) is available. Update from https://\$IP:4443"
+
+cat \$LATEST > \$NOTIFIED
+EOF
+  chmod +x /usr/local/bin/ncp-notify-update
+
+  cat > /usr/local/bin/ncp-notify-unattended-upgrade <<EOF
+#!/bin/bash
+
+LOGFILE=/var/log/unattended-upgrades/unattended-upgrades.log
+STAMPFILE=/var/run/.ncp-notify-unattended-upgrades
+VERFILE=/usr/local/etc/ncp-version
+
+test -e "\$LOGFILE" || { echo "\$LOGFILE not found"; exit 1; }
+
+# find lines with package updates
+LINE=\$( grep "INFO Packages that will be upgraded:" "\$LOGFILE" )
+
+[[ "\$LINE" == "" ]] && { echo "no new upgrades"; exit 0; }
+
+# extract package names
+PKGS=\$( sed 's|^.*Packages that will be upgraded: ||' <<< "\$LINE" | tr '\\n' ' ' )
+
+# mark lines as read
+sed -i 's|INFO Packages that will be upgraded:|INFO Packages that will be upgraded :|' \$LOGFILE
+
+echo -e "Packages automatically upgraded: \$PKGS\\n"
+
+# notify
+sudo -u www-data php /var/www/nextcloud/occ notification:generate \
+  $USER "NextCloudPi Unattended Upgrades" \
+     -l "Packages automatically upgraded \$PKGS"
+EOF
+  chmod +x /usr/local/bin/ncp-notify-unattended-upgrade
+
+  # check every hour at 40th minute
+  echo "40  */${CHECKINTERVAL} *  *  *  root /usr/local/bin/ncp-notify-update && /usr/local/bin/ncp-notify-unattended-upgrade" > /etc/cron.d/ncp-notify-updates
+  [[ -f /run/crond.pid ]] && service cron restart
+
+  echo "update web notifications enabled"
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-passwd.sh b/bin/ncp/CONFIG/nc-passwd.sh
new file mode 100644
index 00000000..dd3c1ac6
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-passwd.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Change password for the ncp-web user
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+
+configure()
+{
+  # update password
+  echo -e "$PASSWORD\n$CONFIRM" | passwd ncp &>/dev/null && \
+    echo "password updated successfully" || \
+    { echo "passwords do not match"; return 1; }
+
+  # persist ncp-web password in docker container
+  [[ -f /.docker-image ]] && {
+    mv /etc/shadow /data/etc/shadow
+    ln -s /data/etc/shadow /etc/shadow
+  }
+
+  # Run cron.php once now to get all checks right in CI.
+  sudo -u www-data php /var/www/nextcloud/cron.php
+
+  # activate NCP
+  a2ensite  ncp nextcloud
+  a2dissite ncp-activation
+  bash -c "sleep 1.5 && service apache2 reload" &>/dev/null &
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-prettyURL.sh b/bin/ncp/CONFIG/nc-prettyURL.sh
new file mode 100644
index 00000000..14d65bfb
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-prettyURL.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Activate/deactivate a pretty URL without index.php
+#
+#
+# Copyleft 2018 by Timo Stiefel and xxx
+# GPL licensed (see end of file) * Use at your own risk!
+
+
+
+NCDIR=/var/www/nextcloud
+OCC="$NCDIR/occ"
+
+install() { :; }
+
+isactive()
+{
+  local REWRITEBASE
+  REWRITEBASE="$( grep RewriteBase /var/www/nextcloud/.htaccess )" || return 1
+  [[ $REWRITEBASE != 1 ]]
+}
+
+configure() 
+{  
+  # make sure overwrite.cli.url end with a '/'
+  local URL="$(ncc config:system:get overwrite.cli.url)"
+  [[ "${URL: -1}" != "/" ]] && ncc config:system:set overwrite.cli.url --value="${URL}/"
+
+  [[ $ACTIVE != "yes" ]] && {
+    sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value=""
+    sudo -u www-data php "$OCC" maintenance:update:htaccess
+    [[ $? -ne 0 ]] && {
+      echo "There has been an error."
+      return 1
+    }
+    echo "Your cloud does no longer have a pretty domain name."
+  } || {
+    sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value="/"
+    sudo -u www-data php "$OCC" maintenance:update:htaccess
+    [[ $? -ne 0 ]] && {
+      echo "There has been an error."
+      return 1
+    }
+    echo "Your cloud now has a pretty domain name."
+  }
+  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+  return 0
+}
+
+# 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/bin/ncp/CONFIG/nc-scan-auto.sh b/bin/ncp/CONFIG/nc-scan-auto.sh
new file mode 100644
index 00000000..9dc397a4
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-scan-auto.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Periodically synchronize NextCloud for externally modified files
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+
+configure() 
+{
+    [[ $ACTIVE != "yes" ]] && { 
+    rm -f /etc/cron.d/ncp-scan-auto
+    service cron restart
+    echo "automatic scans disabled"
+    return 0
+  }
+
+  # set crontab
+  local DAYS HOURS MINS
+  DAYS=$(( SCANINTERVAL / 1440 ))
+  if [[ "$DAYS" != "0" ]]; then 
+    DAYS="*/$DAYS" HOUR="1" MINS="15"
+  else
+    DAYS="*" 
+    HOUR=$(( SCANINTERVAL / 60   ))
+    MINS=$(( SCANINTERVAL % 60   ))
+    MINS="*/$MINS"
+    [[ $HOUR == 0 ]] && HOUR="*" || { HOUR="*/$HOUR" MINS="15"; }
+  fi
+
+  echo "${MINS}  ${HOUR}  ${DAYS}  *  *  root /usr/local/bin/ncp-scan" > /etc/cron.d/ncp-scan-auto
+  service cron restart
+
+  echo "automatic scans enabled"
+}
+
+install() { :; }
+
+# 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/bin/ncp/CONFIG/nc-webui.sh b/bin/ncp/CONFIG/nc-webui.sh
new file mode 100644
index 00000000..7b5ff637
--- /dev/null
+++ b/bin/ncp/CONFIG/nc-webui.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# Periodically synchronize NextCloud for externally modified files
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+is_active()
+{
+  a2query -s ncp &>/dev/null
+}
+
+configure() 
+{
+  if [[ $ACTIVE != "yes" ]]; then
+    a2dissite ncp
+    echo "ncp-web disabled"
+  else
+    a2ensite ncp
+    echo "ncp-web enabled"
+  fi
+
+  # delayed in bg so it does not kill the connection, and we get AJAX response
+  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+}
+
+install() { :; }
+
+# 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/bin/ncp/NETWORKING/DDNS_duckDNS.sh b/bin/ncp/NETWORKING/DDNS_duckDNS.sh
new file mode 100644
index 00000000..6425eaac
--- /dev/null
+++ b/bin/ncp/NETWORKING/DDNS_duckDNS.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# DuckDNS installation on Raspbian for NextCloudPi
+#
+#
+# Copyleft 2017 by Courtney Hicks
+# GPL licensed (see end of file) * Use at your own risk!
+#
+
+
+INSTALLDIR=duckdns
+INSTALLPATH=/usr/local/etc/$INSTALLDIR
+CRONFILE=/etc/cron.d/duckdns
+
+configure() 
+{
+  local DOMAIN="$( sed 's|.duckdns.org||' <<<"$DOMAIN" )"
+  if [[ $ACTIVE == "yes" ]]; then
+    mkdir -p "$INSTALLPATH"
+
+    # Creates duck.sh script that checks for updates to DNS records
+    touch "$INSTALLPATH"/duck.sh
+    touch "$INSTALLPATH"/duck.log
+    echo -e "echo url=\"https://www.duckdns.org/update?domains=$DOMAIN&token=$TOKEN&ip=\" | curl -k -o "$INSTALLPATH"/duck.log -K -" > "$INSTALLPATH"/duck.sh
+
+    # Adds file to cron to run script for DNS record updates and change permissions 
+    touch $CRONFILE
+    echo "*/5 * * * * root $INSTALLPATH/duck.sh >/dev/null 2>&1" > "$CRONFILE"
+    chmod 700 "$INSTALLPATH"/duck.sh
+    chmod +x "$CRONFILE"
+
+    # First-time execution of duck script
+    "$INSTALLPATH"/duck.sh > /dev/null 2>&1
+
+    SUCCESS="$( cat $INSTALLPATH/duck.log )"
+
+    # Checks for successful run of duck.sh
+    if [[ $SUCCESS == "OK" ]]; then
+      echo "DuckDNS is enabled"
+    elif [[ $SUCCESS == "KO" ]]; then
+      echo "DuckDNS install failed, is your information correct?"
+    fi
+
+    # Removes config files and cron job if ACTIVE_ is set to no
+  elif [[ $ACTIVE == "no" ]]; then
+    rm -f "$CRONFILE"
+    rm -f "$INSTALLPATH"/duck.sh
+    rm -f "$INSTALLPATH"/duck.log
+    rmdir "$INSTALLPATH"
+    echo "DuckDNS is now disabled"
+  fi
+}
+
+install() { :; }
+
+# 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/bin/ncp/NETWORKING/DDNS_freeDNS.sh b/bin/ncp/NETWORKING/DDNS_freeDNS.sh
new file mode 100644
index 00000000..8bd42afc
--- /dev/null
+++ b/bin/ncp/NETWORKING/DDNS_freeDNS.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# FreeDNS updater client installation on Raspbian 
+#
+# Copyleft 2017 by Panteleimon Sarantos <pantelis.fedora _a_t_ gmail _d_o_t_ com>
+# GPL licensed (see end of file) * Use at your own risk!
+#
+
+
+UPDATEURL=https://freedns.afraid.org/dynamic/update.php
+URL="${UPDATEURL}?${UPDATEHASH}"
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y dnsutils
+}
+
+configure() 
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    rm -f /etc/cron.d/freeDNS
+    service cron restart
+    echo "FreeDNS client is disabled"
+    return 0
+  }
+
+  cat > /usr/local/bin/freedns.sh <<EOF
+#!/bin/bash
+echo "FreeDNS client started"
+echo "${URL}"
+registeredIP=$(dig +short "$DOMAIN"|tail -n1)
+currentIP=\$(wget -q -O - http://checkip.dyndns.org|sed s/[^0-9.]//g)
+    [ "\$currentIP" != "\$registeredIP" ] && {
+        wget -q -O /dev/null ${URL}
+  }
+echo "Registered IP: \$registeredIP | Current IP: \$currentIP"
+EOF
+  chmod +744 /usr/local/bin/freedns.sh
+
+  echo "*/${UPDATEINTERVAL}  *  *  *  *  root  /bin/bash /usr/local/bin/freedns.sh" > /etc/cron.d/freeDNS
+  service cron restart
+
+  cd /var/www/nextcloud
+  sudo -u www-data php occ config:system:set trusted_domains 3 --value="$DOMAIN"
+  sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN"/
+
+  echo "FreeDNS client is enabled"
+}
+
+# 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/bin/ncp/NETWORKING/DDNS_no-ip.sh b/bin/ncp/NETWORKING/DDNS_no-ip.sh
new file mode 100644
index 00000000..2043d7eb
--- /dev/null
+++ b/bin/ncp/NETWORKING/DDNS_no-ip.sh
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# no-ip.org installation on 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!
+#
+# More at https://ownyourbits.com/2017/03/05/dynamic-dns-for-raspbian-with-no-ip-org-installer/
+#
+
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y make gcc libc-dev
+
+  local TMPDIR="$( mktemp -d /tmp/noip.XXXXXX )"
+  cd "$TMPDIR"
+  wget -O- --content-disposition https://github.com/nachoparker/noip-DDNS/archive/master/latest.tar.gz \
+  | tar -xz \
+  || return 1
+  cd -; cd "$OLDPWD"/noip-DDNS-master/
+  make
+  cp noip2 /usr/local/bin/
+
+  cat > /etc/init.d/noip2 <<'EOF'
+#! /bin/sh
+# /etc/init.d/noip2
+
+### BEGIN INIT INFO
+# Provides:          no-ip.org
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start no-ip.org dynamic DNS
+### END INIT INFO
+EOF
+
+  cat debian.noip2.sh >> /etc/init.d/noip2 
+
+  chmod +x /etc/init.d/noip2
+  cd -
+  rm -r "$TMPDIR"
+
+  update-rc.d noip2 defaults
+  update-rc.d noip2 disable
+
+  mkdir -p /usr/local/etc/noip2
+
+  [[ "$DOCKERBUILD" == 1 ]] && {
+    cat > /etc/services-available.d/100noip <<EOF
+#!/bin/bash
+
+source /usr/local/etc/library.sh
+
+[[ "\$1" == "stop" ]] && {
+  echo "stopping noip..."
+  service noip2 stop
+  exit 0
+}
+
+persistent_cfg /usr/local/etc/noip2 /data/etc/noip2
+
+echo "Starting noip..."
+service noip2 start
+
+exit 0
+EOF
+    chmod +x /etc/services-available.d/100noip
+  }
+}
+
+configure() 
+{
+  service noip2 stop
+  [[ $ACTIVE != "yes" ]] && { update-rc.d noip2 disable; return 0; }
+
+  local IF=$( ip -br l | awk '{ if ( $2 == "UP" ) print $1 }' | head -1 )
+  [[ "$IF" != "" ]] && IF="-I $IF"
+
+  /usr/local/bin/noip2 -C -c /usr/local/etc/no-ip2.conf $IF -U "$TIME" -u "$USER" -p "$PASS" 2>&1 | tee >(cat - >&2) \
+    | grep -q "New configuration file .* created" || return 1
+
+  update-rc.d noip2 enable
+  service noip2 restart
+  cd /var/www/nextcloud
+  sudo -u www-data php occ config:system:set trusted_domains 3 --value="$DOMAIN"
+  sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN"/
+  echo "noip DDNS enabled"
+
+}
+
+cleanup()
+{
+  # this uninstalls udiskie, commented out
+ #  udiskie with these dependencies fixed in Buster
+  # apt-get purge -y make gcc libc-dev
+  :
+}
+
+# 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/bin/ncp/NETWORKING/DDNS_spDYN.sh b/bin/ncp/NETWORKING/DDNS_spDYN.sh
new file mode 100644
index 00000000..961712fa
--- /dev/null
+++ b/bin/ncp/NETWORKING/DDNS_spDYN.sh
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# spDYN setup for NextCloudPi
+#
+#
+# Copyleft 2017/2018 by Timm Goldenstein and Timo Stiefel
+# https://github.com/TimmThaler/spdnsUpdater
+#
+# GPL licensed (see end of file) * Use at your own risk!
+#
+
+
+INSTALLDIR=spdnsupdater
+INSTALLPATH=/usr/local/etc/$INSTALLDIR
+CRONFILE=/etc/cron.d/spdnsupdater
+
+install()
+{
+  # Create the spdnsUpdater.sh
+  mkdir -p "$INSTALLPATH"
+  # Write the script to file
+  cat > "$INSTALLPATH"/spdnsUpdater.sh <<'EOF' 
+#!/bin/bash
+
+### Usage
+#
+#	Recommended usage:	./spdnsUpdater.sh <hostname> <token>
+#	Alternative usage:	./spdnsUpdater.sh <hostname> <user> <passwd> (not implemented)
+#
+
+### Configuration
+HOST=$1
+TOKEN=$2
+IPv6=$3
+
+# Get current IP address from
+if [[ $IPv6 == "yes" ]];	then
+	get_ip_url="http://checkip6.spdyn.de"
+else
+	get_ip_url="http://checkip4.spdyn.de"
+fi
+
+update_url="https://update.spdyn.de/nic/update"
+
+
+### Update procedure
+function spdnsUpdater { 
+	# Send the current IP address to spdyn.de
+	# and show the response
+	
+	params=$1
+	updater=$(wget -qO- --post-data $params $update_url)
+	updater=$(echo $updater | grep -o '^[a-z]*')
+	
+	case "$updater" in
+		abuse) echo "[$updater] Der Host kann nicht aktualisiert werden, da er aufgrund vorheriger fehlerhafter Updateversuche gesperrt ist."
+			;;
+		badauth) echo "[$updater] Ein ungültiger Benutzername und / oder ein ungültiges Kennwort wurde eingegeben."
+			;;
+		good) echo "[$updater] Die Hostname wurde erfolgreich auf die neue IP aktualisiert."
+			;;
+		yours) echo "[$updater] Der angegebene Host kann nicht unter diesem Benutzer-Account verwendet werden."
+			;;
+		notfqdn) echo "[$updater] Der angegebene Host ist kein FQDN."
+			;;
+		numhost) echo "[$updater] Es wurde versucht, mehr als 20 Hosts in einer Anfrage zu aktualisieren."
+			;;
+		nochg) echo "[$updater] Die IP hat sich zum letzten Update nicht geändert."
+			;;
+		nohost) echo "[$updater] Der angegebene Host existiert nicht oder wurde gelöscht."
+			;;
+		fatal) echo "[$updater] Der angegebene Host wurde manuell deaktiviert."
+			;;
+		*) echo "[$updater]"
+			;;
+	esac
+
+}
+
+	# Get registered IP address
+	registered_ip=$(dig +short "$HOST"|tail -n1)
+	# Get current IP address
+	current_ip=$(wget -qO- "$get_ip_url");
+	# Update only when IP address has changed.
+	[ "\$current_ip" == "\$registered_ip" ] && {
+    	return 0
+	}
+	params="hostname=$HOST&myip=$current_ip&user=$HOST&pass=$TOKEN"
+	spdnsUpdater "$params"
+EOF
+
+    chmod 700 "$INSTALLPATH"/spdnsUpdater.sh
+    chmod a+x "$INSTALLPATH"/spdnsUpdater.sh
+
+}
+
+configure() 
+{
+  if [[ $ACTIVE == "yes" ]]; then
+    
+    # Adds file to cron to run script for DNS record updates and change permissions
+    touch $CRONFILE
+    echo "10 * * * * root $INSTALLPATH/spdnsUpdater.sh $DOMAIN $TOKEN $IPv6 >/dev/null 2>&1" > "$CRONFILE"
+    chmod +x "$CRONFILE"
+
+    # First-time execution of update script and print response from spdns.de server
+    "$INSTALLPATH"/spdnsUpdater.sh "$DOMAIN" "$TOKEN" "$IPv6"
+		
+		echo -e "\nspdnsUpdater is now enabled"
+
+    # Removes config files and cron job if ACTIVE_ is set to no
+  elif [[ $ACTIVE == "no" ]]; then
+    echo "... removing cronfile: $CRONFILE"
+    rm -f "$CRONFILE"
+    echo -e "\nspdnsUpdater is now disabled"
+  fi
+  service cron restart
+}
+
+# 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/bin/ncp/NETWORKING/NFS.sh b/bin/ncp/NETWORKING/NFS.sh
new file mode 100644
index 00000000..24e133c2
--- /dev/null
+++ b/bin/ncp/NETWORKING/NFS.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# NFS server for 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y nfs-kernel-server 
+  systemctl disable nfs-kernel-server
+  systemctl mask nfs-blkmap
+
+  # delay init because of automount
+  sed -i 's|^ExecStartPre=.*|ExecStartPre=/bin/bash -c "/bin/sleep 30; /usr/sbin/exportfs -r"|' /lib/systemd/system/nfs-server.service
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    service nfs-kernel-server stop
+    systemctl disable nfs-kernel-server
+    echo -e "NFS disabled"
+    return
+  } 
+
+  # CHECKS
+  ################################
+  id    "$USER"  &>/dev/null || { echo "user $USER does not exist"  ; return 1; }
+  id -g "$GROUP" &>/dev/null || { echo "group $GROUP does not exist"; return 1; }
+  [ -d "$DIR" ] || { echo -e "INFO: directory $DIR does not exist. Creating"; mkdir -p "$DIR"; }
+  [[ $( stat -fc%d / ) == $( stat -fc%d $DIR ) ]] && \
+    echo -e "INFO: mounting a in the SD card\nIf you want to use an external mount, make sure it is properly set up"
+
+  # CONFIG
+  ################################
+  cat > /etc/exports <<EOF
+$DIR $SUBNET(rw,sync,all_squash,anonuid=$(id -u $USER),anongid=$(id -g $GROUP),no_subtree_check)
+EOF
+
+  systemctl enable rpcbind
+  systemctl enable nfs-kernel-server
+  service nfs-kernel-server restart
+  echo -e "NFS enabled"
+}
+
+# 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/bin/ncp/NETWORKING/SSH.sh b/bin/ncp/NETWORKING/SSH.sh
new file mode 100644
index 00000000..9d8d812f
--- /dev/null
+++ b/bin/ncp/NETWORKING/SSH.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Activate/deactivate SSH
+#
+#
+# Copyleft 2017 by Courtney Hicks and Ignacio Nunez Hernanz
+# GPL licensed (see end of file) * Use at your own risk!
+#
+
+
+install() { :; }
+
+is_active()
+{
+  systemctl -q is-enabled ssh &>/dev/null
+}
+
+configure() 
+{
+  [[ $ACTIVE != "yes" ]]  && {
+    systemctl stop    ssh
+    systemctl disable ssh
+    echo "SSH disabled"
+    return 0
+  }
+
+  # Check for bad ideas
+  [[ "$USER" == "pi" ]] && [[ "$PASS" == "raspberry" ]] && {
+    echo "Refusing to use the default Raspbian user and password. It's insecure"
+    return 1
+  }
+  [[ "$USER" == "root" ]] && [[ "$PASS" == "1234" ]] && {
+    echo "Refusing to use the default Armbian user and password. It's insecure"
+    return 1
+  }
+
+  # Change credentials
+  id "$USER" &>/dev/null || { echo "$USER doesn't exist"; return 1; }
+  echo -e "$PASS\n$CONFIRM" | passwd "$USER" || return 1
+
+  # Check for insecure default pi password ( taken from old jessie method )
+  local SHADOW="$( grep -E '^pi:' /etc/shadow )"
+  test -n "${SHADOW}" && {
+    local SALT=$(echo "${SHADOW}" | sed -n 's/pi:\$6\$//;s/\$.*//p')
+
+    [[ "${SALT}" != "" ]] && {
+      local HASH=$(mkpasswd -msha-512 raspberry "$SALT")
+      grep -q "${HASH}" <<< "${SHADOW}" && {
+        systemctl stop    ssh
+        systemctl disable ssh
+        echo "The user pi is using the default password. Refusing to activate SSH"
+        echo "SSH disabled"
+        return 1
+      }
+    }
+  }
+
+  # Check for insecure default root password ( taken from old jessie method )
+  local SHADOW="$( grep -E '^root:' /etc/shadow )"
+  test -n "${SHADOW}" && {
+    local SALT=$(echo "${SHADOW}" | sed -n 's/root:\$6\$//;s/\$.*//p')
+
+    [[ "${SALT}" != "" ]] && {
+      local HASH=$(mkpasswd -msha-512 1234 "$SALT")
+      grep -q "${HASH}" <<< "${SHADOW}" && {
+        systemctl stop    ssh
+        systemctl disable ssh
+        echo "The user root is using the default password. Refusing to activate SSH"
+        echo "SSH disabled"
+        return 1
+      }
+    }
+  }
+
+  # Enable
+  chage -d 0 "$USER"
+  systemctl enable ssh
+  systemctl start  ssh
+  echo "SSH enabled"
+}
+
+# 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/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh
new file mode 100644
index 00000000..3f75c6d8
--- /dev/null
+++ b/bin/ncp/NETWORKING/dnsmasq.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# dnsmasq DNS server with cache installation on 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!
+#
+# More at: https://ownyourbits.com/2017/03/09/dnsmasq-as-dns-cache-server-for-nextcloudpi-and-raspbian/
+#
+
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y dnsmasq
+  update-rc.d dnsmasq disable
+
+  [[ "$DOCKERBUILD" == 1 ]] && {
+    cat > /etc/services-available.d/100dnsmasq <<EOF
+#!/bin/bash
+
+source /usr/local/etc/library.sh
+
+[[ "\$1" == "stop" ]] && {
+  echo "stopping dnsmasq..."
+  service dnsmasq stop
+  exit 0
+}
+
+persistent_cfg /etc/dnsmasq.conf
+
+echo "Starting dnsmasq..."
+service dnsmasq start
+
+exit 0
+EOF
+    chmod +x /etc/services-available.d/100dnsmasq
+  }
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    service dnsmasq stop
+    update-rc.d dnsmasq disable
+    echo "dnmasq disabled"
+    return
+  }
+
+  local IFACE=$( ip r | grep "default via"   | awk '{ print $5 }' | head -1 )
+  local IP=$( ip a show dev "$IFACE" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )
+
+  [[ "$IP" == "" ]] && { echo "could not detect IP"; return 1; }
+  
+  cat > /etc/dnsmasq.conf <<EOF
+interface=$IFACE
+domain-needed         # Never forward plain names (without a dot or domain part)
+bogus-priv            # Never forward addresses in the non-routed address spaces.
+no-poll               # Don't poll for changes in /etc/resolv.conf
+no-resolv             # Don't use /etc/resolv.conf or any other file
+cache-size=$CACHESIZE 
+server=$DNSSERVER
+address=/$DOMAIN/$IP  # This is optional if we add it to /etc/hosts
+EOF
+
+  # required to run in container
+  test -d /data && echo "user=root" >> /etc/dnsmasq.conf
+
+  sed -i 's|#\?IGNORE_RESOLVCONF=.*|IGNORE_RESOLVCONF=yes|' /etc/default/dnsmasq
+
+  update-rc.d dnsmasq defaults
+  update-rc.d dnsmasq enable
+  service dnsmasq restart
+  cd /var/www/nextcloud
+  sudo -u www-data php occ config:system:set trusted_domains 2 --value=$DOMAIN
+  sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN"/
+  echo "dnsmasq enabled"
+}
+
+# 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/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh
new file mode 100644
index 00000000..5b138d20
--- /dev/null
+++ b/bin/ncp/NETWORKING/letsencrypt.sh
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Let's encrypt certbot installation on 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!
+#
+# More at https://ownyourbits.com/2017/03/17/lets-encrypt-installer-for-apache/
+
+
+NCDIR=/var/www/nextcloud
+OCC="$NCDIR/occ"
+VHOSTCFG=/etc/apache2/sites-available/nextcloud.conf
+VHOSTCFG2=/etc/apache2/sites-available/ncp.conf
+
+is_active()
+{
+  [[ $( find /etc/letsencrypt/live/ -maxdepth 0 -empty | wc -l ) == 0 ]]
+}
+
+install()
+{
+  cd /etc || return 1
+  apt-get update
+  apt-get install --no-install-recommends -y letsencrypt
+  mkdir -p /etc/letsencrypt/live
+
+  [[ "$DOCKERBUILD" == 1 ]] && {
+    # execute before lamp stack
+    cat > /etc/services-available.d/009letsencrypt <<EOF
+#!/bin/bash
+
+source /usr/local/etc/library.sh
+persistent_cfg /etc/letsencrypt
+
+exit 0
+EOF
+    chmod +x /etc/services-available.d/009letsencrypt
+  }
+}
+
+# tested with certbot 0.10.2
+configure() 
+{
+  local DOMAIN_LOWERCASE="${DOMAIN,,}"
+
+  # Configure Apache
+  grep -q ServerName $VHOSTCFG && \
+    sed -i "s|ServerName .*|ServerName $DOMAIN|" $VHOSTCFG || \
+    sed -i "/DocumentRoot/aServerName $DOMAIN" $VHOSTCFG 
+
+  # Do it
+  letsencrypt certonly -n --no-self-upgrade --webroot -w $NCDIR --hsts --agree-tos -m $EMAIL -d $DOMAIN && {
+
+    # Set up auto-renewal
+    cat > /etc/cron.weekly/letsencrypt-ncp <<EOF
+#!/bin/bash
+
+# renew and notify
+/usr/bin/certbot renew --quiet --renew-hook '
+  sudo -u www-data php $OCC notification:generate \
+                            $NOTIFYUSER "SSL renewal" \
+                            -l "Your SSL certificate(s) \$RENEWED_DOMAINS has been renewed for another 90 days"
+  '
+
+# notify if fails
+[[ \$? -ne 0 ]] && sudo -u www-data php $OCC notification:generate \
+                                             $NOTIFYUSER "SSL renewal error" \
+                                             -l "SSL certificate renewal failed. See /var/log/letsencrypt/letsencrypt.log"
+
+# cleanup
+rm -rf $NCDIR/.well-known
+EOF
+    chmod +x /etc/cron.weekly/letsencrypt-ncp
+
+    # Configure Apache
+    sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/fullchain.pem|" $VHOSTCFG
+    sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/privkey.pem|" $VHOSTCFG
+
+    sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/fullchain.pem|" $VHOSTCFG2
+    sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/privkey.pem|" $VHOSTCFG2
+
+    # Configure Nextcloud
+    sudo -u www-data php $OCC config:system:set trusted_domains 4 --value=$DOMAIN
+    sudo -u www-data php $OCC config:system:set overwrite.cli.url --value=https://"$DOMAIN"/
+
+    # delayed in bg so it does not kill the connection, and we get AJAX response
+    bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+    rm -rf $NCDIR/.well-known
+    
+    # Update configuration
+    [[ "$DOCKERBUILD" == 1 ]] && update-rc.d letsencrypt enable
+
+    return 0
+  }
+  rm -rf $NCDIR/.well-known
+  return 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/bin/ncp/NETWORKING/nc-forward-ports.sh b/bin/ncp/NETWORKING/nc-forward-ports.sh
new file mode 100644
index 00000000..f404941c
--- /dev/null
+++ b/bin/ncp/NETWORKING/nc-forward-ports.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+install()
+{
+  apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends miniupnpc
+}
+
+configure() 
+{
+  local IFACE=$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )
+  local IP=$( ip a show dev "$IFACE" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )
+  upnpc -d "$HTTPSPORT" TCP
+  upnpc -d "$HTTPPORT"  TCP
+  upnpc -a "$IP" 443 "$HTTPSPORT" TCP | tee >(cat - >&2) | grep -q "is redirected to internal" || \
+    { echo -e "\nCould not forward ports automatically.\nDo it manually, or activate UPnP in your router and try again"; return 1; }
+  upnpc -a "$IP" 80  "$HTTPPORT"  TCP | tee >(cat - >&2) | grep -q "is redirected to internal" || \
+    { echo -e "\nCould not forward ports automatically.\nDo it manually, or activate UPnP in your router and try again"; return 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/bin/ncp/NETWORKING/nc-static-IP.sh b/bin/ncp/NETWORKING/nc-static-IP.sh
new file mode 100644
index 00000000..0a25d7f4
--- /dev/null
+++ b/bin/ncp/NETWORKING/nc-static-IP.sh
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Enable static IP or DHCP for 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+
+configure() 
+{
+  local GW="$( ip r | grep "default via"   | awk '{ print $3 }' )"
+  local DNS="$( grep nameserver /etc/resolv.conf | head -1 | awk '{ print $2 }' )"
+  [[ "$DNS" == "" ]] && DNS="$GW"
+  local IFACE="$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )"
+  [[ "$IFACE" == "" ]] && { echo "Couldn't find default interface"; exit 1; }
+
+  ## DHCPCD
+  [[ -f /etc/dhcpcd.conf ]] && {
+    # delete NCP config
+    grep -q "^# NextCloudPi autogenerated" /etc/dhcpcd.conf && \
+      sed -i '/^# NextCloudPi autogenerated/,+6d' /etc/dhcpcd.conf
+
+    [[ $ACTIVE != "yes" ]] && {
+      systemctl restart dhcpcd
+      echo "DHCP enabled"
+      return
+    }
+
+    cat >> /etc/dhcpcd.conf <<EOF
+# NextCloudPi autogenerated
+# don't modify! better use ncp-config
+interface $IFACE
+static ip_address=$IP/24
+static routers=$GW
+static domain_name_servers=$DNS
+
+# Local loopback
+auto lo
+iface lo inet loopback
+EOF
+
+    systemctl restart dhcpcd
+  } || {
+    ## NETWORK MANAGER
+
+    cp -n /etc/network/interfaces /etc/network/interfaces-ncp-backup-orig
+
+    [[ $ACTIVE != "yes" ]] && {
+      cat > /etc/network/interfaces <<EOF
+# Wired adapter #1
+allow-hotplug $IFACE
+no-auto-down $IFACE
+auto $IFACE
+iface $IFACE inet dhcp
+
+# Local loopback
+auto lo
+iface lo inet loopback
+EOF
+      systemctl restart NetworkManager
+      echo "DHCP enabled"
+      return
+    }
+
+    cat > /etc/network/interfaces <<EOF
+# ncp-config generated
+source /etc/network/interfaces.d/*
+
+# Local loopback
+auto lo
+iface lo inet loopback
+
+# Interface $IFACE
+auto $IFACE
+allow-hotplug $IFACE
+iface $IFACE inet static
+    address $IP
+    netmask 255.255.255.0
+    gateway $GW
+    dns-nameservers $DNS 8.8.8.8
+EOF
+    systemctl restart networking
+  }
+ 
+  sudo -u www-data php /var/www/nextcloud/occ config:system:set trusted_domains 1 --value="$IP"
+  sudo -u www-data php /var/www/nextcloud/occ config:system:set overwrite.cli.url --value=https://"$IP"/
+  echo "Static IP set to $IP"
+}
+
+install() { :; }
+
+# 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/bin/ncp/NETWORKING/samba.sh b/bin/ncp/NETWORKING/samba.sh
new file mode 100644
index 00000000..0b781a54
--- /dev/null
+++ b/bin/ncp/NETWORKING/samba.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# SAMBA server for 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y samba
+  update-rc.d smbd disable
+  update-rc.d nmbd disable
+
+  # the directory needs to be recreated if we are using nc-ramlogs
+  grep -q mkdir /etc/init.d/smbd || sed -i "/\<start)/amkdir -p /var/log/samba" /etc/init.d/smbd
+
+  # disable SMB1 and SMB2
+  grep -q SMB3 /etc/samba/smb.conf || sed -i '/\[global\]/aprotocol = SMB3' /etc/samba/smb.conf
+
+  # disable the [homes] share by default
+  sed -i /\[homes\]/s/homes/homes_disabled_ncp/ /etc/samba/smb.conf
+
+  cat >> /etc/samba/smb.conf <<EOF
+
+# NextCloudPi automatically generated from here. Do not remove this comment
+EOF
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    service smbd stop
+    update-rc.d smbd disable
+    update-rc.d nmbd disable
+    echo "SMB disabled"
+    return
+  } 
+
+  # CHECKS
+  ################################
+  local DATADIR
+  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
+    echo -e "Error reading data directory. Is NextCloud running and configured?"; 
+    return 1;
+  }
+  [ -d "$DATADIR" ] || { echo -e "data directory $DATADIR not found"   ; return 1; }
+
+  # CONFIG
+  ################################
+  
+  # remove files from this line to the end
+  sed -i '/# NextCloudPi 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
+EOF
+
+  # create a share per Nextcloud user
+  local USERS=()
+  while read -r path; do 
+    USERS+=( "$( basename $( dirname "$path" ) )" )
+  done < <( ls -d "$DATADIR"/*/files )
+
+  for user in ${USERS[@]}; do
+    echo "adding SAMBA share for user $user"
+    local DIR="$DATADIR/$user/files"
+    [ -d "$DIR" ] || { echo -e "INFO: directory $DIR does not exist."; return 1; }
+
+    cat >> /etc/samba/smb.conf <<EOF
+
+[ncp-$user]
+    path = $DIR
+    writeable = yes
+;	browseable = yes
+    valid users = $user
+    force user = www-data
+    force group = www-data
+    create mask = 0770
+    directory mask = 0771
+    force create mode = 0660
+    force directory mode = 0770
+
+EOF
+
+    ## create user with no login if it doesn't exist
+    id "$user" &>/dev/null || adduser --disabled-password --force-badname --gecos "" "$user" || return 1
+    echo -e "$PWD\n$PWD" | smbpasswd -s -a $user
+
+    usermod -aG www-data $user
+    sudo chmod g+w $DIR
+  done
+
+  update-rc.d smbd defaults
+  update-rc.d smbd enable
+  service smbd restart
+
+  update-rc.d nmbd enable
+  service nmbd restart
+
+  echo "SMB enabled"
+}
+
+# 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/bin/ncp/SECURITY/UFW.sh b/bin/ncp/SECURITY/UFW.sh
new file mode 100644
index 00000000..791a4b1f
--- /dev/null
+++ b/bin/ncp/SECURITY/UFW.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Uncomplicated Firewall
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+
+
+install()
+{
+  apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ufw
+  systemctl disable ufw
+
+  # Disable logging to kernel
+  grep -q maxsize /etc/logrotate.d/ufw || sed -i /weekly/amaxsize2M /etc/logrotate.d/ufw
+}
+
+configure()
+{
+  [[ "$ACTIVE" != yes ]] && {
+    ufw --force reset
+    systemctl disable ufw
+    systemctl stop ufw
+    echo "UFW disabled"
+    return 0
+  }
+  ufw --force enable
+  systemctl enable ufw
+  systemctl start ufw
+
+  echo -e "\n# web server rules"
+  ufw allow $HTTP/tcp
+  ufw allow $HTTPS/tcp
+  ufw allow 4443/tcp
+
+  echo -e "\n# SSH rules"
+  ufw allow $SSH
+
+  echo -e "\n# DNS rules"
+  ufw allow dns
+
+  echo -e "\n# SAMBA rules"
+  ufw allow samba
+
+  echo -e "\n# NFS rules"
+  ufw allow nfs
+
+  echo -e "\n# UPnP rules"
+  ufw allow proto udp from 192.168.0.0/16
+
+  echo "UFW enabled"
+}
+
+# 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/bin/ncp/SECURITY/fail2ban.sh b/bin/ncp/SECURITY/fail2ban.sh
new file mode 100644
index 00000000..e58a2dac
--- /dev/null
+++ b/bin/ncp/SECURITY/fail2ban.sh
@@ -0,0 +1,174 @@
+#!/bin/bash
+
+# Fail2ban installation script for 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!
+#
+# More at: https://ownyourbits.com/2017/02/24/nextcloudpi-fail2ban-installer/
+#
+
+
+# time to ban an IP that exceeded attempts
+
+# cooldown time for incorrect passwords
+
+# bad attempts before banning an IP
+
+
+# Option to activate email notifications
+
+# email to send notifications to
+
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y fail2ban whois
+  update-rc.d fail2ban disable
+  rm -f /etc/fail2ban/jail.d/defaults-debian.conf
+
+  [[ "$DOCKERBUILD" == 1 ]] && {
+    cat > /etc/services-available.d/100fail2ban <<EOF
+#!/bin/bash
+
+source /usr/local/etc/library.sh
+
+[[ "\$1" == "stop" ]] && {
+  echo "stopping fail2ban..."
+  service fail2ban stop
+  exit 0
+}
+
+persistent_cfg /etc/fail2ban
+
+echo "Starting fail2ban..."
+service fail2ban start
+
+exit 0
+EOF
+    chmod +x /etc/services-available.d/100fail2ban
+  }
+
+  # 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
+  grep -q actionstart_ "$F" || sed -i 's|actionstart|actionstart_|' "$F"
+  grep -q actionstop_  "$F" || sed -i 's|actionstop|actionstop_|'   "$F"
+
+  # delay init because of automount
+  sed -i "/^ExecStart=/iExecStartPre=/bin/sleep 10" /lib/systemd/system/fail2ban.service
+
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    service fail2ban stop
+    update-rc.d fail2ban disable
+    echo "fail2ban disabled"
+    return 
+  }
+
+  local NCLOG="/var/www/nextcloud/data/nextcloud.log"
+  local NCLOG1="$( sudo -u www-data php /var/www/nextcloud/occ config:system:get logfile )"
+
+  [[ "$NCLOG1" != "" ]] && NCLOG="$NCLOG1"
+
+  local BASEDIR=$( dirname "$NCLOG" )
+  [ -d "$BASEDIR" ] || { echo -e "directory $BASEDIR not found"; return 1; }
+
+  sudo -u www-data touch "$NCLOG" || { echo -e "ERROR: user www-data does not have write permissions on $NCLOG"; return 1; }
+
+  cd /var/www/nextcloud
+  sudo -u www-data php occ config:system:set loglevel --value=2
+  sudo -u www-data php occ config:system:set log_type --value=file
+
+  cat > /etc/fail2ban/filter.d/nextcloud.conf <<'EOF'
+[INCLUDES]
+before = common.conf
+
+[Definition]
+failregex = Login failed.*Remote IP.*'<HOST>'
+ignoreregex =
+EOF
+
+  [[ "$MAILALERTS" == "yes" ]] && local ACTION=action_mwl || local ACTION=action_
+
+  cat > /etc/fail2ban/jail.conf <<EOF
+# The DEFAULT allows a global definition of the options. They can be overridden
+# in each jail afterwards.
+[DEFAULT]
+
+# "ignoreip" can be an IP address, a CIDR mask or a DNS host. Fail2ban will not
+# ban a host which matches an address in this list. Several addresses can be
+# defined using space separator.
+ignoreip = 127.0.0.1/8
+
+# "bantime" is the number of seconds that a host is banned.
+bantime  = $BANTIME
+
+# A host is banned if it has generated "maxretry" during the last "findtime"
+# seconds.
+findtime = $FINDTIME
+maxretry = $MAXRETRY
+
+#
+# ACTIONS
+#
+banaction  = iptables-multiport
+protocol   = tcp
+chain      = INPUT
+action_    = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+action_mwl = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+           sendmail-whois-lines[name=%(__name__)s, dest=$EMAIL, sender=ncp-fail2ban@ownyourbits.com]
+action = %($ACTION)s
+
+#
+# SSH
+#
+
+[ssh]
+
+enabled  = true
+port     = ssh
+filter   = sshd
+logpath  = /var/log/auth.log
+maxretry = $MAXRETRY
+
+#
+# HTTP servers
+#
+
+[nextcloud]
+
+enabled  = true
+port     = http,https
+filter   = nextcloud
+logpath  = $NCLOG
+maxretry = $MAXRETRY
+EOF
+  cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local
+  update-rc.d fail2ban defaults
+  update-rc.d fail2ban enable
+  service fail2ban restart
+  echo "fail2ban enabled"
+}
+
+# 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/bin/ncp/SECURITY/modsecurity.sh b/bin/ncp/SECURITY/modsecurity.sh
new file mode 100644
index 00000000..067404cd
--- /dev/null
+++ b/bin/ncp/SECURITY/modsecurity.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# modsecurity WAF installation on 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!
+#
+# More at ownyourbits.com
+#
+
+NCDIR=/var/www/nextcloud/
+NCPWB=/var/www/ncp-web/
+
+install()
+{
+  apt-get update
+  apt-get install -y --no-install-recommends libapache2-mod-security2 modsecurity-crs
+  a2dismod security2
+
+  cat >> /etc/modsecurity/crs/crs-setup.conf <<'EOF'
+
+  # NextCloudPi: allow PROPFIND for webDAV
+  SecAction "id:900200, phase:1, nolog, pass, t:none, setvar:'tx.allowed_methods=GET HEAD POST OPTIONS PROPFIND'"
+EOF
+
+  # CONFIGURE
+  cp /etc/modsecurity/modsecurity.conf-recommended /etc/modsecurity/modsecurity.conf
+  sed -i "s|SecRuleEngine .*|SecRuleEngine Off|"               /etc/modsecurity/modsecurity.conf
+  sed -i 's|SecTmpDir .*|SecTmpDir   /var/cache/modsecurity/|' /etc/modsecurity/modsecurity.conf
+  sed -i 's|SecDataDir .*|SecDataDir /var/cache/modsecurity/|' /etc/modsecurity/modsecurity.conf
+  sed -i 's|^SecRequestBodyLimit .*|#SecRequestBodyLimit 13107200|' /etc/modsecurity/modsecurity.conf
+
+  # turn modsecurity logs off, too spammy
+  sed -i 's|SecAuditEngine .*|SecAuditEngine Off|' /etc/modsecurity/modsecurity.conf
+
+  cat >> /etc/apache2/apache2.conf <<EOF
+<IfModule mod_security2.c>
+  SecServerSignature " "
+</IfModule>
+EOF
+}
+
+configure() 
+{ 
+  cat > /etc/modsecurity/modsecurity_crs_99_whitelist.conf <<EOF
+<Directory $NCDIR>
+  # VIDEOS
+  SecRuleRemoveById 958291             # Range Header Checks
+  SecRuleRemoveById 980120             # Correlated Attack Attempt
+
+  # PDF
+  SecRuleRemoveById 920230             # Check URL encodings
+
+  # ADMIN (webdav)
+  SecRuleRemoveById 960024             # Repeatative Non-Word Chars (heuristic)
+  SecRuleRemoveById 981173             # SQL Injection Character Anomaly Usage
+  SecRuleRemoveById 980130             # Correlated Attack Attempt
+  SecRuleRemoveById 981243             # PHPIDS - Converted SQLI Filters
+  SecRuleRemoveById 981245             # PHPIDS - Converted SQLI Filters
+  SecRuleRemoveById 981246             # PHPIDS - Converted SQLI Filters
+  SecRuleRemoveById 981318             # String Termination/Statement Ending Injection Testing
+  SecRuleRemoveById 973332             # XSS Filters from IE
+  SecRuleRemoveById 973338             # XSS Filters - Category 3
+  SecRuleRemoveById 981143             # CSRF Protections ( TODO edit LocationMatch filter )
+
+  # COMING BACK FROM OLD SESSION
+  SecRuleRemoveById 970903             # Microsoft Office document properties leakage
+
+  # NOTES APP
+  SecRuleRemoveById 981401             # Content-Type Response Header is Missing and X-Content-Type-Options is either missing or not set to 'nosniff'
+  SecRuleRemoveById 200002             # Failed to parse request body
+
+  # UPLOADS ( 5 MB max excluding file size )
+  SecRequestBodyNoFilesLimit 5242880
+
+  # GENERAL
+  SecRuleRemoveById 920350             # Host header is a numeric IP address
+
+  # REGISTERED WARNINGS, BUT DID NOT HAVE TO DISABLE THEM
+  #SecRuleRemoveById 981220 900046 981407
+  #SecRuleRemoveById 981222 981405 981185 949160
+
+</Directory>
+<Directory $NCPWB>
+  # GENERAL
+  SecRuleRemoveById 920350             # Host header is a numeric IP address
+</Directory>
+EOF
+
+  [[ $ACTIVE == "yes" ]] && local STATE=On || local STATE=Off
+  sed -i "s|SecRuleEngine .*|SecRuleEngine $STATE|" /etc/modsecurity/modsecurity.conf
+  [[ $ACTIVE == "yes" ]] && echo "Enabling module security2" || echo "Disabling module security2"
+  [[ $ACTIVE == "yes" ]] && a2enmod security2 &>/dev/null || a2dismod security2 &>/dev/null
+
+  # delayed in bg so it does not kill the connection, and we get AJAX response
+  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+}
+
+# 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/bin/ncp/SECURITY/nc-audit.sh b/bin/ncp/SECURITY/nc-audit.sh
new file mode 100644
index 00000000..0668ecdb
--- /dev/null
+++ b/bin/ncp/SECURITY/nc-audit.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+
+install()
+{
+  apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    lynis debsecan debian-goodies debsums
+  cp /etc/lynis/default.prf /etc/lynis/ncp.prf
+  cat >> /etc/lynis/ncp.prf <<EOF
+# Won't install apt-listbugs and all its ruby dependencies
+skip-test=CUST-0810
+
+# Won't install puppet or similar
+skip-test=TOOL-5002
+
+# Raspbian doesn't have security sources ( https://www.raspberrypi.org/forums/viewtopic.php?t=98006&p=680175 ) 
+skip-test=PKGS-7388
+
+# We have a preset partition scheme in the SD card
+skip-test=FILE-6310
+
+# We don't use firewire
+skip-test=STRG-1846
+
+# We use USB in NCP
+skip-test=STRG-1840
+
+# Won't recompile kernel to support auditd
+skip-test=ACCT-9628
+
+# Won't be protected against DDOS in self-hosting, will save the resources
+skip-test=HTTP-6640
+skip-test=HTTP-6641
+
+# False positive about mysql root password ( https://github.com/CISOfy/lynis/issues/288 )
+skip-test=DBS-1816
+
+# vmlinuz missing at least in Raspbian
+skip-test=KRNL-5788
+
+# won't recompile kernels for PAE NX
+skip-test=KRNL-5677
+
+# false positive with DNS settings. We use mDNS and dnsmasq (and they work)
+skip-test=NAME-4028
+
+# false positive due to fail2ban
+skip-test=FIRE-4513
+EOF
+}
+
+configure()
+{
+  echo "General security audit"
+  lynis audit system --profile /etc/lynis/ncp.prf --no-colors
+
+  echo "Known vulnerabilities in this system"
+  debsecan
+}
+
+# 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/bin/ncp/SYSTEM/nc-automount.sh b/bin/ncp/SYSTEM/nc-automount.sh
new file mode 100644
index 00000000..fd3bde8b
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-automount.sh
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/
+#
+
+
+install()
+{
+  apt-get update
+  apt-get install -y --no-install-recommends udiskie inotify-tools
+
+  cat > /etc/udev/rules.d/99-udisks2.rules <<'EOF'
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1"
+EOF
+
+  cat > /usr/lib/systemd/system/nc-automount.service <<'EOF'
+[Unit]
+Description=Automount USB drives
+Before=mysqld.service dphys-swapfile.service fail2ban.service smbd.service nfs-server.service
+
+[Service]
+Restart=always
+ExecStartPre=/bin/bash -c "rmdir /media/* || true"
+ExecStart=/usr/bin/udiskie -NTF
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+  cat > /usr/lib/systemd/system/nc-automount-links.service <<'EOF'
+[Unit]
+Description=Monitor /media for mountpoints and create USBdrive* symlinks
+Before=nc-automount.service
+
+[Service]
+Restart=always
+ExecStart=/usr/local/etc/nc-automount-links-mon
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+  cat > /usr/local/etc/nc-automount-links <<'EOF'
+#!/bin/bash
+
+ls -d /media/* &>/dev/null && {
+
+  # remove old links
+  for l in $( ls /media/ ); do
+    test -L /media/"$l" && rm /media/"$l"
+  done
+
+  # create links
+  i=0
+  for d in $( ls -d /media/* 2>/dev/null ); do
+    if [ $i -eq 0 ]; then
+      test -e /media/USBdrive   || test -d "$d" && ln -sT "$d" /media/USBdrive
+    else
+      test -e /media/USBdrive$i || test -d "$d" && ln -sT "$d" /media/USBdrive$i
+    fi
+    i=$(( i + 1 ))
+  done
+
+}
+EOF
+  chmod +x /usr/local/etc/nc-automount-links
+
+  cat > /usr/local/etc/nc-automount-links-mon <<'EOF'
+#!/bin/bash
+inotifywait --monitor --event create --event delete --format '%f %e' /media/ | \
+  grep --line-buffered ISDIR | while read f; do
+    echo $f
+    sleep 0.5
+    /usr/local/etc/nc-automount-links
+done
+EOF
+  chmod +x /usr/local/etc/nc-automount-links-mon
+
+  # delay init because of automount
+  sed -i "/^ExecStart=/iExecStartPre=/bin/sleep 20" /lib/systemd/system/mariadb.service
+  sed -i 's|^Restart=.*|Restart=on-failure|'        /lib/systemd/system/mariadb.service
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && {
+    systemctl stop    nc-automount
+    systemctl stop    nc-automount-links
+    systemctl disable nc-automount
+    systemctl disable nc-automount-links
+    echo "automount disabled"
+    return 0
+  }
+  systemctl enable  nc-automount
+  systemctl enable  nc-automount-links
+  systemctl start   nc-automount
+  systemctl start   nc-automount-links
+  echo "automount enabled"
+}
+
+# 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/bin/ncp/SYSTEM/nc-hdd-monitor.sh b/bin/ncp/SYSTEM/nc-hdd-monitor.sh
new file mode 100644
index 00000000..83b5f91d
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-hdd-monitor.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+# Monitor HDD health automatically
+#
+# 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!
+#
+# More at https://ownyourbits.com
+#
+
+
+
+is_active()
+{
+  systemctl -q is-enabled smartd &>/dev/null
+}
+
+configure()
+{
+  local DRIVES=($(lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $1 }'))
+
+  [[ ${#DRIVES[@]} == 0 ]] && {
+    echo "no drives detected. Disabling.."
+  }
+
+  [[ "$ACTIVE" != yes ]] && {
+    systemctl disable smartd
+    systemctl stop smartd
+    echo "HDD monitor disabled"
+    return 0
+  }
+
+  cat > /etc/smartd.conf <<EOF
+# short scan every day at 1am, long one on sundays at 2am
+DEVICESCAN -a -m $EMAIL -M exec /usr/local/etc/ncp-hdd-notif.sh -s (S/../.././01|L/../../7/02)
+EOF
+
+  cat > /usr/local/etc/ncp-hdd-notif.sh <<EOF
+#!/bin/bash
+EOF
+
+  [[ "$EMAIL" != "" ]] && {
+    cat >> /usr/local/etc/ncp-hdd-notif.sh <<EOF
+sendmail "$EMAIL" <<EOFMAIL
+Subject: Hard drive problems found
+
+"\$SMARTD_MESSAGE"
+EOFMAIL
+EOF
+  }
+
+  cat >> /usr/local/etc/ncp-hdd-notif.sh <<EOF
+wall "\$SMARTD_MESSAGE"
+sudo -u www-data php /var/www/nextcloud/occ notification:generate \
+  $NOTIFYUSER "NextCloudPi HDD health \$SMARTD_FAILTYPE" \
+     -l "\$SMARTD_MESSAGE"
+EOF
+chmod +x /usr/local/etc/ncp-hdd-notif.sh
+
+  for dr in "${DRIVES[@]}"; do smartctl --smart=on /dev/${dr} | sed 1,2d; done
+  systemctl enable smartd
+  systemctl start smartd
+  echo "HDD monitor enabled"
+}
+
+install() { :; }
+
+# 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/bin/ncp/SYSTEM/nc-hdd-test.sh b/bin/ncp/SYSTEM/nc-hdd-test.sh
new file mode 100644
index 00000000..857d5878
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-hdd-test.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Check HDD health
+#
+# 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!
+#
+# More at https://ownyourbits.com
+#
+
+
+
+install()
+{
+  apt-get update
+  apt-get install --no-install-recommends -y smartmontools
+  systemctl disable smartd
+  systemctl stop smartd
+}
+
+configure()
+{
+  local DRIVES=($(lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $1 }'))
+
+  [[ ${#DRIVES[@]} == 0 ]] && {
+    echo "no drives detected. Abort"
+    return 0
+  }
+
+  for dr in "${DRIVES[@]}"; do
+    smartctl --smart=on /dev/${dr} | sed 1,2d
+    if [[ "$SHORTTEST" == yes ]]; then
+      echo "* Starting test on $dr. Check results later"
+      smartctl -X "/dev/$dr" &>/dev/null
+      smartctl -t short "/dev/$dr" | sed 1,2d
+    elif [[ "$LONGTEST" == yes ]]; then
+      echo "* Starting test on $dr. Check results later"
+      smartctl -X "/dev/$dr" &>/dev/null
+      smartctl -t long "/dev/$dr" | sed 1,2d
+    else
+      echo "* Stats for $dr"
+      smartctl -a "/dev/$dr" | sed 1,2d
+    fi
+  done
+}
+
+# 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/bin/ncp/SYSTEM/nc-info.sh b/bin/ncp/SYSTEM/nc-info.sh
new file mode 100644
index 00000000..db01118b
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-info.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Print NCP sytem info
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+install()
+{ 
+  apt-get update
+  apt-get install -y --no-install-recommends bsdmainutils
+}
+
+configure() 
+{
+  echo "Gathering information..."
+  local OUT="$( bash /usr/local/bin/ncp-diag )"
+
+  # info
+  echo "$OUT" | column -t -s'|'
+
+  # suggestions
+  echo
+  bash /usr/local/bin/ncp-suggestions "$OUT"
+ 
+  return 0
+}
+
+# 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/bin/ncp/SYSTEM/nc-ramlogs.sh b/bin/ncp/SYSTEM/nc-ramlogs.sh
new file mode 100644
index 00000000..f34f3f74
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-ramlogs.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/
+#
+
+
+
+is_active()
+{
+  systemctl -q is-active log2ram &>/dev/null
+}
+
+find_unit_name()
+{
+  UNIT_NAME=""
+  entry=$(systemctl list-unit-files --no-pager | grep -e ramlog)
+  if [[ -z "$entry" ]]
+  then
+    UNIT_NAME=""
+  elif [[ $entry == *armbian-ramlog* ]]
+  then
+    UNIT_NAME=armbian-ramlog
+  else
+    UNIT_NAME=log2ram
+  fi
+}
+
+install()
+{
+  [[ -d /var/log.hdd ]] || [[ -d /var/hdd.log ]] && { echo "log2ram detected, not installing"; return; }
+  cd /tmp
+  curl -Lo log2ram.tar.gz https://github.com/azlux/log2ram/archive/master.tar.gz
+  tar xf log2ram.tar.gz
+  cd log2ram-master
+  sed -i '/systemctl -q is-active log2ram/d' install.sh
+  sed -i '/systemctl enable log2ram/d' install.sh
+  chmod +x install.sh && sudo ./install.sh
+  cd ..
+  rm -r log2ram-master log2ram.tar.gz
+  rm /etc/cron.hourly/log2ram /usr/local/bin/uninstall-log2ram.sh
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && {
+    systemctl disable log2ram
+    systemctl stop    log2ram
+    echo "Logs in SD. Reboot to take effect"
+    return
+  }
+  systemctl enable "$UNIT_NAME"
+  systemctl start  "$UNIT_NAME"
+
+  echo "Logs in RAM. Reboot to take effect"
+}
+
+# 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/bin/ncp/SYSTEM/nc-swapfile.sh b/bin/ncp/SYSTEM/nc-swapfile.sh
new file mode 100644
index 00000000..f74813f8
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-swapfile.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/
+#
+
+
+is_active()
+{
+  local DIR=$( swapon -s | sed -n 2p | awk '{ print $1 }' )
+  [[ "$DIR" != "" ]] && [[ "$DIR" != "/var/swap" ]]
+}
+
+configure()
+{
+  local ORIG="$( swapon | tail -1 | awk '{ print $1 }' )"
+  local DSTDIR="$( dirname "$SWAPFILE" )"
+  [[ "$ORIG" == "$SWAPFILE" ]] && { echo "nothing to do";                    return 0; }
+  [[ -d "$SWAPFILE"         ]] && { echo "$SWAPFILE is a directory. Abort"; return 1; }
+  [[ -d "$DSTDIR"            ]] || { echo "$DSTDIR Doesn't exist. Abort";     return 1; }
+
+  [[ "$( stat -fc%T "$DSTDIR" )" == "btrfs" ]] && {
+    echo "BTRFS doesn't support swapfiles. You can still use nc-zram"
+    return 1
+  }
+
+  [[ $( stat -fc%d / ) == $( stat -fc%d "$DSTDIR" ) ]] && \
+    echo -e "INFO: moving swapfile to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up"
+
+  sed -i "s|#\?CONF_SWAPFILE=.*|CONF_SWAPFILE=$SWAPFILE|" /etc/dphys-swapfile
+  sed -i "s|#\?CONF_SWAPSIZE=.*|CONF_SWAPSIZE=$SWAPSIZE|" /etc/dphys-swapfile
+  grep -q vm.swappiness /etc/sysctl.conf || echo "vm.swappiness = 10" >> /etc/sysctl.conf && sysctl --load &>/dev/null
+
+  dphys-swapfile setup && dphys-swapfile swapon && {
+    [[ -f "$ORIG" ]] && swapoff "$ORIG" && rm -f "$ORIG"
+    echo "swapfile moved successfully"
+    return 0
+  }
+
+  echo "moving swapfile failed"
+  return 1
+}
+
+install()
+{
+  apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dphys-swapfile
+  # delay init because of automount
+  sed -i "/\<start)/asleep 30" /etc/init.d/dphys-swapfile 
+}
+
+
+# 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/bin/ncp/SYSTEM/nc-wifi.sh b/bin/ncp/SYSTEM/nc-wifi.sh
new file mode 100644
index 00000000..9c88239a
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-wifi.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/
+#
+
+
+install()
+{
+  apt-get update
+  apt install -y --no-install-recommends wicd-curses
+  systemctl disable wicd 
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    systemctl stop     wicd
+    systemctl disable  wicd 
+    systemctl start   dhcpcd
+    systemctl enable  dhcpcd
+    ip link set down dev wlan0
+    systemctl start nextcloud-domain
+    return; 
+  } 
+
+  ip link set up dev wlan0
+  systemctl stop    dhcpcd
+  systemctl disable dhcpcd
+  systemctl enable  wicd 
+  systemctl start   wicd
+
+  wicd-curses
+  clear
+
+  systemctl start nextcloud-domain
+}
+
+# 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/bin/ncp/SYSTEM/nc-zram.sh b/bin/ncp/SYSTEM/nc-zram.sh
new file mode 100644
index 00000000..c8b47660
--- /dev/null
+++ b/bin/ncp/SYSTEM/nc-zram.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+
+install()
+{
+  cat > /etc/systemd/system/zram.service <<EOF
+[Unit]
+Description=Set up ZRAM
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/ncp-zram start
+ExecStop=/usr/local/bin/ncp-zram  stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
+EOF
+
+cat > /usr/local/bin/ncp-zram <<'EOF'
+#!/bin/bash
+# inspired by https://github.com/novaspirit/rpi_zram/blob/master/zram.sh
+
+case "$1" in
+  start)
+      CORES=$(nproc --all)
+      modprobe zram num_devices=$CORES || exit 1
+
+      swapoff -a
+
+      TOTALMEM=`free | grep -e "^Mem:" | awk '{print $2}'`
+      MEM=$(( ($TOTALMEM / $CORES)* 1024 ))
+
+      core=0
+      while [ $core -lt $CORES ]; do
+        echo $MEM > /sys/block/zram$core/disksize
+        mkswap /dev/zram$core
+        swapon -p 5 /dev/zram$core
+        let core=core+1
+      done
+      ;;
+
+  stop)
+      swapoff -a
+      rmmod zram
+      ;;
+  *)
+      echo "Usage: $0 {start|stop}" >&2
+      exit 1
+      ;;
+esac
+EOF
+chmod +x /usr/local/bin/ncp-zram
+}
+
+configure()
+{
+  [[ $ACTIVE != "yes" ]] && { 
+    systemctl stop    zram
+    systemctl disable zram
+    echo "ZRAM disabled"
+    return 0
+  }
+  systemctl start  zram
+  systemctl enable zram
+  echo "ZRAM enabled"
+}
+
+# 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/bin/ncp/SYSTEM/unattended-upgrades.sh b/bin/ncp/SYSTEM/unattended-upgrades.sh
new file mode 100644
index 00000000..7f7405e0
--- /dev/null
+++ b/bin/ncp/SYSTEM/unattended-upgrades.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Unattended upgrades installation on 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!
+#
+# More at: ownyourbits.com 
+#
+
+
+install()
+{
+  apt-get update
+  apt install -y --no-install-recommends unattended-upgrades 
+  rm /etc/apt/apt.conf.d/20auto-upgrades
+}
+
+configure() 
+{ 
+  [[ $ACTIVE     == "yes" ]] && local AUTOUPGRADE=1   || local AUTOUPGRADE=0
+  [[ $AUTOREBOOT == "yes" ]] && local AUTOREBOOT=true || local AUTOREBOOT=false
+
+  # Raspbian case
+  grep -q Raspbian /etc/issue && {
+
+    # 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/20ncp-upgrades <<EOF
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Unattended-Upgrade "$AUTOUPGRADE";
+APT::Periodic::MaxAge "14"; 
+APT::Periodic::AutocleanInterval "7";
+Unattended-Upgrade::Automatic-Reboot "$AUTOREBOOT";
+Unattended-Upgrade::Automatic-Reboot-Time "04:00";
+Unattended-Upgrade::Origins-Pattern {
+o=Raspbian,n=stretch,l=Raspbian;
+}
+Dpkg::Options {
+   "--force-confdef";
+   "--force-confold";
+};
+EOF
+
+  # Armbian case # TODO security only?
+  } || {
+    cat > /etc/apt/apt.conf.d/20ncp-upgrades <<EOF
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Unattended-Upgrade "$AUTOUPGRADE";
+APT::Periodic::MaxAge "14"; 
+APT::Periodic::AutocleanInterval "7";
+Unattended-Upgrade::Automatic-Reboot "$AUTOREBOOT";
+Unattended-Upgrade::Automatic-Reboot-Time "04:00";
+Unattended-Upgrade::Origins-Pattern {
+o=Debian,n=stretch,l=Debian;
+}
+Dpkg::Options {
+   "--force-confdef";
+   "--force-confold";
+};
+EOF
+  }
+  echo "Unattended upgrades active: $ACTIVE (autoreboot $AUTOREBOOT)"
+}
+
+# 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/bin/ncp/TOOLS/nc-fix-permissions.sh b/bin/ncp/TOOLS/nc-fix-permissions.sh
new file mode 100644
index 00000000..fc26bef2
--- /dev/null
+++ b/bin/ncp/TOOLS/nc-fix-permissions.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Fix permissions of the data files, in case they were copied externally
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+configure() 
+{
+  local DATADIR
+  DATADIR=$( cd /var/www/nextcloud; sudo -u www-data php occ config:system:get datadirectory ) || {
+    echo "data dir not found";
+    return 1;
+  }
+  echo -ne "fixing permissions in $DATADIR... "
+  chown -R www-data:www-data "$DATADIR"/*/files
+  chmod -R u+rw              "$DATADIR"/*/files
+  echo "done"
+}
+
+install() { :; }
+
+# 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/bin/ncp/TOOLS/nc-format-USB.sh b/bin/ncp/TOOLS/nc-format-USB.sh
new file mode 100644
index 00000000..587cc946
--- /dev/null
+++ b/bin/ncp/TOOLS/nc-format-USB.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# Format a USB external drive as a unique BTRFS partition
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+configure() 
+{
+  # count all disk devices except mmcblk0
+  local NUM=$( lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $6 }' | wc -l )
+
+  # only one plugged in
+  [[ $NUM != 1 ]] && { 
+    echo "ERROR: counted $NUM devices. Please, only plug in the USB drive you want to format";
+    return 1; 
+  }
+
+  # disable nc-automount if enabled
+  killall -STOP udiskie 2>/dev/null
+
+  # umount if mounted
+  umount /media/USBdrive* &> /dev/null
+
+  # check still not mounted
+  for dir in $( ls -d /media/* 2>/dev/null ); do
+    mountpoint -q $dir && { echo "$dir is still mounted"; return 1; }
+  done
+
+  # do it
+  local NAME=( $( lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $1 }' ) )
+  [[ ${#NAME[@]} != 1 ]] && { echo "unexpected error"; return 1; }
+
+  wipefs -a -f /dev/"$NAME"                              || return 1
+  parted /dev/"$NAME" --script -- mklabel gpt            || return 2
+  parted /dev/"$NAME" --script -- mkpart primary 0% 100% || return 3
+  sleep 0.5
+  mkfs.btrfs -q /dev/"${NAME}1" -f -L "$LABEL"
+  local RET=$?
+
+  # enable nc-automount if enabled
+  killall -CONT udiskie 2>/dev/null
+  [ $RET -eq 0 ] && echo "Drive $NAME formatted successfuly and labeled $LABEL"
+  return $RET
+}
+
+install() { :; }
+
+# 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/bin/ncp/TOOLS/nc-previews.sh b/bin/ncp/TOOLS/nc-previews.sh
new file mode 100644
index 00000000..97388eb0
--- /dev/null
+++ b/bin/ncp/TOOLS/nc-previews.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Generate previews for the gallery
+#
+# 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!
+#
+# More at nextcloudpi.com
+#
+
+
+configure()
+{
+  sudo -u www-data php /var/www/nextcloud/occ preview:generate-all
+}
+
+install() { :; }
+
+# 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/bin/ncp/TOOLS/nc-scan.sh b/bin/ncp/TOOLS/nc-scan.sh
new file mode 100644
index 00000000..b8b40507
--- /dev/null
+++ b/bin/ncp/TOOLS/nc-scan.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Synchronize NextCloud for externally modified files
+#
+# 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!
+#
+# More at: https://ownyourbits.com
+#
+
+
+install() 
+{ 
+  cat > /usr/local/bin/ncp-scan <<EOF
+#!/bin/bash
+cd /var/www/nextcloud
+sudo -u www-data php occ files:scan --all
+EOF
+  chmod +x /usr/local/bin/ncp-scan
+}
+
+configure() 
+{
+  /usr/local/bin/ncp-scan
+}
+
+# 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/bin/ncp/TOOLS/nc-update-nextcloud.sh b/bin/ncp/TOOLS/nc-update-nextcloud.sh
new file mode 100644
index 00000000..eb5cbbed
--- /dev/null
+++ b/bin/ncp/TOOLS/nc-update-nextcloud.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Update current instance to a new Nextcloud version
+#
+# 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!
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+LATEST=14.0.4
+
+configure()
+{
+  bash /usr/local/bin/ncp-update-nc "$VERSION"
+}
+
+install() { :; }
+
+# 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/bin/ncp/TOOLS/nc-update.sh b/bin/ncp/TOOLS/nc-update.sh
new file mode 100644
index 00000000..7394c833
--- /dev/null
+++ b/bin/ncp/TOOLS/nc-update.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# 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!
+#
+# More at https://ownyourbits.com/
+#
+
+
+configure()
+{
+  /usr/local/bin/ncp-update
+}
+
+install() { :; }
+
+# 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/build-SD-rpi.sh b/build-SD-rpi.sh
index 6dcb5bea..8d88f4f5 100755
--- a/build-SD-rpi.sh
+++ b/build-SD-rpi.sh
@@ -57,12 +57,12 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     # install everything
     cd /tmp/ncp-build || exit 1
     source etc/library.sh
-    install_script  lamp.sh
-    install_script  etc/ncp-config.d/nc-nextcloud.sh
-    activate_script etc/ncp-config.d/nc-nextcloud.sh
-    install_script  ncp.sh
-    activate_script etc/ncp-config.d/nc-init.sh
-    install_script  post-inst.sh
+    install_app  lamp.sh
+    install_app  etc/ncp-config.d/nc-nextcloud.sh
+    run_app      etc/ncp-config.d/nc-nextcloud.sh
+    install_app  ncp.sh
+    run_app      etc/ncp-config.d/nc-init.sh
+    run_app      post-inst.sh
 
     # harden SSH further for Raspbian
     sed -i 's|^#PermitRootLogin .*|PermitRootLogin no|' /etc/ssh/sshd_config
diff --git a/docker-armhf/lamp/Dockerfile b/docker-armhf/lamp/Dockerfile
index 93d7056b..bc3b68fe 100644
--- a/docker-armhf/lamp/Dockerfile
+++ b/docker-armhf/lamp/Dockerfile
@@ -13,7 +13,7 @@ RUN \
 # installation
 source /usr/local/etc/library.sh; \
 set +x; \
-install_script /usr/local/etc/lamp.sh; \
+install_app /usr/local/etc/lamp.sh; \
 
 # stop mysqld
 mysqladmin -u root shutdown; \
diff --git a/docker-armhf/nextcloud/Dockerfile b/docker-armhf/nextcloud/Dockerfile
index fc6cf447..b923ea2b 100644
--- a/docker-armhf/nextcloud/Dockerfile
+++ b/docker-armhf/nextcloud/Dockerfile
@@ -7,7 +7,8 @@ SHELL ["/bin/bash", "-c"]
 ENV DOCKERBUILD 1
 
 COPY etc/library.sh /usr/local/etc/
-COPY etc/ncp-config.d/nc-init.sh etc/ncp-config.d/nc-nextcloud.sh /
+COPY bin/ncp/CONFIG/nc-nextcloud.sh /
+COPY etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/
 
 RUN \
 
@@ -16,11 +17,11 @@ touch /.ncp-image; \
 
 # installation ( /var/www/nextcloud -> /data/app which will be in a volume )
 apt-get update; \
-apt-get install --no-install-recommends -y wget ca-certificates sudo; \
+apt-get install --no-install-recommends -y wget ca-certificates sudo jq; \
 source /usr/local/etc/library.sh; \
 set +x; \
-install_script  /nc-nextcloud.sh; \
-activate_script /nc-nextcloud.sh; \
+install_app /nc-nextcloud.sh; \
+run_app_unsafe /nc-nextcloud.sh; \
 mv /var/www/nextcloud /data-ro/app; \
 ln -s /data-ro/app /var/www/nextcloud; \
 
@@ -38,7 +39,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 
 # specific cleanup
 apt-get purge -y wget ca-certificates; \
-rm /nc-nextcloud.sh; \
+rm /nc-nextcloud.sh /usr/local/etc/ncp-config.d/nc-nextcloud.cfg; \
 rm /.ncp-image; 
 
 COPY docker-common/nextcloud/020nextcloud /etc/services-enabled.d/
diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile
index b5ce45ef..7d7dd96c 100644
--- a/docker-armhf/nextcloudpi/Dockerfile
+++ b/docker-armhf/nextcloudpi/Dockerfile
@@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"]
 ENV DOCKERBUILD 1
 
 RUN mkdir -p /tmp/ncp-build
-COPY bin/*            /tmp/ncp-build/bin/
+COPY bin/             /tmp/ncp-build/bin/
 COPY etc              /tmp/ncp-build/etc/
 COPY ncp.sh update.sh /tmp/ncp-build/
 COPY ncp-web          /tmp/ncp-build/ncp-web/
@@ -31,19 +31,18 @@ apt-get install --no-install-recommends -y wget ca-certificates; \
 source /usr/local/etc/library.sh; \
 set +x; \
 cd /tmp/ncp-build/; \
-install_script ncp.sh; \
+install_app ncp.sh; \
 
 # fix default paths
-sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.sh; \
+sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.cfg; \
 
 # specific cleanup
-rm -r /tmp/ncp-build; \
+cd /; rm -r /tmp/ncp-build; \
 rm /.ncp-image; \
 
 # cleanup all NCP extras
 source /usr/local/etc/library.sh; \
-cd /usr/local/etc/ncp-config.d/; \
-for script in *.sh; do cleanup_script $script; done; \
+find /usr/local/bin/ncp -name '*.sh' | while read l; do cleanup_script $l; done; \
 
 # should be cleaned up in no-ip.sh, but breaks udiskie.
 # safe to do it here since no automount in docker
@@ -60,6 +59,9 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /var/cache/debconf/*-old; 
 
 COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/
+COPY bin/ncp/CONFIG/nc-init.sh /
+COPY etc/ncp-config.d/nc-init.cfg /usr/local/etc/ncp-config.d/
+
 
 # 4443 - ncp-web
 EXPOSE 80 443 4443
diff --git a/docker-common/debian-ncp/run-parts.sh b/docker-common/debian-ncp/run-parts.sh
index c2a04b79..ad4ac6ff 100755
--- a/docker-common/debian-ncp/run-parts.sh
+++ b/docker-common/debian-ncp/run-parts.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 cleanup()
 {
   for file in $( ls -1rv /etc/services-enabled.d ); do
diff --git a/docker-common/nextcloud/020nextcloud b/docker-common/nextcloud/020nextcloud
index 3521b789..ae1429af 100755
--- a/docker-common/nextcloud/020nextcloud
+++ b/docker-common/nextcloud/020nextcloud
@@ -36,7 +36,7 @@ postfix start
 test -f /data/app/config/config.php || {
   echo "Uninitialized instance, running nc-init..."
   source /usr/local/etc/library.sh
-  activate_script /nc-init.sh
+  run_app_unsafe /nc-init.sh
   mv /index.php /var/www/nextcloud/    # restore this file after init
 }
 
diff --git a/docker/lamp/Dockerfile b/docker/lamp/Dockerfile
index 2736b11f..b92b1435 100644
--- a/docker/lamp/Dockerfile
+++ b/docker/lamp/Dockerfile
@@ -13,7 +13,7 @@ RUN \
 # installation
 source /usr/local/etc/library.sh; \
 set +x; \
-install_script /usr/local/etc/lamp.sh; \
+install_app /usr/local/etc/lamp.sh; \
 
 # stop mysqld
 mysqladmin -u root shutdown; \
diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile
index a9c71f76..49f1675d 100644
--- a/docker/nextcloud/Dockerfile
+++ b/docker/nextcloud/Dockerfile
@@ -7,7 +7,8 @@ SHELL ["/bin/bash", "-c"]
 ENV DOCKERBUILD 1
 
 COPY etc/library.sh /usr/local/etc/
-COPY etc/ncp-config.d/nc-init.sh etc/ncp-config.d/nc-nextcloud.sh /
+COPY bin/ncp/CONFIG/nc-nextcloud.sh /
+COPY etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/
 
 RUN \
 
@@ -16,11 +17,11 @@ touch /.ncp-image; \
 
 # installation ( /var/www/nextcloud -> /data/app which will be in a volume )
 apt-get update; \
-apt-get install --no-install-recommends -y wget ca-certificates sudo; \
+apt-get install --no-install-recommends -y wget ca-certificates sudo jq; \
 source /usr/local/etc/library.sh; \
 set +x; \
-install_script  /nc-nextcloud.sh; \
-activate_script /nc-nextcloud.sh; \
+install_app /nc-nextcloud.sh; \
+run_app_unsafe /nc-nextcloud.sh; \
 mv /var/www/nextcloud /data-ro/app; \
 ln -s /data-ro/app /var/www/nextcloud; \
 
@@ -38,7 +39,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 
 # specific cleanup
 apt-get purge -y wget ca-certificates; \
-rm /nc-nextcloud.sh; \
+rm /nc-nextcloud.sh /usr/local/etc/ncp-config.d/nc-nextcloud.cfg; \
 rm /.ncp-image; 
 
 COPY docker-common/nextcloud/020nextcloud /etc/services-enabled.d/
diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile
index 1458cd9d..0583ebc4 100644
--- a/docker/nextcloudpi/Dockerfile
+++ b/docker/nextcloudpi/Dockerfile
@@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"]
 ENV DOCKERBUILD 1
 
 RUN mkdir -p /tmp/ncp-build
-COPY bin/*            /tmp/ncp-build/bin/
+COPY bin/             /tmp/ncp-build/bin/
 COPY etc              /tmp/ncp-build/etc/
 COPY ncp.sh update.sh /tmp/ncp-build/
 COPY ncp-web          /tmp/ncp-build/ncp-web/
@@ -31,19 +31,18 @@ apt-get install --no-install-recommends -y wget ca-certificates; \
 source /usr/local/etc/library.sh; \
 set +x; \
 cd /tmp/ncp-build/; \
-install_script ncp.sh; \
+install_app ncp.sh; \
 
 # fix default paths
-sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.sh; \
+sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.cfg; \
 
 # specific cleanup
-rm -r /tmp/ncp-build; \
+cd /; rm -r /tmp/ncp-build; \
 rm /.ncp-image; \
 
 # cleanup all NCP extras
 source /usr/local/etc/library.sh; \
-cd /usr/local/etc/ncp-config.d/; \
-for script in *.sh; do cleanup_script $script; done; \
+find /usr/local/bin/ncp -name '*.sh' | while read l; do cleanup_script $l; done; \
 
 # should be cleaned up in no-ip.sh, but breaks udiskie.
 # safe to do it here since no automount in docker
@@ -60,6 +59,9 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /var/cache/debconf/*-old; 
 
 COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/
+COPY bin/ncp/CONFIG/nc-init.sh /
+COPY etc/ncp-config.d/nc-init.cfg /usr/local/etc/ncp-config.d/
+
 
 # 4443 - ncp-web
 EXPOSE 80 443 4443
diff --git a/etc/library.sh b/etc/library.sh
index abf30697..0282b9e7 100644
--- a/etc/library.sh
+++ b/etc/library.sh
@@ -8,172 +8,211 @@
 # More at ownyourbits.com
 #
 
+CFGDIR=/usr/local/etc/ncp-config.d
+BINDIR=/usr/local/bin/ncp
 
-# Initializes $INSTALLATION_CODE
-function config()
+function configure_app()
 {
-  local INSTALL_SCRIPT="$1"
-  local BACKTITLE="NextCloudPi installer configuration"
+  local ncp_app="$1"
+  local cfg_file="$CFGDIR/$ncp_app.cfg"
+  local backtitle="NextCloudPi installer configuration"
+  local ret=1
 
+  # checks
   type dialog &>/dev/null || { echo "please, install dialog for interactive configuration"; return 1; }
-
-  test -f "$INSTALL_SCRIPT" || { echo "file $INSTALL_SCRIPT not found"; return 1; }
-  local VARS=( $( grep "^[[:alpha:]]\+_=" "$INSTALL_SCRIPT" | sed 's|_=.*$||' ) )
-  local VALS=( $( grep "^[[:alpha:]]\+_=" "$INSTALL_SCRIPT" | sed 's|^.*_=||' ) )
-
-  [[ "$NO_CONFIG" == "1" ]] || test ${#VARS[@]} -eq 0 && { INSTALLATION_CODE="$( cat "$INSTALL_SCRIPT" )"; return; }
-
-  for i in $( seq 1 1 ${#VARS[@]} ); do
-    local PARAM+="${VARS[$((i-1))]} $i 1 ${VALS[$((i-1))]} $i 15 60 120 "
+  [[ -f "$cfg_file" ]]    || return 0;
+
+  local cfg="$( cat "$cfg_file" )"
+  local len="$(jq  '.params | length' <<<"$cfg")"
+  [[ $len -eq 0 ]] && return
+
+  # read cfg parameters
+  for (( i = 0 ; i < len ; i++ )); do
+    local var="$(jq -r ".params[$i].id"    <<<"$cfg")"
+    local val="$(jq -r ".params[$i].value" <<<"$cfg")"
+    local vars+=("$var")
+    local vals+=("$val")
+    local idx=$((i+1))
+    local parameters+="$var $idx 1 $val $idx 15 60 120 "
   done
 
+  # dialog
   local DIALOG_OK=0
   local DIALOG_CANCEL=1
   local DIALOG_ERROR=254
   local DIALOG_ESC=255
-  local RET=0
+  local res=0
 
-  while test $RET != 1 && test $RET != 250; do
+  while test $res != 1 && test $res != 250; do
     local value
     value="$( dialog --ok-label "Start" \
-                     --no-lines --backtitle "$BACKTITLE" \
-                     --form "Enter configuration for $( basename "$INSTALL_SCRIPT" .sh )" \
-                     20 70 0 $PARAM \
+                     --no-lines --backtitle "$backtitle" \
+                     --form "Enter configuration for $ncp_app" \
+                     20 70 0 $parameters \
                3>&1 1>&2 2>&3 )"
-    RET=$?
-    case $RET in
+    res=$?
+ 
+    case $res in
       $DIALOG_CANCEL)
-        return 1
+        break
         ;;
       $DIALOG_OK)
-        local RET_VALS=()
-        while read l; do RET_VALS+=("$l"); done < <( echo -e "$value" )
-
-        for i in $( seq 0 1 $(( ${#RET_VALS[@]} - 1 )) ); do
+        while read val; do local ret_vals+=("$val"); done <<<"$value"
 
+        for (( i = 0 ; i < len ; i++ )); do
           # check for invalid characters
-          grep -q "[&[:space:]]" <<< "${RET_VALS[$i]}" && { echo "Invalid characters in field ${VARS[$i]}"; return 1; }
+          grep -q "[;&[:space:]]" <<< "${ret_vals[$i]}" && { echo "Invalid characters in field ${vars[$i]}"; break; }
 
-          local SEDRULE+="s|^${VARS[$i]}_=.*|${VARS[$i]}_=${RET_VALS[$i]}|;"
+          cfg="$(jq ".params[$i].value = \"${ret_vals[$i]}\"" <<<"$cfg")"
         done
+        ret=0
         break
         ;;
       $DIALOG_ERROR)
         echo "ERROR!$value"
-        return 1
+        break
         ;;
       $DIALOG_ESC)
         echo "ESC pressed."
-        return 1
+        break
         ;;
       *)
-        echo "Return code was $RET"
-        return 1
+        echo "Return code was $res"
+        break
         ;;
     esac
   done
 
-  INSTALLATION_CODE="$( sed "$SEDRULE" "$INSTALL_SCRIPT" )"
+  echo "$cfg" > "$cfg_file"
+  printf '\033[2J' && tput cup 0 0             # clear screen, don't clear scroll, cursor on top
+  return $ret
 }
 
-function install_script()
+function run_app()
 {
-  (
-    local SCRIPT=$1
-    source ./"$SCRIPT"
-    echo -e "Installing $( basename "$SCRIPT" .sh )"
-    set +x
-    install
-  )
-}
+  local ncp_app=$1
+  local script="$(find "$BINDIR" -name $ncp_app.sh)"
 
-function activate_script()
-{
-  local SCRIPT=$1
-  echo -e "Activating $( basename "$SCRIPT" .sh )"
-  launch_script "$SCRIPT"
-}
+  [[ -f "$script" ]] || { echo "file $script not found"; return 1; }
 
-function is_active_script()
-{
-  (
-    local SCRIPT=$1
-    unset is_active
-    source "$SCRIPT"
-    [[ $( type -t is_active ) == function ]] && {
-      is_active
-      return $?
-    }
-    grep -q "^ACTIVE_=yes" "$SCRIPT" && return 0
-  )
+  run_app_unsafe "$script"
 }
 
-function run_and_log()
+# receives a script file, no security checks
+function run_app_unsafe()
 {
-  local SCRIPT=$1
-  touch /var/log/ncp.log
-  chmod 640 /var/log/ncp.log
-  chown root:www-data /var/log/ncp.log
-  echo -e "[ $( basename "$SCRIPT" .sh ) ]" >> /var/log/ncp.log
-  configure 2>&1 | tee -a /var/log/ncp.log
-  local RET="${PIPESTATUS[0]}"
-  echo "" >> /var/log/ncp.log
-  return "$RET"
+  local script=$1
+  local ncp_app="$(basename "$script" .sh)"
+  local cfg_file="$CFGDIR/$ncp_app.cfg"
+  local log=/var/log/ncp.log
+
+  [[ -f "$script" ]] || { echo "file $script not found"; return 1; }
+
+  touch               $log
+  chmod 640           $log
+  chown root:www-data $log
+
+  echo "Running $ncp_app"
+  echo "[ $ncp_app ]" >> $log
+
+  # read script
+  unset configure
+  source "$script"
+
+  # read cfg parameters
+  [[ -f "$cfg_file" ]] && {
+    local cfg="$( cat "$cfg_file" )"
+    local len="$(jq  '.params | length' <<<"$cfg")"
+    for (( i = 0 ; i < len ; i++ )); do
+      local var="$(jq -r ".params[$i].id"    <<<"$cfg")"
+      local val="$(jq -r ".params[$i].value" <<<"$cfg")"
+      eval "$var=$val"
+    done
+  }
+
+  # run
+  configure 2>&1 | tee -a $log
+  local ret="${PIPESTATUS[0]}"
+
+  echo "" >> $log
+
+  return "$ret"
 }
 
-function launch_script()
+function is_active_app()
 {
-  (
-    local SCRIPT=$1
-    source ./"$SCRIPT"
-    set +x
-    run_and_log "$SCRIPT"
-  )
+  local ncp_app=$1
+  local bin_dir=${2:-.}
+  local script="$bin_dir/$ncp_app.sh"
+  local cfg_file="$CFGDIR/$ncp_app.cfg"
+
+  [[ -f "$script" ]] || local script="$(find "$BINDIR" -name $ncp_app.sh)"
+  [[ -f "$script" ]] || { echo "file $script not found"; return 1; }
+
+  # function
+  unset is_active
+  source "$script"
+  [[ $( type -t is_active ) == function ]] && { is_active; return $?; }
+
+  # config
+  [[ -f "$cfg_file" ]] || return 1
+
+  local cfg="$( cat "$cfg_file" )"
+  [[ "$(jq -r ".params[0].id"    <<<"$cfg")" == "ACTIVE" ]] && \
+  [[ "$(jq -r ".params[0].value" <<<"$cfg")" == "yes"    ]] && \
+  return 0
 }
 
 # show an info box for a script if the INFO variable is set in the script
-function info_script()
+function info_app()
 {
-  (
-    local SCRIPT=$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
-  )
+  local ncp_app=$1
+  local cfg_file="$CFGDIR/$ncp_app.cfg"
+
+  local cfg="$( cat "$cfg_file" 2>/dev/null )"
+  local info=$( jq -r .info <<<"$cfg" )
+  local infotitle=$( jq -r .infotitle <<<"$cfg" )
+
+  [[ "$info"      == "" ]] || [[ "$info"      == "null" ]] && return 0
+  [[ "$infotitle" == "" ]] || [[ "$infotitle" == "null" ]] && infotitle="Info"
+
+  whiptail --yesno \
+	  --backtitle "NextCloudPi configuration" \
+	  --title "$infotitle" \
+	  --yes-button "I understand" \
+	  --no-button "Go back" \
+	  "$info" 20 90
 }
 
-function configure_script()
+function install_app()
 {
-  (
-    local SCRIPT=$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
-    printf '\033[2J' && tput cup 0 0             # clear screen, don't clear scroll, cursor on top
-    echo -e "Launching $( basename "$SCRIPT" .sh )"
-    set +x
-    run_and_log "$SCRIPT"
-    return 0
-  )
+  local ncp_app=$1
+
+  # $1 can be either an installed app name or an app script
+  if [[ -f "$ncp_app" ]]; then
+    local script="$ncp_app"
+    local ncp_app="$(basename "$script" .sh)"
+  else
+    local script="$(find "$BINDIR" -name $ncp_app.sh)"
+  fi
+
+  # do it
+  unset install
+  source "$script"
+  echo "Installing $ncp_app"
+  (install)
 }
 
 function cleanup_script()
 {
-  (
-    local SCRIPT=$1
-    cd /usr/local/etc/ncp-config.d/ || return 1
-    unset cleanup
-    source ./"$SCRIPT"
-    if [[ $( type -t cleanup ) == function ]]; then
-      cleanup
-      return $?
-    fi
-    return 0
-  )
+  local script=$1
+  unset cleanup
+  source "$script"
+  if [[ $( type -t cleanup ) == function ]]; then
+    cleanup
+    return $?
+  fi
+  return 0
 }
 
 function persistent_cfg()
diff --git a/etc/ncp-config.d/DDNS_duckDNS.cfg b/etc/ncp-config.d/DDNS_duckDNS.cfg
new file mode 100644
index 00000000..2341691a
--- /dev/null
+++ b/etc/ncp-config.d/DDNS_duckDNS.cfg
@@ -0,0 +1,26 @@
+{
+  "id": "DDNS_duckDNS",
+  "name": "DDNS_duckDNS",
+  "title": "DDNS_duckDNS",
+  "description": "Free Dynamic DNS provider (need account from https://duckdns.org)",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "DOMAIN",
+      "name": "DOMAIN",
+      "value": "mycloud.duckdns.org"
+    },
+    {
+      "id": "TOKEN",
+      "name": "TOKEN",
+      "value": "your-duckdns-token"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/DDNS_duckDNS.sh b/etc/ncp-config.d/DDNS_duckDNS.sh
deleted file mode 100644
index 4f6edd3e..00000000
--- a/etc/ncp-config.d/DDNS_duckDNS.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-# DuckDNS installation on Raspbian for NextCloudPi
-#
-#
-# Copyleft 2017 by Courtney Hicks
-# GPL licensed (see end of file) * Use at your own risk!
-#
-
-ACTIVE_=no
-DOMAIN_=mycloud.duckdns.org
-TOKEN_=your-duckdns-token
-
-INSTALLDIR=duckdns
-INSTALLPATH=/usr/local/etc/$INSTALLDIR
-CRONFILE=/etc/cron.d/duckdns
-DESCRIPTION="Free Dynamic DNS provider (need account from https://duckdns.org)"
-
-configure() 
-{
-  local DOMAIN="$( sed 's|.duckdns.org||' <<<"$DOMAIN_" )"
-  if [[ $ACTIVE_ == "yes" ]]; then
-    mkdir -p "$INSTALLPATH"
-
-    # Creates duck.sh script that checks for updates to DNS records
-    touch "$INSTALLPATH"/duck.sh
-    touch "$INSTALLPATH"/duck.log
-    echo -e "echo url=\"https://www.duckdns.org/update?domains=$DOMAIN&token=$TOKEN_&ip=\" | curl -k -o "$INSTALLPATH"/duck.log -K -" > "$INSTALLPATH"/duck.sh
-
-    # Adds file to cron to run script for DNS record updates and change permissions 
-    touch $CRONFILE
-    echo "*/5 * * * * root $INSTALLPATH/duck.sh >/dev/null 2>&1" > "$CRONFILE"
-    chmod 700 "$INSTALLPATH"/duck.sh
-    chmod +x "$CRONFILE"
-
-    # First-time execution of duck script
-    "$INSTALLPATH"/duck.sh > /dev/null 2>&1
-
-    SUCCESS="$( cat $INSTALLPATH/duck.log )"
-
-    # Checks for successful run of duck.sh
-    if [[ $SUCCESS == "OK" ]]; then
-      echo "DuckDNS is enabled"
-    elif [[ $SUCCESS == "KO" ]]; then
-      echo "DuckDNS install failed, is your information correct?"
-    fi
-
-    # Removes config files and cron job if ACTIVE_ is set to no
-  elif [[ $ACTIVE_ == "no" ]]; then
-    rm -f "$CRONFILE"
-    rm -f "$INSTALLPATH"/duck.sh
-    rm -f "$INSTALLPATH"/duck.log
-    rmdir "$INSTALLPATH"
-    echo "DuckDNS is now disabled"
-  fi
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/DDNS_freeDNS.cfg b/etc/ncp-config.d/DDNS_freeDNS.cfg
new file mode 100644
index 00000000..fc2f6fc0
--- /dev/null
+++ b/etc/ncp-config.d/DDNS_freeDNS.cfg
@@ -0,0 +1,31 @@
+{
+  "id": "DDNS_freeDNS",
+  "name": "DDNS_freeDNS",
+  "title": "DDNS_freeDNS",
+  "description": "DDNS FreeDNS client (need account)",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "UPDATEHASH",
+      "name": "UPDATEHASH",
+      "value": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJK1234567"
+    },
+    {
+      "id": "DOMAIN",
+      "name": "DOMAIN",
+      "value": "mynextcloud.example.com"
+    },
+    {
+      "id": "UPDATEINTERVAL",
+      "name": "UPDATEINTERVAL",
+      "value": "30"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/DDNS_freeDNS.sh b/etc/ncp-config.d/DDNS_freeDNS.sh
deleted file mode 100644
index 15ea4612..00000000
--- a/etc/ncp-config.d/DDNS_freeDNS.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# FreeDNS updater client installation on Raspbian 
-#
-# Copyleft 2017 by Panteleimon Sarantos <pantelis.fedora _a_t_ gmail _d_o_t_ com>
-# GPL licensed (see end of file) * Use at your own risk!
-#
-
-ACTIVE_=no
-UPDATEHASH_=abcdefghijklmnopqrstuvwxyzABCDEFGHIJK1234567
-DOMAIN_=mynextcloud.example.com
-UPDATEINTERVAL_=30
-DESCRIPTION="DDNS FreeDNS client (need account)"
-
-UPDATEURL=https://freedns.afraid.org/dynamic/update.php
-URL="${UPDATEURL}?${UPDATEHASH_}"
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y dnsutils
-}
-
-configure() 
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    rm -f /etc/cron.d/freeDNS
-    service cron restart
-    echo "FreeDNS client is disabled"
-    return 0
-  }
-
-  cat > /usr/local/bin/freedns.sh <<EOF
-#!/bin/bash
-echo "FreeDNS client started"
-echo "${URL}"
-registeredIP=$(dig +short "$DOMAIN_"|tail -n1)
-currentIP=\$(wget -q -O - http://checkip.dyndns.org|sed s/[^0-9.]//g)
-    [ "\$currentIP" != "\$registeredIP" ] && {
-        wget -q -O /dev/null ${URL}
-  }
-echo "Registered IP: \$registeredIP | Current IP: \$currentIP"
-EOF
-  chmod +744 /usr/local/bin/freedns.sh
-
-  echo "*/${UPDATEINTERVAL_}  *  *  *  *  root  /bin/bash /usr/local/bin/freedns.sh" > /etc/cron.d/freeDNS
-  service cron restart
-
-  cd /var/www/nextcloud
-  sudo -u www-data php occ config:system:set trusted_domains 3 --value="$DOMAIN_"
-  sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN_"/
-
-  echo "FreeDNS client is enabled"
-}
-
-# 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/etc/ncp-config.d/DDNS_no-ip.cfg b/etc/ncp-config.d/DDNS_no-ip.cfg
new file mode 100644
index 00000000..df7e04b4
--- /dev/null
+++ b/etc/ncp-config.d/DDNS_no-ip.cfg
@@ -0,0 +1,36 @@
+{
+  "id": "DDNS_no-ip",
+  "name": "DDNS_no-ip",
+  "title": "DDNS_no-ip",
+  "description": "DDNS no-ip free provider (need account)",
+  "info": "For this step to succeed, you need to register a noip account first.\nInternet access is required for this configuration to complete.",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "USER",
+      "name": "USER",
+      "value": "my-noip-user@email.com"
+    },
+    {
+      "id": "PASS",
+      "name": "PASS",
+      "value": "noip-pass"
+    },
+    {
+      "id": "DOMAIN",
+      "name": "DOMAIN",
+      "value": "mycloud.ownyourbits.com"
+    },
+    {
+      "id": "TIME",
+      "name": "TIME",
+      "value": "30"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/DDNS_no-ip.sh b/etc/ncp-config.d/DDNS_no-ip.sh
deleted file mode 100644
index 0e5b0478..00000000
--- a/etc/ncp-config.d/DDNS_no-ip.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-# no-ip.org installation on 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!
-#
-# More at https://ownyourbits.com/2017/03/05/dynamic-dns-for-raspbian-with-no-ip-org-installer/
-#
-
-ACTIVE_=no
-USER_=my-noip-user@email.com
-PASS_=noip-pass
-DOMAIN_=mycloud.ownyourbits.com
-TIME_=30
-DESCRIPTION="DDNS no-ip free provider (need account)"
-
-INFO="For this step to succeed, you need to register a noip account first.
-Internet access is required for this configuration to complete."
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y make gcc libc-dev
-
-  local TMPDIR="$( mktemp -d /tmp/noip.XXXXXX )"
-  cd "$TMPDIR"
-  wget -O- --content-disposition https://github.com/nachoparker/noip-DDNS/archive/master/latest.tar.gz \
-  | tar -xz \
-  || return 1
-  cd -; cd "$OLDPWD"/noip-DDNS-master/
-  make
-  cp noip2 /usr/local/bin/
-
-  cat > /etc/init.d/noip2 <<'EOF'
-#! /bin/sh
-# /etc/init.d/noip2
-
-### BEGIN INIT INFO
-# Provides:          no-ip.org
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start no-ip.org dynamic DNS
-### END INIT INFO
-EOF
-
-  cat debian.noip2.sh >> /etc/init.d/noip2 
-
-  chmod +x /etc/init.d/noip2
-  cd -
-  rm -r "$TMPDIR"
-
-  update-rc.d noip2 defaults
-  update-rc.d noip2 disable
-
-  mkdir -p /usr/local/etc/noip2
-
-  [[ "$DOCKERBUILD" == 1 ]] && {
-    cat > /etc/services-available.d/100noip <<EOF
-#!/bin/bash
-
-source /usr/local/etc/library.sh
-
-[[ "\$1" == "stop" ]] && {
-  echo "stopping noip..."
-  service noip2 stop
-  exit 0
-}
-
-persistent_cfg /usr/local/etc/noip2 /data/etc/noip2
-
-echo "Starting noip..."
-service noip2 start
-
-exit 0
-EOF
-    chmod +x /etc/services-available.d/100noip
-  }
-}
-
-configure() 
-{
-  service noip2 stop
-  [[ $ACTIVE_ != "yes" ]] && { update-rc.d noip2 disable; return 0; }
-
-  local IF=$( ip -br l | awk '{ if ( $2 == "UP" ) print $1 }' | head -1 )
-  [[ "$IF" != "" ]] && IF="-I $IF"
-
-  /usr/local/bin/noip2 -C -c /usr/local/etc/no-ip2.conf $IF -U "$TIME_" -u "$USER_" -p "$PASS_" 2>&1 | tee >(cat - >&2) \
-    | grep -q "New configuration file .* created" || return 1
-
-  update-rc.d noip2 enable
-  service noip2 restart
-  cd /var/www/nextcloud
-  sudo -u www-data php occ config:system:set trusted_domains 3 --value="$DOMAIN_"
-  sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN_"/
-  echo "noip DDNS enabled"
-
-}
-
-cleanup()
-{
-  # this uninstalls udiskie, commented out
- #  udiskie with these dependencies fixed in Buster
-  # apt-get purge -y make gcc libc-dev
-  :
-}
-
-# 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/etc/ncp-config.d/DDNS_spDYN.cfg b/etc/ncp-config.d/DDNS_spDYN.cfg
new file mode 100644
index 00000000..130b6494
--- /dev/null
+++ b/etc/ncp-config.d/DDNS_spDYN.cfg
@@ -0,0 +1,26 @@
+{
+  "id": "DDNS_spDYN",
+  "name": "DDNS_spDYN",
+  "title": "DDNS_spDYN",
+  "description": "Free Dynamic DNS provider (need account from spdyn.de)",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "DOMAIN",
+      "name": "DOMAIN",
+      "value": "mycloud.spdns.de"
+    },
+    {
+      "id": "TOKEN",
+      "name": "TOKEN",
+      "value": "your-spdns-token"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/DDNS_spDYN.sh b/etc/ncp-config.d/DDNS_spDYN.sh
deleted file mode 100644
index 380b136e..00000000
--- a/etc/ncp-config.d/DDNS_spDYN.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-# spDYN setup for NextCloudPi
-#
-#
-# Copyleft 2017/2018 by Timm Goldenstein and Timo Stiefel
-# https://github.com/TimmThaler/spdnsUpdater
-#
-# GPL licensed (see end of file) * Use at your own risk!
-#
-
-ACTIVE_=no
-DOMAIN_=mycloud.spdns.de
-TOKEN_=your-spdns-token
-IPv6_=no
-
-INSTALLDIR=spdnsupdater
-INSTALLPATH=/usr/local/etc/$INSTALLDIR
-CRONFILE=/etc/cron.d/spdnsupdater
-DESCRIPTION="Free Dynamic DNS provider (need account from spdyn.de)"
-
-install()
-{
-  # Create the spdnsUpdater.sh
-  mkdir -p "$INSTALLPATH"
-  # Write the script to file
-  cat > "$INSTALLPATH"/spdnsUpdater.sh <<'EOF' 
-#!/bin/bash
-
-### Usage
-#
-#	Recommended usage:	./spdnsUpdater.sh <hostname> <token>
-#	Alternative usage:	./spdnsUpdater.sh <hostname> <user> <passwd> (not implemented)
-#
-
-### Configuration
-HOST=$1
-TOKEN=$2
-IPv6=$3
-
-# Get current IP address from
-if [[ $IPv6 == "yes" ]];	then
-	get_ip_url="http://checkip6.spdyn.de"
-else
-	get_ip_url="http://checkip4.spdyn.de"
-fi
-
-update_url="https://update.spdyn.de/nic/update"
-
-
-### Update procedure
-function spdnsUpdater { 
-	# Send the current IP address to spdyn.de
-	# and show the response
-	
-	params=$1
-	updater=$(wget -qO- --post-data $params $update_url)
-	updater=$(echo $updater | grep -o '^[a-z]*')
-	
-	case "$updater" in
-		abuse) echo "[$updater] Der Host kann nicht aktualisiert werden, da er aufgrund vorheriger fehlerhafter Updateversuche gesperrt ist."
-			;;
-		badauth) echo "[$updater] Ein ungültiger Benutzername und / oder ein ungültiges Kennwort wurde eingegeben."
-			;;
-		good) echo "[$updater] Die Hostname wurde erfolgreich auf die neue IP aktualisiert."
-			;;
-		yours) echo "[$updater] Der angegebene Host kann nicht unter diesem Benutzer-Account verwendet werden."
-			;;
-		notfqdn) echo "[$updater] Der angegebene Host ist kein FQDN."
-			;;
-		numhost) echo "[$updater] Es wurde versucht, mehr als 20 Hosts in einer Anfrage zu aktualisieren."
-			;;
-		nochg) echo "[$updater] Die IP hat sich zum letzten Update nicht geändert."
-			;;
-		nohost) echo "[$updater] Der angegebene Host existiert nicht oder wurde gelöscht."
-			;;
-		fatal) echo "[$updater] Der angegebene Host wurde manuell deaktiviert."
-			;;
-		*) echo "[$updater]"
-			;;
-	esac
-
-}
-
-	# Get registered IP address
-	registered_ip=$(dig +short "$HOST"|tail -n1)
-	# Get current IP address
-	current_ip=$(wget -qO- "$get_ip_url");
-	# Update only when IP address has changed.
-	[ "\$current_ip" == "\$registered_ip" ] && {
-    	return 0
-	}
-	params="hostname=$HOST&myip=$current_ip&user=$HOST&pass=$TOKEN"
-	spdnsUpdater "$params"
-EOF
-
-    chmod 700 "$INSTALLPATH"/spdnsUpdater.sh
-    chmod a+x "$INSTALLPATH"/spdnsUpdater.sh
-
-}
-
-configure() 
-{
-  if [[ $ACTIVE_ == "yes" ]]; then
-    
-    # Adds file to cron to run script for DNS record updates and change permissions
-    touch $CRONFILE
-    echo "*/5 * * * * root $INSTALLPATH/spdnsUpdater.sh $DOMAIN_ $TOKEN_ $IPv6_ >/dev/null 2>&1" > "$CRONFILE"
-    chmod +x "$CRONFILE"
-
-    # First-time execution of update script and print response from spdns.de server
-    "$INSTALLPATH"/spdnsUpdater.sh "$DOMAIN_" "$TOKEN_" "$IPv6_"
-		
-		echo -e "\nspdnsUpdater is now enabled"
-
-    # Removes config files and cron job if ACTIVE_ is set to no
-  elif [[ $ACTIVE_ == "no" ]]; then
-    echo "... removing cronfile: $CRONFILE"
-    rm -f "$CRONFILE"
-    echo -e "\nspdnsUpdater is now disabled"
-  fi
-  service cron restart
-}
-
-# 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/etc/ncp-config.d/NFS.cfg b/etc/ncp-config.d/NFS.cfg
new file mode 100644
index 00000000..38298e74
--- /dev/null
+++ b/etc/ncp-config.d/NFS.cfg
@@ -0,0 +1,36 @@
+{
+  "id": "NFS",
+  "name": "NFS",
+  "title": "NFS",
+  "description": "NFS network file system server (for Linux LAN)",
+  "info": "If we intend to modify the data folder through NFS,\nthen we have to synchronize NextCloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'",
+  "infotitle": "Instructions for external synchronization",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "DIR",
+      "name": "DIR",
+      "value": "/media/USBdrive/ncdata/admin/files"
+    },
+    {
+      "id": "SUBNET",
+      "name": "SUBNET",
+      "value": "192.168.1.0/24"
+    },
+    {
+      "id": "USER",
+      "name": "USER",
+      "value": "www-data"
+    },
+    {
+      "id": "GROUP",
+      "name": "GROUP",
+      "value": "www-data"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/NFS.sh b/etc/ncp-config.d/NFS.sh
deleted file mode 100644
index db9d4336..00000000
--- a/etc/ncp-config.d/NFS.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-# NFS server for 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=no
-DIR_=/media/USBdrive/ncdata/admin/files
-SUBNET_=192.168.1.0/24
-USER_=www-data
-GROUP_=www-data
-DESCRIPTION="NFS network file system server (for Linux LAN)"
-
-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'"
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y nfs-kernel-server 
-  systemctl disable nfs-kernel-server
-  systemctl mask nfs-blkmap
-
-  # delay init because of automount
-  sed -i 's|^ExecStartPre=.*|ExecStartPre=/bin/bash -c "/bin/sleep 30; /usr/sbin/exportfs -r"|' /lib/systemd/system/nfs-server.service
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    service nfs-kernel-server stop
-    systemctl disable nfs-kernel-server
-    echo -e "NFS disabled"
-    return
-  } 
-
-  # CHECKS
-  ################################
-  id    "$USER_"  &>/dev/null || { echo "user USER_ does not exist"  ; return 1; }
-  id -g "$GROUP_" &>/dev/null || { echo "group GROUP_ does not exist"; return 1; }
-  [ -d "$DIR_" ] || { echo -e "INFO: directory $DIR_ does not exist. Creating"; mkdir -p "$DIR_"; }
-  [[ $( stat -fc%d / ) == $( stat -fc%d $DIR_ ) ]] && \
-    echo -e "INFO: mounting a in the SD card\nIf you want to use an external mount, make sure it is properly set up"
-
-  # CONFIG
-  ################################
-  cat > /etc/exports <<EOF
-$DIR_ $SUBNET_(rw,sync,all_squash,anonuid=$(id -u $USER_),anongid=$(id -g $GROUP_),no_subtree_check)
-EOF
-
-  systemctl enable rpcbind
-  systemctl enable nfs-kernel-server
-  service nfs-kernel-server restart
-  echo -e "NFS enabled"
-}
-
-# 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/etc/ncp-config.d/SSH.cfg b/etc/ncp-config.d/SSH.cfg
new file mode 100644
index 00000000..947faed5
--- /dev/null
+++ b/etc/ncp-config.d/SSH.cfg
@@ -0,0 +1,31 @@
+{
+  "id": "SSH",
+  "name": "SSH",
+  "title": "SSH",
+  "description": "Activate or deactivate SSH",
+  "info": "In order to enable SSH, the password for user 'pi' can NOT remain set to the default raspberry. \nYou HAVE to create a NEW password for 'pi' if you want this program to enable SSH, it will fail if you dont!\nThe same will happen with user 'root' and password '1234'\nNote: Use normal AlphaNumeric, the only special characters allowed are .,@-_/",
+  "infotitle": "SSH notes",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "USER",
+      "name": "USER",
+      "value": "root"
+    },
+    {
+      "id": "PASS",
+      "name": "PASS",
+      "value": "1234"
+    },
+    {
+      "id": "CONFIRM",
+      "name": "CONFIRM",
+      "value": "1234"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/SSH.sh b/etc/ncp-config.d/SSH.sh
deleted file mode 100644
index 0693753f..00000000
--- a/etc/ncp-config.d/SSH.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-
-# Activate/deactivate SSH
-#
-#
-# Copyleft 2017 by Courtney Hicks and Ignacio Nunez Hernanz
-# GPL licensed (see end of file) * Use at your own risk!
-#
-
-ACTIVE_=no
-USER_=root
-PASS_=1234
-CONFIRM_=1234
-
-DESCRIPTION="Activate or deactivate SSH"
-INFOTITLE="SSH notes"
-INFO="In order to enable SSH, the password for user 'pi' can NOT remain set to the default raspberry. 
-You HAVE to create a NEW password for 'pi' if you want this program to enable SSH, it will fail if you dont!
-The same will happen with user 'root' and password '1234'
-Note: Use normal AlphaNumeric, the only special characters allowed are .,@-_/"
-
-install() { :; }
-
-is_active()
-{
-  systemctl -q is-enabled ssh &>/dev/null
-}
-
-configure() 
-{
-  [[ $ACTIVE_ != "yes" ]]  && {
-    systemctl stop    ssh
-    systemctl disable ssh
-    echo "SSH disabled"
-    return 0
-  }
-
-  # Check for bad ideas
-  [[ "$USER_" == "pi" ]] && [[ "$PASS_" == "raspberry" ]] && {
-    echo "Refusing to use the default Raspbian user and password. It's insecure"
-    return 1
-  }
-  [[ "$USER_" == "root" ]] && [[ "$PASS_" == "1234" ]] && {
-    echo "Refusing to use the default Armbian user and password. It's insecure"
-    return 1
-  }
-
-  # Change credentials
-  id "$USER_" &>/dev/null || { echo "$USER_ doesn't exist"; return 1; }
-  echo -e "$PASS_\n$CONFIRM_" | passwd "$USER_" || return 1
-
-  # Check for insecure default pi password ( taken from old jessie method )
-  local SHADOW="$( grep -E '^pi:' /etc/shadow )"
-  test -n "${SHADOW}" && {
-    local SALT=$(echo "${SHADOW}" | sed -n 's/pi:\$6\$//;s/\$.*//p')
-
-    [[ "${SALT}" != "" ]] && {
-      local HASH=$(mkpasswd -msha-512 raspberry "$SALT")
-      grep -q "${HASH}" <<< "${SHADOW}" && {
-        systemctl stop    ssh
-        systemctl disable ssh
-        echo "The user pi is using the default password. Refusing to activate SSH"
-        echo "SSH disabled"
-        return 1
-      }
-    }
-  }
-
-  # Check for insecure default root password ( taken from old jessie method )
-  local SHADOW="$( grep -E '^root:' /etc/shadow )"
-  test -n "${SHADOW}" && {
-    local SALT=$(echo "${SHADOW}" | sed -n 's/root:\$6\$//;s/\$.*//p')
-
-    [[ "${SALT}" != "" ]] && {
-      local HASH=$(mkpasswd -msha-512 1234 "$SALT")
-      grep -q "${HASH}" <<< "${SHADOW}" && {
-        systemctl stop    ssh
-        systemctl disable ssh
-        echo "The user root is using the default password. Refusing to activate SSH"
-        echo "SSH disabled"
-        return 1
-      }
-    }
-  }
-
-  # Enable
-  chage -d 0 "$USER_"
-  systemctl enable ssh
-  systemctl start  ssh
-  echo "SSH enabled"
-}
-
-# 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/etc/ncp-config.d/UFW.cfg b/etc/ncp-config.d/UFW.cfg
new file mode 100644
index 00000000..0bf29a86
--- /dev/null
+++ b/etc/ncp-config.d/UFW.cfg
@@ -0,0 +1,31 @@
+{
+  "id": "UFW",
+  "name": "UFW",
+  "title": "UFW",
+  "description": "Uncomplicated Firewall",
+  "info": "Beware of blocking the SSH port you are using!",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "HTTP",
+      "name": "HTTP",
+      "value": "80"
+    },
+    {
+      "id": "HTTPS",
+      "name": "HTTPS",
+      "value": "443"
+    },
+    {
+      "id": "SSH",
+      "name": "SSH",
+      "value": "22"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/UFW.sh b/etc/ncp-config.d/UFW.sh
deleted file mode 100644
index 3676e338..00000000
--- a/etc/ncp-config.d/UFW.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-# Uncomplicated Firewall
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-ACTIVE_=no
-HTTP_=80
-HTTPS_=443
-SSH_=22
-DESCRIPTION="Uncomplicated Firewall"
-
-INFO="Beware of blocking the SSH port you are using!"
-
-install()
-{
-  apt-get update
-  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ufw
-  systemctl disable ufw
-
-  # Disable logging to kernel
-  grep -q maxsize /etc/logrotate.d/ufw || sed -i /weekly/amaxsize2M /etc/logrotate.d/ufw
-}
-
-configure()
-{
-  [[ "$ACTIVE_" != yes ]] && {
-    ufw --force reset
-    systemctl disable ufw
-    systemctl stop ufw
-    echo "UFW disabled"
-    return 0
-  }
-  ufw --force enable
-  systemctl enable ufw
-  systemctl start ufw
-
-  echo -e "\n# web server rules"
-  ufw allow $HTTP_/tcp
-  ufw allow $HTTPS_/tcp
-  ufw allow 4443/tcp
-
-  echo -e "\n# SSH rules"
-  ufw allow $SSH_
-
-  echo -e "\n# DNS rules"
-  ufw allow dns
-
-  echo -e "\n# SAMBA rules"
-  ufw allow samba
-
-  echo -e "\n# NFS rules"
-  ufw allow nfs
-
-  echo -e "\n# UPnP rules"
-  ufw allow proto udp from 192.168.0.0/16
-
-  echo "UFW enabled"
-}
-
-# 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/etc/ncp-config.d/dnsmasq.cfg b/etc/ncp-config.d/dnsmasq.cfg
new file mode 100644
index 00000000..8a66d38d
--- /dev/null
+++ b/etc/ncp-config.d/dnsmasq.cfg
@@ -0,0 +1,31 @@
+{
+  "id": "dnsmasq",
+  "name": "dnsmasq",
+  "title": "dnsmasq",
+  "description": "DNS server with cache",
+  "info": "Remember to point your PC and devices DNS or\nyou router DNS to your Raspberry Pi IP",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "DOMAIN",
+      "name": "DOMAIN",
+      "value": "mycloud.ownyourbits.com"
+    },
+    {
+      "id": "DNSSERVER",
+      "name": "DNSSERVER",
+      "value": "8.8.8.8"
+    },
+    {
+      "id": "CACHESIZE",
+      "name": "CACHESIZE",
+      "value": "150"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/dnsmasq.sh b/etc/ncp-config.d/dnsmasq.sh
deleted file mode 100644
index 553bb402..00000000
--- a/etc/ncp-config.d/dnsmasq.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-
-# dnsmasq DNS server with cache installation on 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!
-#
-# More at: https://ownyourbits.com/2017/03/09/dnsmasq-as-dns-cache-server-for-nextcloudpi-and-raspbian/
-#
-
-ACTIVE_=no
-DOMAIN_=mycloud.ownyourbits.com
-DNSSERVER_=8.8.8.8
-CACHESIZE_=150
-DESCRIPTION="DNS server with cache"
-
-INFO="Remember to point your PC and devices DNS or
-you router DNS to your Raspberry Pi IP" 
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y dnsmasq
-  update-rc.d dnsmasq disable
-
-  [[ "$DOCKERBUILD" == 1 ]] && {
-    cat > /etc/services-available.d/100dnsmasq <<EOF
-#!/bin/bash
-
-source /usr/local/etc/library.sh
-
-[[ "\$1" == "stop" ]] && {
-  echo "stopping dnsmasq..."
-  service dnsmasq stop
-  exit 0
-}
-
-persistent_cfg /etc/dnsmasq.conf
-
-echo "Starting dnsmasq..."
-service dnsmasq start
-
-exit 0
-EOF
-    chmod +x /etc/services-available.d/100dnsmasq
-  }
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    service dnsmasq stop
-    update-rc.d dnsmasq disable
-    echo "dnmasq disabled"
-    return
-  }
-
-  local IFACE=$( ip r | grep "default via"   | awk '{ print $5 }' | head -1 )
-  local IP=$( ip a show dev "$IFACE" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )
-
-  [[ "$IP" == "" ]] && { echo "could not detect IP"; return 1; }
-  
-  cat > /etc/dnsmasq.conf <<EOF
-interface=$IFACE
-domain-needed         # Never forward plain names (without a dot or domain part)
-bogus-priv            # Never forward addresses in the non-routed address spaces.
-no-poll               # Don't poll for changes in /etc/resolv.conf
-no-resolv             # Don't use /etc/resolv.conf or any other file
-cache-size=$CACHESIZE_ 
-server=$DNSSERVER_
-address=/$DOMAIN_/$IP  # This is optional if we add it to /etc/hosts
-EOF
-
-  # required to run in container
-  test -d /data && echo "user=root" >> /etc/dnsmasq.conf
-
-  sed -i 's|#\?IGNORE_RESOLVCONF=.*|IGNORE_RESOLVCONF=yes|' /etc/default/dnsmasq
-
-  update-rc.d dnsmasq defaults
-  update-rc.d dnsmasq enable
-  service dnsmasq restart
-  cd /var/www/nextcloud
-  sudo -u www-data php occ config:system:set trusted_domains 2 --value=$DOMAIN_
-  sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN_"/
-  echo "dnsmasq enabled"
-}
-
-# 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/etc/ncp-config.d/fail2ban.cfg b/etc/ncp-config.d/fail2ban.cfg
new file mode 100644
index 00000000..cfaaad19
--- /dev/null
+++ b/etc/ncp-config.d/fail2ban.cfg
@@ -0,0 +1,42 @@
+{
+  "id": "fail2ban",
+  "name": "fail2ban",
+  "title": "fail2ban",
+  "description": "Brute force protection for SSH and NextCloud",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "BANTIME",
+      "name": "BANTIME",
+      "value": "600"
+    },
+    {
+      "id": "FINDTIME",
+      "name": "FINDTIME",
+      "value": "600"
+    },
+    {
+      "id": "MAXRETRY",
+      "name": "MAXRETRY",
+      "value": "6"
+    },
+    {
+      "id": "MAILALERTS",
+      "name": "MAILALERTS",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "EMAIL",
+      "name": "EMAIL",
+      "value": "optional@email.com"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/fail2ban.sh b/etc/ncp-config.d/fail2ban.sh
deleted file mode 100644
index b89b411f..00000000
--- a/etc/ncp-config.d/fail2ban.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/bash
-
-# Fail2ban installation script for 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!
-#
-# More at: https://ownyourbits.com/2017/02/24/nextcloudpi-fail2ban-installer/
-#
-
-ACTIVE_=no
-
-# time to ban an IP that exceeded attempts
-BANTIME_=600
-
-# cooldown time for incorrect passwords
-FINDTIME_=600
-
-# bad attempts before banning an IP
-MAXRETRY_=6
-
-
-# Option to activate email notifications
-MAILALERTS_=no
-
-# email to send notifications to
-EMAIL_=optional@email.com
-
-DESCRIPTION="Brute force protection for SSH and NextCloud"
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y fail2ban whois
-  update-rc.d fail2ban disable
-  rm -f /etc/fail2ban/jail.d/defaults-debian.conf
-
-  [[ "$DOCKERBUILD" == 1 ]] && {
-    cat > /etc/services-available.d/100fail2ban <<EOF
-#!/bin/bash
-
-source /usr/local/etc/library.sh
-
-[[ "\$1" == "stop" ]] && {
-  echo "stopping fail2ban..."
-  service fail2ban stop
-  exit 0
-}
-
-persistent_cfg /etc/fail2ban
-
-echo "Starting fail2ban..."
-service fail2ban start
-
-exit 0
-EOF
-    chmod +x /etc/services-available.d/100fail2ban
-  }
-
-  # 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
-  grep -q actionstart_ "$F" || sed -i 's|actionstart|actionstart_|' "$F"
-  grep -q actionstop_  "$F" || sed -i 's|actionstop|actionstop_|'   "$F"
-
-  # delay init because of automount
-  sed -i "/^ExecStart=/iExecStartPre=/bin/sleep 10" /lib/systemd/system/fail2ban.service
-
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    service fail2ban stop
-    update-rc.d fail2ban disable
-    echo "fail2ban disabled"
-    return 
-  }
-
-  local NCLOG="/var/www/nextcloud/data/nextcloud.log"
-  local NCLOG1="$( sudo -u www-data php /var/www/nextcloud/occ config:system:get logfile )"
-
-  [[ "$NCLOG1" != "" ]] && NCLOG="$NCLOG1"
-
-  local BASEDIR=$( dirname "$NCLOG" )
-  [ -d "$BASEDIR" ] || { echo -e "directory $BASEDIR not found"; return 1; }
-
-  sudo -u www-data touch "$NCLOG" || { echo -e "ERROR: user www-data does not have write permissions on $NCLOG"; return 1; }
-
-  cd /var/www/nextcloud
-  sudo -u www-data php occ config:system:set loglevel --value=2
-  sudo -u www-data php occ config:system:set log_type --value=file
-
-  cat > /etc/fail2ban/filter.d/nextcloud.conf <<'EOF'
-[INCLUDES]
-before = common.conf
-
-[Definition]
-failregex = Login failed.*Remote IP.*'<HOST>'
-ignoreregex =
-EOF
-
-  [[ "$MAILALERTS_" == "yes" ]] && local ACTION=action_mwl || local ACTION=action_
-
-  cat > /etc/fail2ban/jail.conf <<EOF
-# The DEFAULT allows a global definition of the options. They can be overridden
-# in each jail afterwards.
-[DEFAULT]
-
-# "ignoreip" can be an IP address, a CIDR mask or a DNS host. Fail2ban will not
-# ban a host which matches an address in this list. Several addresses can be
-# defined using space separator.
-ignoreip = 127.0.0.1/8
-
-# "bantime" is the number of seconds that a host is banned.
-bantime  = $BANTIME_
-
-# A host is banned if it has generated "maxretry" during the last "findtime"
-# seconds.
-findtime = $FINDTIME_
-maxretry = $MAXRETRY_
-
-#
-# ACTIONS
-#
-banaction  = iptables-multiport
-protocol   = tcp
-chain      = INPUT
-action_    = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
-action_mwl = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
-           sendmail-whois-lines[name=%(__name__)s, dest=$EMAIL_, sender=ncp-fail2ban@ownyourbits.com]
-action = %($ACTION)s
-
-#
-# SSH
-#
-
-[ssh]
-
-enabled  = true
-port     = ssh
-filter   = sshd
-logpath  = /var/log/auth.log
-maxretry = $MAXRETRY_
-
-#
-# HTTP servers
-#
-
-[nextcloud]
-
-enabled  = true
-port     = http,https
-filter   = nextcloud
-logpath  = $NCLOG
-maxretry = $MAXRETRY_
-EOF
-  cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local
-  update-rc.d fail2ban defaults
-  update-rc.d fail2ban enable
-  service fail2ban restart
-  echo "fail2ban enabled"
-}
-
-# 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/etc/ncp-config.d/letsencrypt.cfg b/etc/ncp-config.d/letsencrypt.cfg
new file mode 100644
index 00000000..4c3a56f9
--- /dev/null
+++ b/etc/ncp-config.d/letsencrypt.cfg
@@ -0,0 +1,25 @@
+{
+  "id": "letsencrypt",
+  "name": "letsencrypt",
+  "title": "letsencrypt",
+  "description": "Automatic signed SSL certificates",
+  "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": [
+    {
+      "id": "DOMAIN",
+      "name": "DOMAIN",
+      "value": "mycloud.ownyourbits.com"
+    },
+    {
+      "id": "EMAIL",
+      "name": "EMAIL",
+      "value": "mycloud@ownyourbits.com"
+    },
+    {
+      "id": "NOTIFYUSER",
+      "name": "NOTIFYUSER",
+      "value": "ncp"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/letsencrypt.sh b/etc/ncp-config.d/letsencrypt.sh
deleted file mode 100644
index 87467d00..00000000
--- a/etc/ncp-config.d/letsencrypt.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-
-# Let's encrypt certbot installation on 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!
-#
-# More at https://ownyourbits.com/2017/03/17/lets-encrypt-installer-for-apache/
-
-DOMAIN_=mycloud.ownyourbits.com
-EMAIL_=mycloud@ownyourbits.com
-NOTIFYUSER_=ncp
-
-NCDIR=/var/www/nextcloud
-OCC="$NCDIR/occ"
-VHOSTCFG=/etc/apache2/sites-available/nextcloud.conf
-VHOSTCFG2=/etc/apache2/sites-available/ncp.conf
-DESCRIPTION="Automatic signed SSL certificates"
-
-INFOTITLE="Warning"
-INFO="Internet access is required for this configuration to complete
-Both ports 80 and 443 need to be accessible from the internet
- 
-Your certificate will be automatically renewed every month"
-
-is_active()
-{
-  [[ $( find /etc/letsencrypt/live/ -maxdepth 0 -empty | wc -l ) == 0 ]]
-}
-
-install()
-{
-  cd /etc || return 1
-  apt-get update
-  apt-get install --no-install-recommends -y letsencrypt
-  mkdir -p /etc/letsencrypt/live
-
-  [[ "$DOCKERBUILD" == 1 ]] && {
-    # execute before lamp stack
-    cat > /etc/services-available.d/009letsencrypt <<EOF
-#!/bin/bash
-
-source /usr/local/etc/library.sh
-persistent_cfg /etc/letsencrypt
-
-exit 0
-EOF
-    chmod +x /etc/services-available.d/009letsencrypt
-  }
-}
-
-# tested with certbot 0.10.2
-configure() 
-{
-  local DOMAIN_LOWERCASE="${DOMAIN_,,}"
-
-  # Configure Apache
-  grep -q ServerName $VHOSTCFG && \
-    sed -i "s|ServerName .*|ServerName $DOMAIN_|" $VHOSTCFG || \
-    sed -i "/DocumentRoot/aServerName $DOMAIN_" $VHOSTCFG 
-
-  # Do it
-  letsencrypt certonly -n --no-self-upgrade --webroot -w $NCDIR --hsts --agree-tos -m $EMAIL_ -d $DOMAIN_ && {
-
-    # Set up auto-renewal
-    cat > /etc/cron.weekly/letsencrypt-ncp <<EOF
-#!/bin/bash
-
-# renew and notify
-/usr/bin/certbot renew --quiet --renew-hook '
-  sudo -u www-data php $OCC notification:generate \
-                            $NOTIFYUSER_ "SSL renewal" \
-                            -l "Your SSL certificate(s) \$RENEWED_DOMAINS has been renewed for another 90 days"
-  '
-
-# notify if fails
-[[ \$? -ne 0 ]] && sudo -u www-data php $OCC notification:generate \
-                                             $NOTIFYUSER_ "SSL renewal error" \
-                                             -l "SSL certificate renewal failed. See /var/log/letsencrypt/letsencrypt.log"
-
-# cleanup
-rm -rf $NCDIR/.well-known
-EOF
-    chmod +x /etc/cron.weekly/letsencrypt-ncp
-
-    # Configure Apache
-    sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/fullchain.pem|" $VHOSTCFG
-    sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/privkey.pem|" $VHOSTCFG
-
-    sed -i "s|SSLCertificateFile.*|SSLCertificateFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/fullchain.pem|" $VHOSTCFG2
-    sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/privkey.pem|" $VHOSTCFG2
-
-    # Configure Nextcloud
-    sudo -u www-data php $OCC config:system:set trusted_domains 4 --value=$DOMAIN_
-    sudo -u www-data php $OCC config:system:set overwrite.cli.url --value=https://"$DOMAIN_"/
-
-    # delayed in bg so it does not kill the connection, and we get AJAX response
-    bash -c "sleep 2 && service apache2 reload" &>/dev/null &
-    rm -rf $NCDIR/.well-known
-    
-    # Update configuration
-    [[ "$DOCKERBUILD" == 1 ]] && update-rc.d letsencrypt enable
-
-    return 0
-  }
-  rm -rf $NCDIR/.well-known
-  return 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/etc/ncp-config.d/modsecurity.cfg b/etc/ncp-config.d/modsecurity.cfg
new file mode 100644
index 00000000..504147e9
--- /dev/null
+++ b/etc/ncp-config.d/modsecurity.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "modsecurity",
+  "name": "modsecurity",
+  "title": "modsecurity",
+  "description": "Web Application Firewall for extra security (experimental)",
+  "info": "This feature is highly experimental and has only been tested with\na basic NextCloud installation. If a new App does not work disable it",
+  "infotitle": "Experimental feature warning",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/modsecurity.sh b/etc/ncp-config.d/modsecurity.sh
deleted file mode 100644
index 86d239e8..00000000
--- a/etc/ncp-config.d/modsecurity.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-
-# modsecurity WAF installation on 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!
-#
-# More at ownyourbits.com
-#
-
-ACTIVE_=no
-NCDIR=/var/www/nextcloud/
-NCPWB=/var/www/ncp-web/
-DESCRIPTION="Web Application Firewall for extra security (experimental)"
-
-INFOTITLE="Experimental feature warning"
-INFO="This feature is highly experimental and has only been tested with
-a basic NextCloud installation. If a new App does not work disable it"
-
-install()
-{
-  apt-get update
-  apt-get install -y --no-install-recommends libapache2-mod-security2 modsecurity-crs
-  a2dismod security2
-
-  cat >> /etc/modsecurity/crs/crs-setup.conf <<'EOF'
-
-  # NextCloudPi: allow PROPFIND for webDAV
-  SecAction "id:900200, phase:1, nolog, pass, t:none, setvar:'tx.allowed_methods=GET HEAD POST OPTIONS PROPFIND'"
-EOF
-
-  # CONFIGURE
-  cp /etc/modsecurity/modsecurity.conf-recommended /etc/modsecurity/modsecurity.conf
-  sed -i "s|SecRuleEngine .*|SecRuleEngine Off|"               /etc/modsecurity/modsecurity.conf
-  sed -i 's|SecTmpDir .*|SecTmpDir   /var/cache/modsecurity/|' /etc/modsecurity/modsecurity.conf
-  sed -i 's|SecDataDir .*|SecDataDir /var/cache/modsecurity/|' /etc/modsecurity/modsecurity.conf
-  sed -i 's|^SecRequestBodyLimit .*|#SecRequestBodyLimit 13107200|' /etc/modsecurity/modsecurity.conf
-
-  # turn modsecurity logs off, too spammy
-  sed -i 's|SecAuditEngine .*|SecAuditEngine Off|' /etc/modsecurity/modsecurity.conf
-
-  cat >> /etc/apache2/apache2.conf <<EOF
-<IfModule mod_security2.c>
-  SecServerSignature " "
-</IfModule>
-EOF
-}
-
-configure() 
-{ 
-  cat > /etc/modsecurity/modsecurity_crs_99_whitelist.conf <<EOF
-<Directory $NCDIR>
-  # VIDEOS
-  SecRuleRemoveById 958291             # Range Header Checks
-  SecRuleRemoveById 980120             # Correlated Attack Attempt
-
-  # PDF
-  SecRuleRemoveById 920230             # Check URL encodings
-
-  # ADMIN (webdav)
-  SecRuleRemoveById 960024             # Repeatative Non-Word Chars (heuristic)
-  SecRuleRemoveById 981173             # SQL Injection Character Anomaly Usage
-  SecRuleRemoveById 980130             # Correlated Attack Attempt
-  SecRuleRemoveById 981243             # PHPIDS - Converted SQLI Filters
-  SecRuleRemoveById 981245             # PHPIDS - Converted SQLI Filters
-  SecRuleRemoveById 981246             # PHPIDS - Converted SQLI Filters
-  SecRuleRemoveById 981318             # String Termination/Statement Ending Injection Testing
-  SecRuleRemoveById 973332             # XSS Filters from IE
-  SecRuleRemoveById 973338             # XSS Filters - Category 3
-  SecRuleRemoveById 981143             # CSRF Protections ( TODO edit LocationMatch filter )
-
-  # COMING BACK FROM OLD SESSION
-  SecRuleRemoveById 970903             # Microsoft Office document properties leakage
-
-  # NOTES APP
-  SecRuleRemoveById 981401             # Content-Type Response Header is Missing and X-Content-Type-Options is either missing or not set to 'nosniff'
-  SecRuleRemoveById 200002             # Failed to parse request body
-
-  # UPLOADS ( 5 MB max excluding file size )
-  SecRequestBodyNoFilesLimit 5242880
-
-  # GENERAL
-  SecRuleRemoveById 920350             # Host header is a numeric IP address
-
-  # REGISTERED WARNINGS, BUT DID NOT HAVE TO DISABLE THEM
-  #SecRuleRemoveById 981220 900046 981407
-  #SecRuleRemoveById 981222 981405 981185 949160
-
-</Directory>
-<Directory $NCPWB>
-  # GENERAL
-  SecRuleRemoveById 920350             # Host header is a numeric IP address
-</Directory>
-EOF
-
-  [[ $ACTIVE_ == "yes" ]] && local STATE=On || local STATE=Off
-  sed -i "s|SecRuleEngine .*|SecRuleEngine $STATE|" /etc/modsecurity/modsecurity.conf
-  [[ $ACTIVE_ == "yes" ]] && echo "Enabling module security2" || echo "Disabling module security2"
-  [[ $ACTIVE_ == "yes" ]] && a2enmod security2 &>/dev/null || a2dismod security2 &>/dev/null
-
-  # delayed in bg so it does not kill the connection, and we get AJAX response
-  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
-}
-
-# 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/etc/ncp-config.d/nc-admin.cfg b/etc/ncp-config.d/nc-admin.cfg
new file mode 100644
index 00000000..d2d97e81
--- /dev/null
+++ b/etc/ncp-config.d/nc-admin.cfg
@@ -0,0 +1,25 @@
+{
+  "id": "nc-admin",
+  "name": "nc-admin",
+  "title": "nc-admin",
+  "description": "Change password for the Nextcloud admin user",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "USER",
+      "name": "USER",
+      "value": "ncp"
+    },
+    {
+      "id": "PASSWORD",
+      "name": "PASSWORD",
+      "value": "ownyourbits"
+    },
+    {
+      "id": "CONFIRM",
+      "name": "CONFIRM",
+      "value": "ownyourbits"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-admin.sh b/etc/ncp-config.d/nc-admin.sh
deleted file mode 100644
index 10ffff15..00000000
--- a/etc/ncp-config.d/nc-admin.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Change password for the Nextcloud admin user
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-USER_=ncp
-PASSWORD_=ownyourbits
-CONFIRM_=ownyourbits
-
-DESCRIPTION="Change password for the Nextcloud admin user"
-
-configure()
-{
-  [[ "$PASSWORD_" == "$CONFIRM_" ]] || { echo "passwords do not match"; return 1; }
-
-  OC_PASS="$PASSWORD_" \
-    sudo -E -u www-data php /var/www/nextcloud/occ \
-    user:resetpassword --password-from-env "$USER_"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-audit.cfg b/etc/ncp-config.d/nc-audit.cfg
new file mode 100644
index 00000000..b02a62cb
--- /dev/null
+++ b/etc/ncp-config.d/nc-audit.cfg
@@ -0,0 +1,9 @@
+{
+  "id": "nc-audit",
+  "name": "nc-audit",
+  "title": "nc-audit",
+  "description": "Perform a security audit with lynis and debsecan",
+  "info": "",
+  "infotitle": "",
+  "params": []
+}
diff --git a/etc/ncp-config.d/nc-audit.sh b/etc/ncp-config.d/nc-audit.sh
deleted file mode 100644
index 5b032527..00000000
--- a/etc/ncp-config.d/nc-audit.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-DESCRIPTION="Perform a security audit with lynis and debsecan"
-
-install()
-{
-  apt-get update
-  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    lynis debsecan debian-goodies debsums
-  cp /etc/lynis/default.prf /etc/lynis/ncp.prf
-  cat >> /etc/lynis/ncp.prf <<EOF
-# Won't install apt-listbugs and all its ruby dependencies
-skip-test=CUST-0810
-
-# Won't install puppet or similar
-skip-test=TOOL-5002
-
-# Raspbian doesn't have security sources ( https://www.raspberrypi.org/forums/viewtopic.php?t=98006&p=680175 ) 
-skip-test=PKGS-7388
-
-# We have a preset partition scheme in the SD card
-skip-test=FILE-6310
-
-# We don't use firewire
-skip-test=STRG-1846
-
-# We use USB in NCP
-skip-test=STRG-1840
-
-# Won't recompile kernel to support auditd
-skip-test=ACCT-9628
-
-# Won't be protected against DDOS in self-hosting, will save the resources
-skip-test=HTTP-6640
-skip-test=HTTP-6641
-
-# False positive about mysql root password ( https://github.com/CISOfy/lynis/issues/288 )
-skip-test=DBS-1816
-
-# vmlinuz missing at least in Raspbian
-skip-test=KRNL-5788
-
-# won't recompile kernels for PAE NX
-skip-test=KRNL-5677
-
-# false positive with DNS settings. We use mDNS and dnsmasq (and they work)
-skip-test=NAME-4028
-
-# false positive due to fail2ban
-skip-test=FIRE-4513
-EOF
-}
-
-configure()
-{
-  echo "General security audit"
-  lynis audit system --profile /etc/lynis/ncp.prf --no-colors
-
-  echo "Known vulnerabilities in this system"
-  debsecan
-}
-
-# 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/etc/ncp-config.d/nc-automount.cfg b/etc/ncp-config.d/nc-automount.cfg
new file mode 100644
index 00000000..7a25c5a4
--- /dev/null
+++ b/etc/ncp-config.d/nc-automount.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-automount",
+  "name": "nc-automount",
+  "title": "nc-automount",
+  "description": "Automount USB drives by plugging them in",
+  "info": "Plugged in USB drives will be automounted under /media\non boot or at the moment of insertion.\n\nFormat your drive as ext4 in order to move NC datafolder or database\nVFAT or NTFS is not recommended for this task, as it does not suport permissions\n\nIMPORTANT: halt or umount the drive before extracting",
+  "infotitle": "Automount notes",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-automount.sh b/etc/ncp-config.d/nc-automount.sh
deleted file mode 100644
index 14c5437b..00000000
--- a/etc/ncp-config.d/nc-automount.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/
-#
-
-ACTIVE_=no
-DESCRIPTION="Automount USB drives by plugging them in"
-
-INFOTITLE="Automount notes"
-INFO="Plugged in USB drives will be automounted under /media
-on boot or at the moment of insertion.
-
-Format your drive as ext4 in order to move NC datafolder or database
-VFAT or NTFS is not recommended for this task, as it does not suport permissions
-
-IMPORTANT: halt or umount the drive before extracting"
-
-install()
-{
-  apt-get update
-  apt-get install -y --no-install-recommends udiskie inotify-tools
-
-  cat > /etc/udev/rules.d/99-udisks2.rules <<'EOF'
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1"
-EOF
-
-  cat > /usr/lib/systemd/system/nc-automount.service <<'EOF'
-[Unit]
-Description=Automount USB drives
-Before=mysqld.service dphys-swapfile.service fail2ban.service smbd.service nfs-server.service
-
-[Service]
-Restart=always
-ExecStartPre=/bin/bash -c "rmdir /media/* || true"
-ExecStart=/usr/bin/udiskie -NTF
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-  cat > /usr/lib/systemd/system/nc-automount-links.service <<'EOF'
-[Unit]
-Description=Monitor /media for mountpoints and create USBdrive* symlinks
-Before=nc-automount.service
-
-[Service]
-Restart=always
-ExecStart=/usr/local/etc/nc-automount-links-mon
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-  cat > /usr/local/etc/nc-automount-links <<'EOF'
-#!/bin/bash
-
-ls -d /media/* &>/dev/null && {
-
-  # remove old links
-  for l in $( ls /media/ ); do
-    test -L /media/"$l" && rm /media/"$l"
-  done
-
-  # create links
-  i=0
-  for d in $( ls -d /media/* 2>/dev/null ); do
-    if [ $i -eq 0 ]; then
-      test -e /media/USBdrive   || test -d "$d" && ln -sT "$d" /media/USBdrive
-    else
-      test -e /media/USBdrive$i || test -d "$d" && ln -sT "$d" /media/USBdrive$i
-    fi
-    i=$(( i + 1 ))
-  done
-
-}
-EOF
-  chmod +x /usr/local/etc/nc-automount-links
-
-  cat > /usr/local/etc/nc-automount-links-mon <<'EOF'
-#!/bin/bash
-inotifywait --monitor --event create --event delete --format '%f %e' /media/ | \
-  grep --line-buffered ISDIR | while read f; do
-    echo $f
-    sleep 0.5
-    /usr/local/etc/nc-automount-links
-done
-EOF
-  chmod +x /usr/local/etc/nc-automount-links-mon
-
-  # delay init because of automount
-  sed -i "/^ExecStart=/iExecStartPre=/bin/sleep 20" /lib/systemd/system/mariadb.service
-  sed -i 's|^Restart=.*|Restart=on-failure|'        /lib/systemd/system/mariadb.service
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && {
-    systemctl stop    nc-automount
-    systemctl stop    nc-automount-links
-    systemctl disable nc-automount
-    systemctl disable nc-automount-links
-    echo "automount disabled"
-    return 0
-  }
-  systemctl enable  nc-automount
-  systemctl enable  nc-automount-links
-  systemctl start   nc-automount
-  systemctl start   nc-automount-links
-  echo "automount enabled"
-}
-
-# 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/etc/ncp-config.d/nc-autoupdate-nc.cfg b/etc/ncp-config.d/nc-autoupdate-nc.cfg
new file mode 100644
index 00000000..35f4eb60
--- /dev/null
+++ b/etc/ncp-config.d/nc-autoupdate-nc.cfg
@@ -0,0 +1,21 @@
+{
+  "id": "nc-autoupdate-nc",
+  "name": "nc-autoupdate-nc",
+  "title": "nc-autoupdate-nc",
+  "description": "Automatically apply Nextcloud updates",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "NOTIFYUSER",
+      "name": "NOTIFYUSER",
+      "value": "ncp"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-autoupdate-nc.sh b/etc/ncp-config.d/nc-autoupdate-nc.sh
deleted file mode 100644
index 1f6d5d18..00000000
--- a/etc/ncp-config.d/nc-autoupdate-nc.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Automatically apply Nextcloud updates
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=no
-NOTIFYUSER_=ncp
-DESCRIPTION="Automatically apply Nextcloud updates"
-
-# just change this value and re-activate in update.sh to upgrade users
-VERSION=14.0.4
-
-configure() 
-{
-  [[ "$ACTIVE_" != "yes" ]] && { 
-    rm -f /etc/cron.daily/ncp-autoupdate-nc
-    echo "automatic Nextcloud updates disabled"
-    return 0
-  }
-
-  cat > /etc/cron.daily/ncp-autoupdate-nc <<EOF
-#!/bin/bash
-
-echo -e "[ncp-update-nc]"                          >> /var/log/ncp.log
-/usr/local/bin/ncp-update-nc "$VERSION" 2>&1 | tee -a /var/log/ncp.log
-
-if [[ \${PIPESTATUS[0]} -eq 0 ]]; 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_" "NextCloudPi" -l "Nextcloud was updated to \$VER"
-fi
-echo "" >> /var/log/ncp.log
-EOF
-  chmod a+x /etc/cron.daily/ncp-autoupdate-nc
-  echo "automatic Nextcloud updates enabled"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-autoupdate-ncp.cfg b/etc/ncp-config.d/nc-autoupdate-ncp.cfg
new file mode 100644
index 00000000..a22878ce
--- /dev/null
+++ b/etc/ncp-config.d/nc-autoupdate-ncp.cfg
@@ -0,0 +1,21 @@
+{
+  "id": "nc-autoupdate-ncp",
+  "name": "nc-autoupdate-ncp",
+  "title": "nc-autoupdate-ncp",
+  "description": "Automatically apply NextCloudPi updates",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "NOTIFYUSER",
+      "name": "NOTIFYUSER",
+      "value": "ncp"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-autoupdate-ncp.sh b/etc/ncp-config.d/nc-autoupdate-ncp.sh
deleted file mode 100644
index fbbee1b3..00000000
--- a/etc/ncp-config.d/nc-autoupdate-ncp.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=no
-NOTIFYUSER_=ncp
-DESCRIPTION="Automatically apply NextCloudPi updates"
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    rm -f /etc/cron.daily/ncp-autoupdate
-    echo "automatic NextCloudPi updates disabled"
-    return 0
-  }
-
-  cat > /etc/cron.daily/ncp-autoupdate <<EOF
-#!/bin/bash
-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_" "NextCloudPi" \
-       -l "NextCloudPi was updated to \$( cat /usr/local/etc/ncp-version )"
-fi
-EOF
-  chmod a+x /etc/cron.daily/ncp-autoupdate
-  echo "automatic NextCloudPi updates enabled"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-backup-auto.cfg b/etc/ncp-config.d/nc-backup-auto.cfg
new file mode 100644
index 00000000..69bcad8c
--- /dev/null
+++ b/etc/ncp-config.d/nc-backup-auto.cfg
@@ -0,0 +1,43 @@
+{
+  "id": "nc-backup-auto",
+  "name": "nc-backup-auto",
+  "title": "nc-backup-auto",
+  "description": "Periodic backups",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "DESTDIR",
+      "name": "DESTDIR",
+      "value": "/media/USBdrive/ncp-backups"
+    },
+    {
+      "id": "INCLUDEDATA",
+      "name": "INCLUDEDATA",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "COMPRESS",
+      "name": "COMPRESS",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "BACKUPDAYS",
+      "name": "BACKUPDAYS",
+      "value": "7"
+    },
+    {
+      "id": "BACKUPLIMIT",
+      "name": "BACKUPLIMIT",
+      "value": "4"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-backup-auto.sh b/etc/ncp-config.d/nc-backup-auto.sh
deleted file mode 100644
index 3c10d3d0..00000000
--- a/etc/ncp-config.d/nc-backup-auto.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# Nextcloud backups
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-
-ACTIVE_=no
-DESTDIR_=/media/USBdrive/ncp-backups
-INCLUDEDATA_=no
-COMPRESS_=no
-BACKUPDAYS_=7
-BACKUPLIMIT_=4
-DESCRIPTION="Periodic backups"
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    rm -f /etc/cron.d/ncp-backup-auto
-    service cron restart
-    echo "automatic backups disabled"
-    return 0
-  }
-
-  cat > /usr/local/bin/ncp-backup-auto <<EOF
-#!/bin/bash
-sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --on
-/usr/local/bin/ncp-backup "$DESTDIR_" "$INCLUDEDATA_" "$COMPRESS_" "$BACKUPLIMIT_"
-sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --off
-EOF
-  chmod +x /usr/local/bin/ncp-backup-auto
-
-  echo "0  3  */${BACKUPDAYS_}  *  *  root  /usr/local/bin/ncp-backup-auto" > /etc/cron.d/ncp-backup-auto
-  service cron restart
-
-  echo "automatic backups enabled"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-backup.cfg b/etc/ncp-config.d/nc-backup.cfg
new file mode 100644
index 00000000..9734c1db
--- /dev/null
+++ b/etc/ncp-config.d/nc-backup.cfg
@@ -0,0 +1,32 @@
+{
+  "id": "nc-backup",
+  "name": "nc-backup",
+  "title": "nc-backup",
+  "description": "Backup this NC instance to a file",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "DESTDIR",
+      "name": "DESTDIR",
+      "value": "/media/USBdrive/ncp-backups"
+    },
+    {
+      "id": "INCLUDEDATA",
+      "name": "INCLUDEDATA",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "COMPRESS",
+      "name": "COMPRESS",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "BACKUPLIMIT",
+      "name": "BACKUPLIMIT",
+      "value": "4"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-backup.sh b/etc/ncp-config.d/nc-backup.sh
deleted file mode 100644
index fbe70677..00000000
--- a/etc/ncp-config.d/nc-backup.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-# Nextcloud backups
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-
-DESTDIR_=/media/USBdrive/ncp-backups
-INCLUDEDATA_=no
-COMPRESS_=no
-BACKUPLIMIT_=4
-DESCRIPTION="Backup this NC instance to a file"
-
-install()
-{
-  cat > /usr/local/bin/ncp-backup <<'EOF'
-#!/bin/bash
-set -eE
-
-DESTDIR="${1:-/media/USBdrive/ncp-backups}"
-INCLUDEDATA="${2:-no}"
-COMPRESS="${3:-no}"
-BACKUPLIMIT="${4:-0}"
-
-DESTFILE="$DESTDIR"/nextcloud-bkp_$( date +"%Y%m%d_%s" ).tar 
-DBBACKUP=nextcloud-sqlbkp_$( date +"%Y%m%d" ).bak
-OCC="sudo -u www-data php /var/www/nextcloud/occ"
-
-DATADIR=$( $OCC config:system:get datadirectory ) || {
-  echo "Error reading data directory. Is NextCloud running and configured?";
-  exit 1;
-}
-
-cleanup(){ local RET=$?;                    rm -f "${DBBACKUP}"              ;[[ -f /.docker-image ]] && mv /data/nextcloud /data/app; $OCC maintenance:mode --off; exit $RET; }
-fail()   { local RET=$?; echo "Abort..."  ; rm -f "${DBBACKUP}" "${DESTFILE}";[[ -f /.docker-image ]] && mv /data/nextcloud /data/app; $OCC maintenance:mode --off; exit $RET; }
-trap cleanup EXIT
-trap fail INT TERM HUP ERR
-
-echo "check free space..." # allow at least ~500 MiB for backups without data
-mkdir -p "$DESTDIR"
-[[ "$INCLUDEDATA" == "yes" ]] && SIZE=$( du -s "$DATADIR" | awk '{ print $1 }' ) || SIZE=500000
-FREE=$( df    "$DESTDIR" | tail -1 | awk '{ print $4 }' )
-
-[ $SIZE -ge $FREE ] && { 
-  echo "free space check failed. Need $SIZE Bytes";
-  exit 1; 
-}
-
-# delete older backups
-[[ $BACKUPLIMIT != 0 ]] && {
-  NUMBKPS=$( ls "$DESTDIR"/nextcloud-bkp_* 2>/dev/null | wc -l )
-  [[ $NUMBKPS -ge $BACKUPLIMIT ]] && \
-    ls -t $DESTDIR/nextcloud-bkp_* | tail -$(( NUMBKPS - BACKUPLIMIT + 1 )) | while read -r f; do
-      echo "clean up old backup $f"
-      rm "$f"
-    done
-}
-
-# database
-$OCC maintenance:mode --on
-[[ -f /.docker-image ]] && mv /data/app /data/nextcloud && DATADIR=/data/nextcloud/data
-[[ -f /.docker-image ]] && BASEDIR=/data || BASEDIR=/var/www
-cd "$BASEDIR" || exit 1
-echo "backup database..."
-mysqldump -u root --single-transaction nextcloud > "$DBBACKUP"
-
-# files
-echo "backup base files..."
-mkdir -p "$DESTDIR"
-tar --exclude "nextcloud/data/*/files/*" \
-    --exclude "nextcloud/data/.opcache" \
-    --exclude "nextcloud/data/{access,error,nextcloud}.log" \
-    --exclude "nextcloud/data/access.log" \
-    --exclude "nextcloud/data/ncp-update-backups/" \
-    -cf "$DESTFILE" "$DBBACKUP" "nextcloud"/ \
-  || {
-        echo "error generating backup"
-        exit 1
-      }
-rm "$DBBACKUP"
-
-[[ "$INCLUDEDATA" == "yes" ]] && {
-  echo "backup data files..."
-  tar --exclude "data/.opcache" \
-      --exclude "data/{access,error,nextcloud}.log" \
-      --exclude "data/access.log" \
-      --exclude "data/ncp-update-backups/" \
-      -rf "$DESTFILE" -C "$DATADIR"/.. "$( basename "$DATADIR" )" \
-  || {
-        echo "error generating backup"
-        exit 1
-      }
-} 
-
-[[ "$COMPRESS" == "yes" ]] && {
-  echo "compressing backup file..."
-  tar -czf "${DESTFILE}.gz" -C "$( dirname "$DESTFILE" )" "$( basename "$DESTFILE" )"
-  rm "$DESTFILE"
-  DESTFILE="${DESTFILE}.gz"
-}
-chmod 600 "$DESTFILE"
-
-echo "backup $DESTFILE generated"
-EOF
-  chmod +x /usr/local/bin/ncp-backup
-}
-
-configure()
-{
-  ncp-backup "$DESTDIR_" "$INCLUDEDATA_" "$COMPRESS_" "$BACKUPLIMIT_"
-}
-
-# 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/etc/ncp-config.d/nc-database.cfg b/etc/ncp-config.d/nc-database.cfg
new file mode 100644
index 00000000..232b3f18
--- /dev/null
+++ b/etc/ncp-config.d/nc-database.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-database",
+  "name": "nc-database",
+  "title": "nc-database",
+  "description": "Move your database to a new location, like a USB drive",
+  "info": "Note that non Unix filesystems such as NTFS are not supported\nbecause they do not provide a compatible user/permissions system.\n\nYou need to use a USB drive that is permanently on and is responsive \nor the database will fail.\n\nPlease note that the default location, when first installed is /var/lib/mysql/. \nMove it to the desired location by editing the DBDIR= field, the one shown is an example.\n\n** If it ever fails with a white page, move the database back to the SD **",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "DBDIR",
+      "name": "DBDIR",
+      "value": "/media/USBdrive/ncdatabase"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-database.sh b/etc/ncp-config.d/nc-database.sh
deleted file mode 100644
index 9e8f8204..00000000
--- a/etc/ncp-config.d/nc-database.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/
-#
-
-DBDIR_=/media/USBdrive/ncdatabase
-DESCRIPTION="Move your database to a new location, like a USB drive"
-
-INFO="Note that non Unix filesystems such as NTFS are not supported
-because they do not provide a compatible user/permissions system.
-
-You need to use a USB drive that is permanently on and is responsive 
-or the database will fail.
-
-Please note that the default location, when first installed is /var/lib/mysql/. 
-Move it to the desired location by editing the DBDIR= field, the one shown is an example.
-
-** If it ever fails with a white page, move the database back to the SD **"
-
-is_active()
-{
-  local SRCDIR=$( grep datadir /etc/mysql/mariadb.conf.d/90-ncp.cnf | awk -F "= " '{ print $2 }' )
-  [[ "$SRCDIR" != "/var/lib/mysql" ]]
-}
-
-configure()
-{
-  local SRCDIR=$( grep datadir /etc/mysql/mariadb.conf.d/90-ncp.cnf | awk -F "= " '{ print $2 }' )
-  [ -d "$SRCDIR" ] || { echo -e "database directory $SRCDIR not found"; return 1; }
-
-  [ -d "$DBDIR_" ] && {
-    [[ $( find "$DBDIR_" -maxdepth 0 -empty | wc -l ) == 0 ]] && {
-      echo "$DBDIR_ is not empty"
-      return 1
-    }
-    rmdir "$DBDIR_" 
-  }
-
-  local BASEDIR=$( dirname "$DBDIR_" )
-  mkdir -p "$BASEDIR"
-
-  grep -q -e ext -e btrfs <( stat -fc%T "$BASEDIR" ) || { echo -e "Only ext/btrfs filesystems can hold the data directory"; return 1; }
-  
-  sudo -u mysql test -x "$BASEDIR" || { echo -e "ERROR: the user mysql does not have access permissions over $BASEDIR"; return 1; }
-
-  [[ $( stat -fc%d / ) == $( stat -fc%d "$BASEDIR" ) ]] && \
-    echo -e "INFO: moving database to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up"
-
-  cd /var/www/nextcloud
-  sudo -u www-data php occ maintenance:mode --on
-
-  echo "moving database to $DBDIR_..."
-  service mysql stop
-  mv "$SRCDIR" "$DBDIR_" && \
-    sed -i "s|^datadir.*|datadir = $DBDIR_|" /etc/mysql/mariadb.conf.d/90-ncp.cnf
-  service mysql start 
-
-  sudo -u www-data php occ maintenance:mode --off
-}
-
-install(){ :; }
-
-# 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/etc/ncp-config.d/nc-datadir.cfg b/etc/ncp-config.d/nc-datadir.cfg
new file mode 100644
index 00000000..bea782b2
--- /dev/null
+++ b/etc/ncp-config.d/nc-datadir.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-datadir",
+  "name": "nc-datadir",
+  "title": "nc-datadir",
+  "description": "Change your data dir to a new location, like a USB drive",
+  "info": "Note that non Unix filesystems such as NTFS are not supported\nbecause they do not provide a compatible user/permissions system.\nAlso please note that the default location, when first installed is /var/www/nextcloud/data. \nMove it to the desired location by editing the DATADIR= field, the PATH shown is an example.",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "DATADIR",
+      "name": "DATADIR",
+      "value": "/media/USBdrive/ncdata"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh
deleted file mode 100644
index a79b45d4..00000000
--- a/etc/ncp-config.d/nc-datadir.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/
-#
-
-DATADIR_=/media/USBdrive/ncdata
-DESCRIPTION="Change your data dir to a new location, like a USB drive"
-
-INFO="Note that non Unix filesystems such as NTFS are not supported
-because they do not provide a compatible user/permissions system.
-Also please note that the default location, when first installed is /var/www/nextcloud/data. 
-Move it to the desired location by editing the DATADIR= field, the PATH shown is an example."
-
-PHPVER=7.2
-
-is_active()
-{
-  local SRCDIR
-  SRCDIR="$( grep datadirectory /var/www/nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 )" || return 1
-  [[ "$SRCDIR" != "/var/www/nextcloud/data" ]]
-}
-
-install() 
-{ 
-  apt-get update 
-  apt-get install -y --no-install-recommends btrfs-tools
-}
-
-configure()
-{
-  ## CHECKS
-  local SRCDIR
-  SRCDIR=$( cd /var/www/nextcloud; sudo -u www-data php occ config:system:get datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?"; 
-    return 1;
-  }
-  [ -d "$SRCDIR" ] || { echo -e "data directory $SRCDIR not found"; return 1; }
-
-  [[ "$SRCDIR" == "$DATADIR_" ]] && { echo -e "INFO: data already there"; return 0; }
-
-  # checks
-  local BASEDIR=$( dirname "$DATADIR_" )
-
-  [ -d "$BASEDIR" ] || { echo "$BASEDIR does not exist"; return 1; }
-
-  # If the user chooses the root of the mountpoint, force a folder
-  mountpoint -q "$DATADIR_" && {
-    BASEDIR="$DATADIR_"
-    DATADIR_="$DATADIR_/ncdata"
-  }
-
-  grep -q -e ext -e btrfs <( stat -fc%T "$BASEDIR" ) || {
-    echo -e "Only ext/btrfs filesystems can hold the data directory"
-    return 1
-  }
-
-  sudo -u www-data test -x "$BASEDIR" || {
-    echo -e "ERROR: the user www-data does not have access permissions over $BASEDIR"
-    return 1
-  }
-
-  [[ $( stat -fc%d / ) == $( stat -fc%d "$BASEDIR" ) ]] && {
-    echo "Refusing to move to the SD card. Abort"
-    return 1
-  }
-
-  # backup possibly existing datadir
-  [ -d $DATADIR_ ] && {
-    local BKP="${DATADIR_}-$( date "+%m-%d-%y" )" 
-    echo "INFO: $DATADIR_ is not empty. Creating backup $BKP"
-    mv "$DATADIR_" "$BKP"
-  }
-
-
-  ## COPY
-  cd /var/www/nextcloud
-  sudo -u www-data php occ maintenance:mode --on
-
-  echo "moving data dir from $SRCDIR to $DATADIR_..."
-
-  # use subvolumes, if BTRFS
-  [[ "$( stat -fc%T "$BASEDIR" )" == "btrfs" ]] && {
-    echo "BTRFS filesystem detected"
-    btrfs subvolume create "$DATADIR_" || return 1
-  }
-
-  cp --reflink=auto -raT "$SRCDIR" "$DATADIR_" || return 1
-  chown www-data:www-data "$DATADIR_"
- 
-  # tmp upload dir
-  mkdir -p "$DATADIR_/tmp" 
-  chown www-data:www-data "$DATADIR_/tmp"
-  sudo -u www-data php occ config:system:set tempdirectory --value "$DATADIR_/tmp"
-  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR_/tmp|" /etc/php/${PHPVER}/cli/php.ini
-  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR_/tmp|" /etc/php/${PHPVER}/fpm/php.ini
-  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR_/tmp|"     /etc/php/${PHPVER}/fpm/php.ini
-
-  # opcache dir
-  sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$DATADIR_/.opcache|" /etc/php/${PHPVER}/mods-available/opcache.ini
-
-  # update fail2ban logpath
-  sed -i "s|logpath  =.*nextcloud.log|logpath  = $DATADIR_/nextcloud.log|" /etc/fail2ban/jail.conf
-
-  # datadir
-  sudo -u www-data php occ config:system:set datadirectory --value="$DATADIR_"
-  sudo -u www-data php occ config:system:set logfile --value="$DATADIR_/nextcloud.log"
-  sudo -u www-data php occ maintenance:mode --off
-}
-
-# 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/etc/ncp-config.d/nc-export-ncp.cfg b/etc/ncp-config.d/nc-export-ncp.cfg
new file mode 100644
index 00000000..4009a9e7
--- /dev/null
+++ b/etc/ncp-config.d/nc-export-ncp.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-export-ncp",
+  "name": "nc-export-ncp",
+  "title": "nc-export-ncp",
+  "description": "Export NextCloudPi configuration",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "DIR",
+      "name": "DIR",
+      "value": "/media/USBdrive/"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-export-ncp.sh b/etc/ncp-config.d/nc-export-ncp.sh
deleted file mode 100644
index ca1548e1..00000000
--- a/etc/ncp-config.d/nc-export-ncp.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-# Export NextCloudPi configuration
-#
-#
-# Copyleft 2017 by Courtney Hicks
-# GPL licensed (see end of file) * Use at your own risk!
-#
-
-DIR_=/media/USBdrive/
-
-DESCRIPTION="Export NextCloudPi configuration"
-
-configure() 
-{
-  [[ -d "$DIR_" ]] || { echo "directory $DIR_ does not exist"; return 1; }
-
-  local DESTFILE="$DIR_"/ncp-config_$( date +"%Y%m%d" ).tar 
-  rm -rf /tmp/ncp-export
-  mkdir -p /tmp/ncp-export
-  cd /tmp/ncp-export || return 1
-
-  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=""
-    for i in $( seq 0 1 $(( ${#VARS[@]} - 1 )) ); do
-      CONFIG+="${VARS[$i]}=${VALS[$i]}\n"
-    done
-    echo -e "$CONFIG" > "$( basename "$file" .sh ).cfg"
-  done
-
-  tar -cf "$DESTFILE" *
-  chmod 600 "$DESTFILE"
-
-  cd $OLDPWD
-  rm -rf /tmp/ncp-export
-  echo -e "configuration exported to $DESTFILE"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-fix-permissions.cfg b/etc/ncp-config.d/nc-fix-permissions.cfg
new file mode 100644
index 00000000..2737c2cd
--- /dev/null
+++ b/etc/ncp-config.d/nc-fix-permissions.cfg
@@ -0,0 +1,9 @@
+{
+  "id": "nc-fix-permissions",
+  "name": "nc-fix-permissions",
+  "title": "nc-fix-permissions",
+  "description": "Fix permissions for NC data files, in case they were copied externally",
+  "info": "",
+  "infotitle": "",
+  "params": []
+}
diff --git a/etc/ncp-config.d/nc-fix-permissions.sh b/etc/ncp-config.d/nc-fix-permissions.sh
deleted file mode 100644
index d1cb578e..00000000
--- a/etc/ncp-config.d/nc-fix-permissions.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Fix permissions of the data files, in case they were copied externally
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-DESCRIPTION="Fix permissions for NC data files, in case they were copied externally"
-
-configure() 
-{
-  local DATADIR
-  DATADIR=$( cd /var/www/nextcloud; sudo -u www-data php occ config:system:get datadirectory ) || {
-    echo "data dir not found";
-    return 1;
-  }
-  echo -ne "fixing permissions in $DATADIR... "
-  chown -R www-data:www-data "$DATADIR"/*/files
-  chmod -R u+rw              "$DATADIR"/*/files
-  echo "done"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-format-USB.cfg b/etc/ncp-config.d/nc-format-USB.cfg
new file mode 100644
index 00000000..7169520f
--- /dev/null
+++ b/etc/ncp-config.d/nc-format-USB.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-format-USB",
+  "name": "nc-format-USB",
+  "title": "nc-format-USB",
+  "description": "Format an external USB drive as a BTRFS partition (dangerous)",
+  "info": "Make sure that ONLY the USB drive that you want to format is plugged in.\ncareful, this will destroy any data in the USB drive\n\n** YOU WILL LOSE ALL YOUR USB DATA **",
+  "infotitle": "Instructions for USB drive formatting",
+  "params": [
+    {
+      "id": "LABEL",
+      "name": "LABEL",
+      "value": "myCloudDrive"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-format-USB.sh b/etc/ncp-config.d/nc-format-USB.sh
deleted file mode 100644
index dcd2a926..00000000
--- a/etc/ncp-config.d/nc-format-USB.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# Format a USB external drive as a unique BTRFS partition
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-LABEL_=myCloudDrive
-DESCRIPTION="Format an external USB drive as a BTRFS partition (dangerous)"
-
-INFOTITLE="Instructions for USB drive formatting" 
-INFO="Make sure that ONLY the USB drive that you want to format is plugged in.
-careful, this will destroy any data in the USB drive
-
-** YOU WILL LOSE ALL YOUR USB DATA **"
-
-configure() 
-{
-  # count all disk devices except mmcblk0
-  local NUM=$( lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $6 }' | wc -l )
-
-  # only one plugged in
-  [[ $NUM != 1 ]] && { 
-    echo "ERROR: counted $NUM devices. Please, only plug in the USB drive you want to format";
-    return 1; 
-  }
-
-  # disable nc-automount if enabled
-  killall -STOP udiskie 2>/dev/null
-
-  # umount if mounted
-  umount /media/USBdrive* &> /dev/null
-
-  # check still not mounted
-  for dir in $( ls -d /media/* 2>/dev/null ); do
-    mountpoint -q $dir && { echo "$dir is still mounted"; return 1; }
-  done
-
-  # do it
-  local NAME=( $( lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $1 }' ) )
-  [[ ${#NAME[@]} != 1 ]] && { echo "unexpected error"; return 1; }
-
-  wipefs -a -f /dev/"$NAME"                              || return 1
-  parted /dev/"$NAME" --script -- mklabel gpt            || return 2
-  parted /dev/"$NAME" --script -- mkpart primary 0% 100% || return 3
-  sleep 0.5
-  mkfs.btrfs -q /dev/"${NAME}1" -f -L "$LABEL_"
-  local RET=$?
-
-  # enable nc-automount if enabled
-  killall -CONT udiskie 2>/dev/null
-  [ $RET -eq 0 ] && echo "Drive $NAME formatted successfuly and labeled $LABEL_"
-  return $RET
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-forward-ports.cfg b/etc/ncp-config.d/nc-forward-ports.cfg
new file mode 100644
index 00000000..5491c1eb
--- /dev/null
+++ b/etc/ncp-config.d/nc-forward-ports.cfg
@@ -0,0 +1,20 @@
+{
+  "id": "nc-forward-ports",
+  "name": "nc-forward-ports",
+  "title": "nc-forward-ports",
+  "description": "Set port forwarding to access from outside (UPnP)",
+  "info": "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",
+  "infotitle": "Instructions for UPnP Port Forwarding",
+  "params": [
+    {
+      "id": "HTTPSPORT",
+      "name": "HTTPSPORT",
+      "value": "443"
+    },
+    {
+      "id": "HTTPPORT",
+      "name": "HTTPPORT",
+      "value": "80"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-forward-ports.sh b/etc/ncp-config.d/nc-forward-ports.sh
deleted file mode 100644
index 70560434..00000000
--- a/etc/ncp-config.d/nc-forward-ports.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-HTTPSPORT_=443
-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
-in your router. Activate it now on your router admin webpage.
-
-** UPnP is considered a security risk **
-
-Don't forget to disable it afterwards"
-
-install()
-{
-  apt-get update
-  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends miniupnpc
-}
-
-configure() 
-{
-  local IFACE=$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )
-  local IP=$( ip a show dev "$IFACE" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )
-  upnpc -d "$HTTPSPORT_" TCP
-  upnpc -d "$HTTPPORT_"  TCP
-  upnpc -a "$IP" 443 "$HTTPSPORT_" TCP | tee >(cat - >&2) | grep -q "is redirected to internal" || \
-    { echo -e "\nCould not forward ports automatically.\nDo it manually, or activate UPnP in your router and try again"; return 1; }
-  upnpc -a "$IP" 80  "$HTTPPORT_"  TCP | tee >(cat - >&2) | grep -q "is redirected to internal" || \
-    { echo -e "\nCould not forward ports automatically.\nDo it manually, or activate UPnP in your router and try again"; return 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/etc/ncp-config.d/nc-hdd-monitor.cfg b/etc/ncp-config.d/nc-hdd-monitor.cfg
new file mode 100644
index 00000000..045baccf
--- /dev/null
+++ b/etc/ncp-config.d/nc-hdd-monitor.cfg
@@ -0,0 +1,26 @@
+{
+  "id": "nc-hdd-monitor",
+  "name": "nc-hdd-monitor",
+  "title": "nc-hdd-monitor",
+  "description": "Monitor HDD health automatically",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "NOTIFYUSER",
+      "name": "NOTIFYUSER",
+      "value": "ncp"
+    },
+    {
+      "id": "EMAIL",
+      "name": "EMAIL",
+      "value": "optional@email.com"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-hdd-monitor.sh b/etc/ncp-config.d/nc-hdd-monitor.sh
deleted file mode 100644
index d6f2e60a..00000000
--- a/etc/ncp-config.d/nc-hdd-monitor.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-# Monitor HDD health automatically
-#
-# 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!
-#
-# More at https://ownyourbits.com
-#
-
-ACTIVE_=no
-NOTIFYUSER_=ncp
-EMAIL_=optional@email.com
-
-DESCRIPTION="Monitor HDD health automatically"
-
-is_active()
-{
-  systemctl -q is-enabled smartd &>/dev/null
-}
-
-configure()
-{
-  local DRIVES=($(lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $1 }'))
-
-  [[ ${#DRIVES[@]} == 0 ]] && {
-    echo "no drives detected. Disabling.."
-    ACTIVE_=no
-  }
-
-  [[ "$ACTIVE_" != yes ]] && {
-    systemctl disable smartd
-    systemctl stop smartd
-    echo "HDD monitor disabled"
-    return 0
-  }
-
-  cat > /etc/smartd.conf <<EOF
-# short scan every day at 1am, long one on sundays at 2am
-DEVICESCAN -a -m $EMAIL_ -M exec /usr/local/etc/ncp-hdd-notif.sh -s (S/../.././01|L/../../7/02)
-EOF
-
-  cat > /usr/local/etc/ncp-hdd-notif.sh <<EOF
-#!/bin/bash
-EOF
-
-  [[ "$EMAIL_" != "" ]] && {
-    cat >> /usr/local/etc/ncp-hdd-notif.sh <<EOF
-sendmail "$EMAIL_" <<EOFMAIL
-Subject: Hard drive problems found
-
-"\$SMARTD_MESSAGE"
-EOFMAIL
-EOF
-  }
-
-  cat >> /usr/local/etc/ncp-hdd-notif.sh <<EOF
-wall "\$SMARTD_MESSAGE"
-sudo -u www-data php /var/www/nextcloud/occ notification:generate \
-  $NOTIFYUSER_ "NextCloudPi HDD health \$SMARTD_FAILTYPE" \
-     -l "\$SMARTD_MESSAGE"
-EOF
-chmod +x /usr/local/etc/ncp-hdd-notif.sh
-
-  for dr in "${DRIVES[@]}"; do smartctl --smart=on /dev/${dr} | sed 1,2d; done
-  systemctl enable smartd
-  systemctl start smartd
-  echo "HDD monitor enabled"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-hdd-test.cfg b/etc/ncp-config.d/nc-hdd-test.cfg
new file mode 100644
index 00000000..8514d019
--- /dev/null
+++ b/etc/ncp-config.d/nc-hdd-test.cfg
@@ -0,0 +1,22 @@
+{
+  "id": "nc-hdd-test",
+  "name": "nc-hdd-test",
+  "title": "nc-hdd-test",
+  "description": "Check HDD health",
+  "info": "Running no test will display test results",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "SHORTTEST",
+      "name": "SHORTTEST",
+      "value": "yes",
+      "type": "bool"
+    },
+    {
+      "id": "LONGTEST",
+      "name": "LONGTEST",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-hdd-test.sh b/etc/ncp-config.d/nc-hdd-test.sh
deleted file mode 100644
index 8490b40f..00000000
--- a/etc/ncp-config.d/nc-hdd-test.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Check HDD health
-#
-# 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!
-#
-# More at https://ownyourbits.com
-#
-
-SHORTTEST_=yes
-LONGTEST_=no
-DESCRIPTION="Check HDD health"
-
-INFO="Running no test will display test results"
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y smartmontools
-  systemctl disable smartd
-  systemctl stop smartd
-}
-
-configure()
-{
-  local DRIVES=($(lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $1 }'))
-
-  [[ ${#DRIVES[@]} == 0 ]] && {
-    echo "no drives detected. Abort"
-    return 0
-  }
-
-  for dr in "${DRIVES[@]}"; do
-    smartctl --smart=on /dev/${dr} | sed 1,2d
-    if [[ "$SHORTTEST_" == yes ]]; then
-      echo "* Starting test on $dr. Check results later"
-      smartctl -X "/dev/$dr" &>/dev/null
-      smartctl -t short "/dev/$dr" | sed 1,2d
-    elif [[ "$LONGTEST_" == yes ]]; then
-      echo "* Starting test on $dr. Check results later"
-      smartctl -X "/dev/$dr" &>/dev/null
-      smartctl -t long "/dev/$dr" | sed 1,2d
-    else
-      echo "* Stats for $dr"
-      smartctl -a "/dev/$dr" | sed 1,2d
-    fi
-  done
-}
-
-# 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/etc/ncp-config.d/nc-httpsonly.cfg b/etc/ncp-config.d/nc-httpsonly.cfg
new file mode 100644
index 00000000..e1eb831e
--- /dev/null
+++ b/etc/ncp-config.d/nc-httpsonly.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-httpsonly",
+  "name": "nc-httpsonly",
+  "title": "nc-httpsonly",
+  "description": "Force HTTPS",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "yes",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-httpsonly.sh b/etc/ncp-config.d/nc-httpsonly.sh
deleted file mode 100644
index 9e544897..00000000
--- a/etc/ncp-config.d/nc-httpsonly.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/
-#
-
-ACTIVE_=yes
-DESCRIPTION="Force HTTPS"
-
-configure()
-{
-  [[ $ACTIVE_ == "no" ]] && local OPT=Off || local OPT=On
-  sed -i "s|RewriteEngine .*|RewriteEngine $OPT|" /etc/apache2/sites-available/000-default.conf
-  echo "Forcing HTTPS $OPT"
-
-  # delayed in bg so it does not kill the connection, and we get AJAX response
-  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-import-ncp.cfg b/etc/ncp-config.d/nc-import-ncp.cfg
new file mode 100644
index 00000000..01a8ab2d
--- /dev/null
+++ b/etc/ncp-config.d/nc-import-ncp.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-import-ncp",
+  "name": "nc-import-ncp",
+  "title": "nc-import-ncp",
+  "description": "Import NextCloudPi configuration from file",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "FILE",
+      "name": "FILE",
+      "value": "/media/USBdrive/ncp-config_xxxxxx.cfg"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-import-ncp.sh b/etc/ncp-config.d/nc-import-ncp.sh
deleted file mode 100644
index 97e9de99..00000000
--- a/etc/ncp-config.d/nc-import-ncp.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Import NextCloudPi configuration
-#
-#
-# Copyleft 2017 by Courtney Hicks
-# GPL licensed (see end of file) * Use at your own risk!
-#
-
-FILE_=/media/USBdrive/ncp-config_xxxxxx.cfg
-
-DESCRIPTION="Import NextCloudPi 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/ncp-config.d   || return 1
-
-  # extract export
-  local TMP="/tmp/ncp-export"
-  rm -rf "$TMP"
-  mkdir -p "$TMP"
-  tar -xf "$FILE_" -C "$TMP"
-
-  # UGLY workaround to prevent apache from restarting upon activating some extras
-  # which leads to the operation appearing to fail in ncp-web
-  echo "invalid_op" >> /etc/apache2/sites-available/000-default.conf
-
-  # restore configuration and activate
-  for file in /"$TMP"/*; do
-    local SCRIPT="$( basename "$file" .cfg ).sh"
-
-    # restore
-    [ -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
-        sed -i "s|^${VARS[$i]}_=.*|${VARS[$i]}_=${VALS[$i]}|" "$SCRIPT"
-      done
-    }
-
-    # activate
-    grep -q "^ACTIVE_=yes" "$SCRIPT" && echo && activate_script "$SCRIPT"
-  done
-
-  # Fix invalid configuration
-  sed -i "/^invalid_op/d" /etc/apache2/sites-available/000-default.conf
-
-  # cleanup
-  rm -rf "$TMP"
-  echo -e "\nconfiguration restored"
-
-  # delayed in bg so it does not kill the connection, and we get AJAX response
-  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-info.cfg b/etc/ncp-config.d/nc-info.cfg
new file mode 100644
index 00000000..8f902c02
--- /dev/null
+++ b/etc/ncp-config.d/nc-info.cfg
@@ -0,0 +1,9 @@
+{
+  "id": "nc-info",
+  "name": "nc-info",
+  "title": "nc-info",
+  "description": "Print NextCloudPi system info",
+  "info": "",
+  "infotitle": "",
+  "params": []
+}
diff --git a/etc/ncp-config.d/nc-info.sh b/etc/ncp-config.d/nc-info.sh
deleted file mode 100644
index d03c53c1..00000000
--- a/etc/ncp-config.d/nc-info.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# Print NCP sytem info
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-DESCRIPTION="Print NextCloudPi system info"
-
-install()
-{ 
-  apt-get update
-  apt-get install -y --no-install-recommends bsdmainutils
-}
-
-configure() 
-{
-  echo "Gathering information..."
-  local OUT="$( bash /usr/local/bin/ncp-diag )"
-
-  # info
-  echo "$OUT" | column -t -s'|'
-
-  # suggestions
-  echo
-  bash /usr/local/bin/ncp-suggestions "$OUT"
- 
-  return 0
-}
-
-# 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/etc/ncp-config.d/nc-init.cfg b/etc/ncp-config.d/nc-init.cfg
new file mode 100644
index 00000000..48149829
--- /dev/null
+++ b/etc/ncp-config.d/nc-init.cfg
@@ -0,0 +1,20 @@
+{
+  "id": "nc-init",
+  "name": "nc-init",
+  "title": "nc-init",
+  "description": "(Re)initiate Nextcloud to a clean configuration",
+  "info": "This action will configure NextCloud to NextCloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n",
+  "infotitle": "Clean NextCloud configuration",
+  "params": [
+    {
+      "id": "ADMINUSER",
+      "name": "ADMINUSER",
+      "value": "ncp"
+    },
+    {
+      "id": "ADMINPASS",
+      "name": "ADMINPASS",
+      "value": "ownyourbits"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-init.sh b/etc/ncp-config.d/nc-init.sh
deleted file mode 100644
index 961b1c94..00000000
--- a/etc/ncp-config.d/nc-init.sh
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/bin/bash
-
-# Init NextCloud database and perform initial 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-ADMINUSER_=ncp
-ADMINPASS_=ownyourbits
-DBADMIN=ncadmin
-DESCRIPTION="(Re)initiate Nextcloud to a clean configuration"
-
-INFOTITLE="Clean NextCloud configuration"
-INFO="This action will configure NextCloud to NextCloudPi defaults.
-
-** YOUR CONFIGURATION WILL BE LOST **
-
-"
-
-PHPVER=7.2
-
-configure()
-{
-  echo "Setting up a clean Nextcloud instance... wait until message 'NC init done'"
-
-  # checks
-  local REDISPASS=$( grep "^requirepass" /etc/redis/redis.conf  | cut -d' ' -f2 )
-  [[ "$REDISPASS" == "" ]] && { echo "redis server without a password. Abort"; return 1; }
-
-  ## RE-CREATE DATABASE TABLE 
-
-  echo "Setting up database..."
-
-  # launch mariadb if not already running
-  if ! pgrep -c mysqld &>/dev/null; then
-    mysqld & 
-  fi
-
-  # wait for mariadb
-  pgrep -x mysqld &>/dev/null || { 
-    echo "mariaDB process not found. Waiting..."
-    while :; do
-      [[ -S /run/mysqld/mysqld.sock ]] && break
-      sleep 0.5
-    done
-  }
-
-  # workaround to emulate DROP USER IF EXISTS ..;)
-  local DBPASSWD=$( grep password /root/.my.cnf | sed 's|password=||' )
-  mysql <<EOF
-DROP DATABASE IF EXISTS nextcloud;
-CREATE DATABASE nextcloud
-    CHARACTER SET utf8mb4
-    COLLATE utf8mb4_unicode_ci;
-GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
-DROP USER '$DBADMIN'@'localhost';
-CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
-GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
-EXIT
-EOF
-
-  ## INITIALIZE NEXTCLOUD
-
-  # make sure redis is running first
-  if ! pgrep -c redis-server &>/dev/null; then
-    mkdir -p /var/run/redis
-    chown redis /var/run/redis
-    sudo -u redis redis-server /etc/redis/redis.conf &
-  fi
-
-  while :; do
-    [[ -S /run/redis/redis.sock ]] && break
-    sleep 0.5
-  done
-
-
-  echo "Setting up Nextcloud..."
-
-  cd /var/www/nextcloud/
-  rm -f config/config.php
-  sudo -u www-data php occ maintenance:install --database \
-    "mysql" --database-name "nextcloud"  --database-user "$DBADMIN" --database-pass \
-    "$DBPASSWD" --admin-user "$ADMINUSER_" --admin-pass "$ADMINPASS_"
-
-  # cron jobs
-  sudo -u www-data php occ background:cron
-
-  # redis cache
-  sed -i '$d' config/config.php
-  cat >> config/config.php <<EOF
-  'memcache.local' => '\\OC\\Memcache\\Redis',
-  'memcache.locking' => '\\OC\\Memcache\\Redis',
-  'redis' =>
-  array (
-    'host' => '/var/run/redis/redis.sock',
-    'port' => 0,
-    'timeout' => 0.0,
-    'password' => '$REDISPASS',
-  ),
-);
-EOF
-
-  # tmp upload dir
-  local UPLOADTMPDIR=/var/www/nextcloud/data/tmp
-  mkdir -p "$UPLOADTMPDIR"
-  chown www-data:www-data "$UPLOADTMPDIR"
-  sudo -u www-data php occ config:system:set tempdirectory --value "$UPLOADTMPDIR"
-  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/${PHPVER}/cli/php.ini
-  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $UPLOADTMPDIR|" /etc/php/${PHPVER}/fpm/php.ini
-  sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $UPLOADTMPDIR|"     /etc/php/${PHPVER}/fpm/php.ini
-
-
-  # 4 Byte UTF8 support
-  sudo -u www-data php occ config:system:set mysql.utf8mb4 --type boolean --value="true"
-
-  # 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"
-  # trusted_domains 6 used by docker
-  sudo -u www-data php occ config:system:set trusted_domains 7 --value="nextcloudpi"
-  sudo -u www-data php occ config:system:set trusted_domains 8 --value="nextcloudpi.lan"
-
-  # email
-  sudo -u www-data php occ config:system:set mail_smtpmode     --value="sendmail"
-  sudo -u www-data php occ config:system:set mail_smtpauthtype --value="LOGIN"
-  sudo -u www-data php occ config:system:set mail_from_address --value="admin"
-  sudo -u www-data php occ config:system:set mail_domain       --value="ownyourbits.com"
-
-  # NCP theme
-  [[ -e /usr/local/etc/logo ]] && {
-    local ID=$( grep instanceid config/config.php | awk -F "=> " '{ print $2 }' | sed "s|[,']||g" )
-    [[ "$ID" == "" ]] && { echo "failed to get ID"; return 1; }
-    mkdir -p data/appdata_${ID}/theming/images
-    cp /usr/local/etc/logo /usr/local/etc/background data/appdata_${ID}/theming/images
-    chown -R www-data:www-data data/appdata_${ID}
-  }
-
-  mysql nextcloud <<EOF
-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"           );
-replace into  oc_appconfig values ( 'theming', 'backgroundMime', "image/png"               );
-EOF
-
-  # enable some apps by default
-  sudo -u www-data php /var/www/nextcloud/occ app:install calendar
-  sudo -u www-data php /var/www/nextcloud/occ app:install contacts
-  sudo -u www-data php /var/www/nextcloud/occ app:install notes
-  sudo -u www-data php /var/www/nextcloud/occ app:install tasks
-  sudo -u www-data php /var/www/nextcloud/occ app:install news
-  sudo -u www-data php /var/www/nextcloud/occ app:install admin_notifications
-  sudo -u www-data php /var/www/nextcloud/occ app:install previewgenerator
-
-  sudo -u www-data php /var/www/nextcloud/occ app:enable calendar
-  sudo -u www-data php /var/www/nextcloud/occ app:enable contacts
-  sudo -u www-data php /var/www/nextcloud/occ app:enable notes
-  sudo -u www-data php /var/www/nextcloud/occ app:enable tasks
-  sudo -u www-data php /var/www/nextcloud/occ app:enable news
-  sudo -u www-data php /var/www/nextcloud/occ app:enable admin_notifications
-  sudo -u www-data php /var/www/nextcloud/occ app:enable previewgenerator
-
-  # other
-  sudo -u www-data php /var/www/nextcloud/occ config:system:set overwriteprotocol --value=https
-
-  echo "NC init done"
-}
-
-install(){ :; }
-
-# 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/etc/ncp-config.d/nc-limits.cfg b/etc/ncp-config.d/nc-limits.cfg
new file mode 100644
index 00000000..9f5982bd
--- /dev/null
+++ b/etc/ncp-config.d/nc-limits.cfg
@@ -0,0 +1,30 @@
+{
+  "id": "nc-limits",
+  "name": "nc-limits",
+  "title": "nc-limits",
+  "description": "Configure system limits for NextCloudPi",
+  "info": "Examples: 200M or 2G. Write 0 for autoconfig",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "MAXFILESIZE",
+      "name": "MAXFILESIZE",
+      "value": "10G"
+    },
+    {
+      "id": "MEMORYLIMIT",
+      "name": "MEMORYLIMIT",
+      "value": "0"
+    },
+    {
+      "id": "PHPTHREADS",
+      "name": "PHPTHREADS",
+      "value": "0"
+    },
+    {
+      "id": "REDISMEM",
+      "name": "REDISMEM",
+      "value": "0"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh
deleted file mode 100644
index 545aa5b1..00000000
--- a/etc/ncp-config.d/nc-limits.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/2017/03/13/nextcloudpi-gets-nextcloudpi-config/
-#
-
-MAXFILESIZE_=10G
-MEMORYLIMIT_=0
-PHPTHREADS_=0
-REDISMEM_=0
-PHPVER=7.2
-
-DESCRIPTION="Configure system limits for NextCloudPi"
-INFO="Examples: 200M or 2G. Write 0 for autoconfig"
-
-configure()
-{
-  # Set auto memory limit to 75% of the total memory
-  local TOTAL_MEM="$( free -b | sed -n 2p | awk '{ print $2 }' )"
-  AUTOMEM=$(( TOTAL_MEM * 75 / 100 ))
-
-  # MAX FILESIZE
-  local CONF=/var/www/nextcloud/.user.ini
-  local CURRENT_FILE_SIZE="$( grep "^upload_max_filesize" "$CONF" | sed 's|.*=||' )"
-  [[ "$MAXFILESIZE_" == "0" ]] && MAXFILESIZE_=10G
-
-  # MAX PHP MEMORY
-  local CONF=/var/www/nextcloud/.user.ini
-  local CURRENT_PHP_MEM="$( grep "^memory_limit" "$CONF" | sed 's|.*=||' )"
-  [[ "$MEMORYLIMIT_" == "0" ]] && MEMORYLIMIT_=$AUTOMEM && echo "Using ${AUTOMEM}B for PHP"
-  sed -i "s/^post_max_size=.*/post_max_size=$MAXFILESIZE_/"             "$CONF" 
-  sed -i "s/^upload_max_filesize=.*/upload_max_filesize=$MAXFILESIZE_/" "$CONF" 
-  sed -i "s/^memory_limit=.*/memory_limit=$MEMORYLIMIT_/"               "$CONF" 
-
-  # MAX PHP THREADS
-  local CONF=/etc/php/${PHPVER}/fpm/pool.d/www.conf
-  local CURRENT_THREADS=$( grep "^pm.max_children" "$CONF" | awk '{ print $3 }' )
-  [[ "$PHPTHREADS_" == "0" ]] && PHPTHREADS_=$( nproc ) && echo "Using $PHPTHREADS_ PHP threads"
-  sed -i "s|^pm.max_children =.*|pm.max_children = $PHPTHREADS_|"           "$CONF"
-  sed -i "s|^pm.max_spare_servers =.*|pm.max_spare_servers = $PHPTHREADS_|" "$CONF"
-  sed -i "s|^pm.start_servers =.*|pm.start_servers = $PHPTHREADS_|"         "$CONF"
-
-  # RESTART PHP
-  [[ "$PHPTHREADS_"  != "$CURRENT_THREADS"   ]] || \
-  [[ "$MEMORYLIMIT"  != "$CURRENT_PHP_MEM"   ]] || \
-  [[ "$MAXFILESIZE_" != "$CURRENT_FILE_SIZE" ]] && \
-    bash -c "sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
-
-  # redis max memory
-  local CONF=/etc/redis/redis.conf
-  local CURRENT_REDIS_MEM=$( grep "^maxmemory" "$CONF" | awk '{ print $2 }' )
-  [[ "$REDISMEM_" == "0" ]] && REDISMEM_=$AUTOMEM && echo "Using ${AUTOMEM}B for Redis"
-  [[ "$REDISMEM_" != "$CURRENT_REDIS_MEM" ]] && {
-    sed -i "s|^maxmemory .*|maxmemory $REDISMEM_|" "$CONF"
-    service redis-server restart
-  }
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
new file mode 100644
index 00000000..89288726
--- /dev/null
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -0,0 +1,36 @@
+{
+  "id": "nc-nextcloud",
+  "name": "nc-nextcloud",
+  "title": "nc-nextcloud",
+  "description": "Install any NextCloud version",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "VER",
+      "name": "VER",
+      "value": "14.0.4"
+    },
+    {
+      "id": "BETA",
+      "name": "BETA",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "MAXFILESIZE",
+      "name": "MAXFILESIZE",
+      "value": "2G"
+    },
+    {
+      "id": "MEMORYLIMIT",
+      "name": "MEMORYLIMIT",
+      "value": "768M"
+    },
+    {
+      "id": "MAXTRANSFERTIME",
+      "name": "MAXTRANSFERTIME",
+      "value": "3600"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
deleted file mode 100644
index af39bcb7..00000000
--- a/etc/ncp-config.d/nc-nextcloud.sh
+++ /dev/null
@@ -1,266 +0,0 @@
-#!/bin/bash
-
-# Nextcloud installation on Raspbian over LAMP base
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-VER_=14.0.4
-BETA_=no
-MAXFILESIZE_=2G
-MEMORYLIMIT_=768M
-MAXTRANSFERTIME_=3600
-DBADMIN=ncadmin
-REDIS_MEM=3gb
-PHPVER=7.2
-DESCRIPTION="Install any NextCloud version"
-
-APTINSTALL="apt-get install -y --no-install-recommends"
-export DEBIAN_FRONTEND=noninteractive
-
-[ -d /var/www/nextcloud ] && {                        # don't show this during image build
-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
-
-** perform backup before proceding **
-
-You can use nc-backup "
-}
-
-install()
-{
-  # During build, this step is run before ncp.sh. Avoid executing twice
-  [[ -f /usr/lib/systemd/system/nc-provisioning.service ]] && return 0
-
-  local RELEASE=stretch
-
-  # Optional packets for Nextcloud and Apps
-  apt-get update
-  $APTINSTALL lbzip2 iputils-ping
-  $APTINSTALL -t $RELEASE php-smbclient                                         # for external storage
-  $APTINSTALL -t $RELEASE imagemagick php${PHPVER}-imagick php${PHPVER}-exif    # for gallery
-
-
-  # POSTFIX
-  $APTINSTALL postfix || {
-    # [armbian] workaround for bug - https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1531299
-    echo "[NCP] Please, ignore the previous postfix installation error ..."
-    mv /usr/bin/newaliases /
-    ln -s /bin/true /usr/bin/newaliases
-    $APTINSTALL postfix
-    rm /usr/bin/newaliases
-    mv /newaliases /usr/bin/newaliases
-  }
- 
-  $APTINSTALL redis-server
-  $APTINSTALL -t $RELEASE php${PHPVER}-redis
-
-  local REDIS_CONF=/etc/redis/redis.conf
-  local REDISPASS="default"
-  sed -i "s|# unixsocket .*|unixsocket /var/run/redis/redis.sock|" $REDIS_CONF
-  sed -i "s|# unixsocketperm .*|unixsocketperm 770|"               $REDIS_CONF
-  sed -i "s|# requirepass .*|requirepass $REDISPASS|"              $REDIS_CONF
-  sed -i 's|# maxmemory-policy .*|maxmemory-policy allkeys-lru|'   $REDIS_CONF
-  sed -i 's|# rename-command CONFIG ""|rename-command CONFIG ""|'  $REDIS_CONF
-  sed -i "s|^port.*|port 0|"                                       $REDIS_CONF
-  echo "maxmemory $REDIS_MEM" >> $REDIS_CONF
-  echo 'vm.overcommit_memory = 1' >> /etc/sysctl.conf
-
-  usermod -a -G redis www-data
-
-  service redis-server restart
-  update-rc.d redis-server enable
-  service php${PHPVER}-fpm restart
-  
-  # service to randomize passwords on first boot
-  mkdir -p /usr/lib/systemd/system
-  cat > /usr/lib/systemd/system/nc-provisioning.service <<'EOF'
-[Unit]
-Description=Randomize passwords on first boot
-Requires=network.target
-After=mysql.service redis.service
-
-[Service]
-ExecStart=/bin/bash /usr/local/bin/ncp-provisioning.sh
-
-[Install]
-WantedBy=multi-user.target
-EOF
-  [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nc-provisioning
-  return 0
-}
-
-configure()
-{
-  ## IF BETA SELECTED ADD "pre" to DOWNLOAD PATH
-  [[ "$BETA_" == yes ]] && local PREFIX="pre"
-    
-  ## DOWNLOAD AND (OVER)WRITE NEXTCLOUD
-  cd /var/www/
-
-  local URL="https://download.nextcloud.com/server/${PREFIX}releases/nextcloud-$VER_.tar.bz2"
-  echo "Downloading Nextcloud $VER_..."
-  wget -q "$URL" -O nextcloud.tar.bz2 || {
-    echo "couldn't download $URL"
-    return 1
-  }
-  rm -rf nextcloud
-
-  echo "Installing  Nextcloud $VER_..."
-  tar -xf nextcloud.tar.bz2
-  rm nextcloud.tar.bz2
-
-  ## CONFIGURE FILE PERMISSIONS
-  local ocpath='/var/www/nextcloud'
-  local htuser='www-data'
-  local htgroup='www-data'
-  local rootuser='root'
-
-  printf "Creating possible missing Directories\n"
-  mkdir -p $ocpath/data
-  mkdir -p $ocpath/updater
-
-  printf "chmod Files and Directories\n"
-  find ${ocpath}/ -type f -print0 | xargs -0 chmod 0640
-  find ${ocpath}/ -type d -print0 | xargs -0 chmod 0750
-
-  printf "chown Directories\n"
-
-  chown -R ${htuser}:${htgroup} ${ocpath}/
-  chown -R ${htuser}:${htgroup} ${ocpath}/apps/
-  chown -R ${htuser}:${htgroup} ${ocpath}/config/
-  chown -R ${htuser}:${htgroup} ${ocpath}/data/
-  chown -R ${htuser}:${htgroup} ${ocpath}/themes/
-  chown -R ${htuser}:${htgroup} ${ocpath}/updater/
-
-  chmod +x ${ocpath}/occ
-
-  printf "chmod/chown .htaccess\n"
-  if [ -f ${ocpath}/.htaccess ]; then
-    chmod 0644 ${ocpath}/.htaccess
-    chown ${htuser}:${htgroup} ${ocpath}/.htaccess
-  fi
-  if [ -f ${ocpath}/data/.htaccess ]; then
-    chmod 0644 ${ocpath}/data/.htaccess
-    chown ${htuser}:${htgroup} ${ocpath}/data/.htaccess
-  fi
-
-  # create and configure opcache dir
-  local OPCACHEDIR=/var/www/nextcloud/data/.opcache
-  sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$OPCACHEDIR|" /etc/php/${PHPVER}/mods-available/opcache.ini
-  mkdir -p $OPCACHEDIR
-  chown -R www-data:www-data $OPCACHEDIR
-
-  ## RE-CREATE DATABASE TABLE 
-  # launch mariadb if not already running (for docker build)
-  if ! pgrep -c mysqld &>/dev/null; then
-    echo "Starting mariaDB"
-    mysqld & 
-  fi
-
-  # wait for mariadb
-  pgrep -x mysqld &>/dev/null || echo "mariaDB process not found"
-
-  while :; do
-    [[ -S /var/run/mysqld/mysqld.sock ]] && break
-    sleep 0.5
-  done
-
-  echo "Setting up database..."
-
-  # workaround to emulate DROP USER IF EXISTS ..;)
-  local DBPASSWD=$( grep password /root/.my.cnf | sed 's|password=||' )
-  mysql <<EOF
-DROP DATABASE IF EXISTS nextcloud;
-CREATE DATABASE nextcloud
-    CHARACTER SET utf8mb4
-    COLLATE utf8mb4_unicode_ci;
-GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
-DROP USER '$DBADMIN'@'localhost';
-CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
-GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
-EXIT
-EOF
-
-## SET APACHE VHOST
-  echo "Setting up Apache..."
-  cat > /etc/apache2/sites-available/nextcloud.conf <<'EOF'
-<IfModule mod_ssl.c>
-  <VirtualHost _default_:443>
-    DocumentRoot /var/www/nextcloud
-    CustomLog /var/log/apache2/nc-access.log combined
-    ErrorLog  /var/log/apache2/nc-error.log
-    SSLEngine on
-    SSLCertificateFile      /etc/ssl/certs/ssl-cert-snakeoil.pem
-    SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-  </VirtualHost>
-  <Directory /var/www/nextcloud/>
-    Options +FollowSymlinks
-    AllowOverride All
-    <IfModule mod_dav.c>
-      Dav off
-    </IfModule>
-    LimitRequestBody 0
-    SSLRenegBufferSize 10486000
-  </Directory>
-</IfModule>
-EOF
-  a2ensite nextcloud
-
-  cat > /etc/apache2/sites-available/000-default.conf <<'EOF'
-<VirtualHost _default_:80>
-  DocumentRoot /var/www/nextcloud
-  <IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-  </IfModule>
-</VirtualHost>
-EOF
-
-  # some added security
-  sed -i 's|^ServerSignature .*|ServerSignature Off|' /etc/apache2/conf-enabled/security.conf
-  sed -i 's|^ServerTokens .*|ServerTokens Prod|'      /etc/apache2/conf-enabled/security.conf
-
-  echo "Setting up system..."
-
-  ## SET LIMITS
-  sed -i "s/post_max_size=.*/post_max_size=$MAXFILESIZE_/"             /var/www/nextcloud/.user.ini 
-  sed -i "s/upload_max_filesize=.*/upload_max_filesize=$MAXFILESIZE_/" /var/www/nextcloud/.user.ini 
-  sed -i "s/memory_limit=.*/memory_limit=$MEMORYLIMIT_/"               /var/www/nextcloud/.user.ini 
-
-  # slow transfers will be killed after this time
-  cat >> /var/www/nextcloud/.user.ini <<< "max_execution_time=$MAXTRANSFERTIME_"
-  cat >> /var/www/nextcloud/.user.ini <<< "max_input_time=$MAXTRANSFERTIME_"
-
-  ## SET CRON
-  echo "*/15  *  *  *  * php -f /var/www/nextcloud/cron.php" > /tmp/crontab_http
-  crontab -u www-data /tmp/crontab_http
-  rm /tmp/crontab_http
-  
-  echo "Don't forget to run nc-init"
-}
-
-# 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/etc/ncp-config.d/nc-notify-updates.cfg b/etc/ncp-config.d/nc-notify-updates.cfg
new file mode 100644
index 00000000..577c8ccd
--- /dev/null
+++ b/etc/ncp-config.d/nc-notify-updates.cfg
@@ -0,0 +1,21 @@
+{
+  "id": "nc-notify-updates",
+  "name": "nc-notify-updates",
+  "title": "nc-notify-updates",
+  "description": "Notify in NC when a NextCloudPi update is available",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "yes",
+      "type": "bool"
+    },
+    {
+      "id": "USER",
+      "name": "USER",
+      "value": "ncp"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-notify-updates.sh b/etc/ncp-config.d/nc-notify-updates.sh
deleted file mode 100644
index c66c9ddf..00000000
--- a/etc/ncp-config.d/nc-notify-updates.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=yes
-USER_=ncp
-
-DESCRIPTION="Notify in NC when a NextCloudPi update is available"
-
-# check every hour
-CHECKINTERVAL=1
-NCDIR=/var/www/nextcloud
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && {
-    rm -f /etc/cron.d/ncp-notify-updates
-    service cron restart
-    echo "update web notifications disabled"
-    return 0
-  }
-
-  # code
-  cat > /usr/local/bin/ncp-notify-update <<EOF
-#!/bin/bash
-VERFILE=/usr/local/etc/ncp-version
-LATEST=/var/run/.ncp-latest-version
-NOTIFIED=/var/run/.ncp-version-notified
-
-test -e \$LATEST || 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" 
-  exit 0
-}
-
-echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Sending notification..."
-
-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_ "NextCloudPi update" \
-     -l "Update from \$( cat \$VERFILE ) to \$( cat \$LATEST ) is available. Update from https://\$IP:4443"
-
-cat \$LATEST > \$NOTIFIED
-EOF
-  chmod +x /usr/local/bin/ncp-notify-update
-
-  cat > /usr/local/bin/ncp-notify-unattended-upgrade <<EOF
-#!/bin/bash
-
-LOGFILE=/var/log/unattended-upgrades/unattended-upgrades.log
-STAMPFILE=/var/run/.ncp-notify-unattended-upgrades
-VERFILE=/usr/local/etc/ncp-version
-
-test -e "\$LOGFILE" || { echo "\$LOGFILE not found"; exit 1; }
-
-# find lines with package updates
-LINE=\$( grep "INFO Packages that will be upgraded:" "\$LOGFILE" )
-
-[[ "\$LINE" == "" ]] && { echo "no new upgrades"; exit 0; }
-
-# extract package names
-PKGS=\$( sed 's|^.*Packages that will be upgraded: ||' <<< "\$LINE" | tr '\\n' ' ' )
-
-# mark lines as read
-sed -i 's|INFO Packages that will be upgraded:|INFO Packages that will be upgraded :|' \$LOGFILE
-
-echo -e "Packages automatically upgraded: \$PKGS\\n"
-
-# notify
-sudo -u www-data php /var/www/nextcloud/occ notification:generate \
-  $USER_ "NextCloudPi Unattended Upgrades" \
-     -l "Packages automatically upgraded \$PKGS"
-EOF
-  chmod +x /usr/local/bin/ncp-notify-unattended-upgrade
-
-  # check every hour at 40th minute
-  echo "40  */${CHECKINTERVAL} *  *  *  root /usr/local/bin/ncp-notify-update && /usr/local/bin/ncp-notify-unattended-upgrade" > /etc/cron.d/ncp-notify-updates
-  [[ -f /run/crond.pid ]] && service cron restart
-
-  echo "update web notifications enabled"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-passwd.cfg b/etc/ncp-config.d/nc-passwd.cfg
new file mode 100644
index 00000000..fb2ccfd3
--- /dev/null
+++ b/etc/ncp-config.d/nc-passwd.cfg
@@ -0,0 +1,20 @@
+{
+  "id": "nc-passwd",
+  "name": "nc-passwd",
+  "title": "nc-passwd",
+  "description": "Change password for the NextCloudPi Panel",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "PASSWORD",
+      "name": "PASSWORD",
+      "value": "ownyourbits"
+    },
+    {
+      "id": "CONFIRM",
+      "name": "CONFIRM",
+      "value": "ownyourbits"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-passwd.sh b/etc/ncp-config.d/nc-passwd.sh
deleted file mode 100644
index 1cb54775..00000000
--- a/etc/ncp-config.d/nc-passwd.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Change password for the ncp-web user
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-PASSWORD_=ownyourbits
-CONFIRM_=ownyourbits
-
-DESCRIPTION="Change password for the NextCloudPi Panel"
-
-configure()
-{
-  # update password
-  echo -e "$PASSWORD_\n$CONFIRM_" | passwd ncp &>/dev/null && \
-    echo "password updated successfully" || \
-    { echo "passwords do not match"; return 1; }
-
-  # persist ncp-web password in docker container
-  [[ -f /.docker-image ]] && {
-    mv /etc/shadow /data/etc/shadow
-    ln -s /data/etc/shadow /etc/shadow
-  }
-
-  # Run cron.php once now to get all checks right in CI.
-  sudo -u www-data php /var/www/nextcloud/cron.php
-
-  # activate NCP
-  a2ensite  ncp nextcloud
-  a2dissite ncp-activation
-  bash -c "sleep 1.5 && service apache2 reload" &>/dev/null &
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-prettyURL.cfg b/etc/ncp-config.d/nc-prettyURL.cfg
new file mode 100644
index 00000000..e51d967e
--- /dev/null
+++ b/etc/ncp-config.d/nc-prettyURL.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-prettyURL",
+  "name": "nc-prettyURL",
+  "title": "nc-prettyURL",
+  "description": "Set pretty URLs (no index.php in URL)",
+  "info": "",
+  "infotitle": "PrettyURL notes",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-prettyURL.sh b/etc/ncp-config.d/nc-prettyURL.sh
deleted file mode 100644
index 0039f5f3..00000000
--- a/etc/ncp-config.d/nc-prettyURL.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-#
-# Activate/deactivate a pretty URL without index.php
-#
-#
-# Copyleft 2018 by Timo Stiefel and xxx
-# GPL licensed (see end of file) * Use at your own risk!
-
-
-ACTIVE_=no
-DESCRIPTION="Set pretty URLs (no index.php in URL)"
-INFOTITLE="PrettyURL notes"
-
-NCDIR=/var/www/nextcloud
-OCC="$NCDIR/occ"
-
-install() { :; }
-
-isactive()
-{
-  local REWRITEBASE
-  REWRITEBASE="$( grep RewriteBase /var/www/nextcloud/.htaccess )" || return 1
-  [[ $REWRITEBASE != 1 ]]
-}
-
-configure() 
-{  
-  # make sure overwrite.cli.url end with a '/'
-  local URL="$(ncc config:system:get overwrite.cli.url)"
-  [[ "${URL: -1}" != "/" ]] && ncc config:system:set overwrite.cli.url --value="${URL}/"
-
-  [[ $ACTIVE_ != "yes" ]] && {
-    sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value=""
-    sudo -u www-data php "$OCC" maintenance:update:htaccess
-    [[ $? -ne 0 ]] && {
-      echo "There has been an error."
-      return 1
-    }
-    echo "Your cloud does no longer have a pretty domain name."
-  } || {
-    sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value="/"
-    sudo -u www-data php "$OCC" maintenance:update:htaccess
-    [[ $? -ne 0 ]] && {
-      echo "There has been an error."
-      return 1
-    }
-    echo "Your cloud now has a pretty domain name."
-  }
-  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
-  return 0
-}
-
-# 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/etc/ncp-config.d/nc-previews.cfg b/etc/ncp-config.d/nc-previews.cfg
new file mode 100644
index 00000000..4ec1e9f1
--- /dev/null
+++ b/etc/ncp-config.d/nc-previews.cfg
@@ -0,0 +1,9 @@
+{
+  "id": "nc-previews",
+  "name": "nc-previews",
+  "title": "nc-previews",
+  "description": "Generate previews for the gallery",
+  "info": "This will make browsing the gallery much more smooth.\nFor big collections, this can take a LONG time, depending on your hardware",
+  "infotitle": "",
+  "params": []
+}
diff --git a/etc/ncp-config.d/nc-previews.sh b/etc/ncp-config.d/nc-previews.sh
deleted file mode 100644
index ef325a75..00000000
--- a/etc/ncp-config.d/nc-previews.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Generate previews for the gallery
-#
-# 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!
-#
-# More at nextcloudpi.com
-#
-
-DESCRIPTION="Generate previews for the gallery"
-
-INFO="This will make browsing the gallery much more smooth.
-For big collections, this can take a LONG time, depending on your hardware"
-
-configure()
-{
-  sudo -u www-data php /var/www/nextcloud/occ preview:generate-all
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-ramlogs.cfg b/etc/ncp-config.d/nc-ramlogs.cfg
new file mode 100644
index 00000000..568d18b9
--- /dev/null
+++ b/etc/ncp-config.d/nc-ramlogs.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-ramlogs",
+  "name": "nc-ramlogs",
+  "title": "nc-ramlogs",
+  "description": "mount logs in RAM to prevent SD degradation (faster, consumes more RAM)",
+  "info": "You need to reboot for this change to take effect",
+  "infotitle": "Warning",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-ramlogs.sh b/etc/ncp-config.d/nc-ramlogs.sh
deleted file mode 100644
index cbca9a82..00000000
--- a/etc/ncp-config.d/nc-ramlogs.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/
-#
-
-ACTIVE_=no
-DESCRIPTION="mount logs in RAM to prevent SD degradation (faster, consumes more RAM)"
-
-INFOTITLE="Warning"
-INFO="You need to reboot for this change to take effect"
-
-is_active()
-{
-  systemctl -q is-active log2ram &>/dev/null
-}
-
-find_unit_name()
-{
-  UNIT_NAME=""
-  entry=$(systemctl list-unit-files --no-pager | grep -e ramlog)
-  if [[ -z "$entry" ]]
-  then
-    UNIT_NAME=""
-  elif [[ $entry == *armbian-ramlog* ]]
-  then
-    UNIT_NAME=armbian-ramlog
-  else
-    UNIT_NAME=log2ram
-  fi
-}
-
-install()
-{
-  [[ -d /var/log.hdd ]] || [[ -d /var/hdd.log ]] && { echo "log2ram detected, not installing"; return; }
-  cd /tmp
-  curl -Lo log2ram.tar.gz https://github.com/azlux/log2ram/archive/master.tar.gz
-  tar xf log2ram.tar.gz
-  cd log2ram-master
-  sed -i '/systemctl -q is-active log2ram/d' install.sh
-  sed -i '/systemctl enable log2ram/d' install.sh
-  chmod +x install.sh && sudo ./install.sh
-  cd ..
-  rm -r log2ram-master log2ram.tar.gz
-  rm /etc/cron.hourly/log2ram /usr/local/bin/uninstall-log2ram.sh
-}
-
-configure()
-{
-  find_unit_name
-  if [[ -z "$UNIT_NAME" ]]
-  then
-    echo "ERROR: log2ram service not found!"
-  fi
-
-  [[ $ACTIVE_ != "yes" ]] && {
-    systemctl disable "$UNIT_NAME"
-    systemctl stop    "$UNIT_NAME"
-    echo "Logs in SD. Reboot to take effect"
-    return
-  }
-  systemctl enable "$UNIT_NAME"
-  systemctl start  "$UNIT_NAME"
-
-  echo "Logs in RAM. Reboot to take effect"
-}
-
-# 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/etc/ncp-config.d/nc-restore.cfg b/etc/ncp-config.d/nc-restore.cfg
new file mode 100644
index 00000000..0cfbbb1f
--- /dev/null
+++ b/etc/ncp-config.d/nc-restore.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-restore",
+  "name": "nc-restore",
+  "title": "nc-restore",
+  "description": "Restore a previously backuped NC instance",
+  "info": "This new installation will cleanup current\nNextCloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use nc-backup",
+  "infotitle": "Restore NextCloud backup",
+  "params": [
+    {
+      "id": "BACKUPFILE",
+      "name": "BACKUPFILE",
+      "value": "/media/USBdrive/nextcloud-bkp_xxxxxxxx.tar"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-restore.sh b/etc/ncp-config.d/nc-restore.sh
deleted file mode 100644
index 05de9db9..00000000
--- a/etc/ncp-config.d/nc-restore.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/bash
-
-#!/bin/bash
-# Nextcloud restore backup
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-
-BACKUPFILE_=/media/USBdrive/nextcloud-bkp_xxxxxxxx.tar
-DESCRIPTION="Restore a previously backuped NC instance"
-
-INFOTITLE="Restore NextCloud backup"
-INFO="This new installation will cleanup current
-NextCloud instance, including files and database.
-
-** perform backup before proceding **
-
-You can use nc-backup"
-
-install()
-{ 
-  cat > /usr/local/bin/ncp-restore <<'EOF'
-#!/bin/bash
-set -eE
-
-BACKUPFILE="$1"
-
-DBADMIN=ncadmin
-DBPASSWD="$( grep password /root/.my.cnf | sed 's|password=||' )"
-PHPVER=7.2
-
-DIR="$( cd "$( dirname "$BACKUPFILE" )" &>/dev/null && pwd )" #abspath
-
-[[ -f /.docker-image ]] && NCDIR=/data/app || NCDIR=/var/www/nextcloud
-
-[[ $# -eq 0           ]] && { echo "missing first argument"         ; exit 1; }
-[[ -f "$BACKUPFILE"   ]] || { echo "$BACKUPFILE not found"          ; exit 1; }
-[[ "$DIR" =~ "$NCDIR" ]] && { echo "Refusing to restore from $NCDIR"; exit 1; }
-
-TMPDIR="$( mktemp -d "$( dirname "$BACKUPFILE" )"/ncp-restore.XXXXXX )" || { echo "Failed to create temp dir" >&2; exit 1; }
-grep -q -e ext -e btrfs <( stat -fc%T "$TMPDIR" ) || { echo "Can only restore from ext/btrfs filesystems"     >&2; exit 1; }
-
-TMPDIR="$( cd "$TMPDIR" &>/dev/null && pwd )" || { echo "$TMPDIR not found"; exit 1; } #abspath
-cleanup(){  local RET=$?; echo "Cleanup..."; rm -rf "${TMPDIR}"; trap "" EXIT; exit $RET; }
-trap cleanup INT TERM HUP ERR EXIT
-rm -rf "$TMPDIR" && mkdir -p "$TMPDIR"
-
-# EXTRACT FILES
-[[ "$BACKUPFILE" =~ ".tar.gz" ]] && COMPRESSED=1 || COMPRESSED=0
-[[ "$COMPRESSED" == "1" ]] && {
-  echo "decompressing backup file $BACKUPFILE..."
-  tar -xzf "$BACKUPFILE" -C "$TMPDIR" || exit 1
-  BACKUPFILE="$( ls "$TMPDIR"/*.tar 2>/dev/null )"
-  [[ -f "$BACKUPFILE" ]] || { echo "$BACKUPFILE not found"; exit 1; }
-}
-
-echo "extracting backup file $BACKUPFILE..."
-tar -xf "$BACKUPFILE" -C "$TMPDIR" || exit 1
-
-## SANITY CHECKS
-[[ -d "$TMPDIR"/nextcloud ]] && [[ -f "$( ls "$TMPDIR"/nextcloud-sqlbkp_*.bak 2>/dev/null )" ]] || {
-  echo "invalid backup file. Abort"
-  exit 1
-}
-
-## RESTORE FILES
-
-echo "restore files..."
-rm -rf "$NCDIR"
-mv -T "$TMPDIR"/nextcloud "$NCDIR" || { echo "Error restoring base files"; exit 1; }
-
-# update NC database password to this instance
-sed -i "s|'dbpassword' =>.*|'dbpassword' => '$DBPASSWD',|" /var/www/nextcloud/config/config.php
-
-# update redis credentials
-REDISPASS="$( grep "^requirepass" /etc/redis/redis.conf | cut -f2 -d' ' )"
-[[ "$REDISPASS" != "" ]] && \
-  sed -i "s|'password'.*|'password' => '$REDISPASS',|" /var/www/nextcloud/config/config.php
-service redis-server restart
-
-## RE-CREATE DATABASE TABLE
-
-echo "restore database..."
-mysql -u root <<EOFMYSQL
-DROP DATABASE IF EXISTS nextcloud;
-CREATE DATABASE nextcloud;
-GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
-DROP USER '$DBADMIN'@'localhost';
-CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
-GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
-EXIT
-EOFMYSQL
-[ $? -ne 0 ] && { echo "Error configuring nextcloud database"; exit 1; }
-
-mysql -u root nextcloud <  "$TMPDIR"/nextcloud-sqlbkp_*.bak || { echo "Error restoring nextcloud database"; exit 1; }
-
-## RESTORE DATADIR
-
-cd "$NCDIR"
-
-### INCLUDEDATA=yes situation
-
-NUMFILES=$(( 2 + COMPRESSED ))
-if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then
-
-  DATADIR=$( grep datadirectory "$NCDIR"/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 ) 
-  [[ "$DATADIR" == "" ]] && { echo "Error reading data directory"; exit 1; }
-
-  echo "restore datadir to $DATADIR..."
-
-  [[ -e "$DATADIR" ]] && { 
-    echo "backing up existing $DATADIR"
-    mv "$DATADIR" "$DATADIR-$( date "+%m-%d-%y" )" || exit 1
-  }
-
-  mkdir -p "$DATADIR"
-  [[ "$( stat -fc%T "$DATADIR" )" == "btrfs" ]] && {
-    rmdir "$DATADIR"                  || exit 1
-    btrfs subvolume create "$DATADIR" || exit 1
-  }
-  chown www-data:www-data "$DATADIR"
-  TMPDATA="$TMPDIR/$( basename "$DATADIR" )"
-  mv "$TMPDATA"/* "$TMPDATA"/.[!.]* "$DATADIR" || exit 1
-  rmdir "$TMPDATA"                             || exit 1
-
-  sudo -u www-data php occ maintenance:mode --off
-
-### INCLUDEDATA=no situation
-
-else      
-  echo "no datadir found in backup"
-  DATADIR="$NCDIR"/data
-
-  sudo -u www-data php occ maintenance:mode --off
-  sudo -u www-data php occ files:scan --all
-
-  # cache needs to be cleaned as of NC 12
-  NEED_RESTART=1
-fi
-
-# Just in case we moved the opcache dir
-sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$DATADIR/.opcache|" /etc/php/${PHPVER}/mods-available/opcache.ini
-
-# tmp upload dir
-mkdir -p "$DATADIR/tmp" 
-chown www-data:www-data "$DATADIR/tmp"
-sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/cli/php.ini
-sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/fpm/php.ini
-sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR/tmp|"     /etc/php/${PHPVER}/fpm/php.ini
-
-# update fail2ban logpath
-[[ ! -f /.docker-image ]] && {
-  sed -i "s|logpath  =.*|logpath  = $DATADIR/nextcloud.log|" /etc/fail2ban/jail.conf
-  pgrep fail2ban &>/dev/null && service fail2ban restart
-}
-
-# refresh nextcloud trusted domains
-bash /usr/local/bin/nextcloud-domain.sh
-
-# restart PHP if needed
-[[ "$NEED_RESTART" == "1" ]] && \
-  bash -c " sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
-EOF
-  chmod +x /usr/local/bin/ncp-restore
-}
-
-configure()
-{
-  ncp-restore "$BACKUPFILE_"
-}
-
-# 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/etc/ncp-config.d/nc-rsync-auto.cfg b/etc/ncp-config.d/nc-rsync-auto.cfg
new file mode 100644
index 00000000..9a86d743
--- /dev/null
+++ b/etc/ncp-config.d/nc-rsync-auto.cfg
@@ -0,0 +1,26 @@
+{
+  "id": "nc-rsync-auto",
+  "name": "nc-rsync-auto",
+  "title": "nc-rsync-auto",
+  "description": "Periodically sync Nextcloud data through rsync",
+  "info": "DESTINATION can be a regular path for local sync\n'user' needs SSH autologin from the NCP 'root' user at 'ip'",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "DESTINATION",
+      "name": "DESTINATION",
+      "value": "user@ip:/path/to/sync"
+    },
+    {
+      "id": "SYNCDAYS",
+      "name": "SYNCDAYS",
+      "value": "3"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-rsync-auto.sh b/etc/ncp-config.d/nc-rsync-auto.sh
deleted file mode 100644
index becf806e..00000000
--- a/etc/ncp-config.d/nc-rsync-auto.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-# Periodically sync Nextcloud datafolder through rsync
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-ACTIVE_=no
-DESTINATION_=user@ip:/path/to/sync
-SYNCDAYS_=3
-DESCRIPTION="Periodically sync Nextcloud data through rsync"
-
-INFO="DESTINATION can be a regular path for local sync
-'user' needs SSH autologin from the NCP 'root' user at 'ip'"
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y rsync
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    rm -f /etc/cron.d/ncp-rsync-auto
-    echo "automatic rsync disabled"
-    return 0
-  }
-
-  local DATADIR
-  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
-    return 1;
-  }
-
-  [[ "$DESTINATION_" =~ : ]] && {
-    local NET="$( sed 's|:.*||' <<<"$DESTINATION_" )"
-    local SSH=( ssh -o "BatchMode=yes" "$NET" )
-    ${SSH[@]} : || { echo "SSH non-interactive not properly configured"; return 1; }
-  }
-
-  echo "0  5  */${SYNCDAYS_}  *  *  root  /usr/bin/rsync -ax --delete \"$DATADIR\" \"$DESTINATION_\"" > /etc/cron.d/ncp-rsync-auto
-  service cron restart
-
-  echo "automatic rsync enabled"
-}
-
-# 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/etc/ncp-config.d/nc-rsync.cfg b/etc/ncp-config.d/nc-rsync.cfg
new file mode 100644
index 00000000..7f7ee7ce
--- /dev/null
+++ b/etc/ncp-config.d/nc-rsync.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-rsync",
+  "name": "nc-rsync",
+  "title": "nc-rsync",
+  "description": "Sync Nextcloud data through rsync",
+  "info": "'user' needs SSH autologin from the NCP 'root' user at 'ip'\nif we are launching from ncp-web",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "DESTINATION",
+      "name": "DESTINATION",
+      "value": "user@ip:/path/to/sync"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-rsync.sh b/etc/ncp-config.d/nc-rsync.sh
deleted file mode 100644
index d75e7453..00000000
--- a/etc/ncp-config.d/nc-rsync.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# Sync Nextcloud datafolder through rsync
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-DESTINATION_=user@ip:/path/to/sync
-DESCRIPTION="Sync Nextcloud data through rsync"
-
-INFO="'user' needs SSH autologin from the NCP 'root' user at 'ip'
-if we are launching from ncp-web"
-
-BASEDIR=/var/www
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y rsync
-}
-
-configure()
-{
-  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --on
-
-  local DATADIR
-  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
-    return 1;
-  }
-
-  rsync -ax --delete "$DATADIR" "$DESTINATION_"
-
-  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
-}
-
-# 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/etc/ncp-config.d/nc-scan-auto.cfg b/etc/ncp-config.d/nc-scan-auto.cfg
new file mode 100644
index 00000000..4b2f6cfa
--- /dev/null
+++ b/etc/ncp-config.d/nc-scan-auto.cfg
@@ -0,0 +1,21 @@
+{
+  "id": "nc-scan-auto",
+  "name": "nc-scan-auto",
+  "title": "nc-scan-auto",
+  "description": "Periodically scan NC for externally modified files",
+  "info": "Set the time in minutes in SCANINTERVAL.\n\n>>> If there are too many files this can greatly affect performance. <<<",
+  "infotitle": "Instructions for auto synchronization",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "SCANINTERVAL",
+      "name": "SCANINTERVAL",
+      "value": "60"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-scan-auto.sh b/etc/ncp-config.d/nc-scan-auto.sh
deleted file mode 100644
index 0d30f84f..00000000
--- a/etc/ncp-config.d/nc-scan-auto.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Periodically synchronize NextCloud for externally modified files
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=no
-SCANINTERVAL_=60
-DESCRIPTION="Periodically scan NC for externally modified files"
-
-INFOTITLE="Instructions for auto synchronization"
-INFO="Set the time in minutes in SCANINTERVAL.
-
->>> If there are too many files this can greatly affect performance. <<<"
-
-configure() 
-{
-    [[ $ACTIVE_ != "yes" ]] && { 
-    rm -f /etc/cron.d/ncp-scan-auto
-    service cron restart
-    echo "automatic scans disabled"
-    return 0
-  }
-
-  # set crontab
-  local DAYS HOURS MINS
-  DAYS=$(( SCANINTERVAL_ / 1440 ))
-  if [[ "$DAYS" != "0" ]]; then 
-    DAYS="*/$DAYS" HOUR="1" MINS="15"
-  else
-    DAYS="*" 
-    HOUR=$(( SCANINTERVAL_ / 60   ))
-    MINS=$(( SCANINTERVAL_ % 60   ))
-    MINS="*/$MINS"
-    [[ $HOUR == 0 ]] && HOUR="*" || { HOUR="*/$HOUR" MINS="15"; }
-  fi
-
-  echo "${MINS}  ${HOUR}  ${DAYS}  *  *  root /usr/local/bin/ncp-scan" > /etc/cron.d/ncp-scan-auto
-  service cron restart
-
-  echo "automatic scans enabled"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-scan.cfg b/etc/ncp-config.d/nc-scan.cfg
new file mode 100644
index 00000000..3386816d
--- /dev/null
+++ b/etc/ncp-config.d/nc-scan.cfg
@@ -0,0 +1,9 @@
+{
+  "id": "nc-scan",
+  "name": "nc-scan",
+  "title": "nc-scan",
+  "description": "Scan NC for externally modified files",
+  "info": "",
+  "infotitle": "",
+  "params": []
+}
diff --git a/etc/ncp-config.d/nc-scan.sh b/etc/ncp-config.d/nc-scan.sh
deleted file mode 100644
index 70b7570a..00000000
--- a/etc/ncp-config.d/nc-scan.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Synchronize NextCloud for externally modified files
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-DESCRIPTION="Scan NC for externally modified files"
-
-install() 
-{ 
-  cat > /usr/local/bin/ncp-scan <<EOF
-#!/bin/bash
-cd /var/www/nextcloud
-sudo -u www-data php occ files:scan --all
-EOF
-  chmod +x /usr/local/bin/ncp-scan
-}
-
-configure() 
-{
-  /usr/local/bin/ncp-scan
-}
-
-# 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/etc/ncp-config.d/nc-snapshot-auto.cfg b/etc/ncp-config.d/nc-snapshot-auto.cfg
new file mode 100644
index 00000000..add2ff22
--- /dev/null
+++ b/etc/ncp-config.d/nc-snapshot-auto.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-snapshot-auto",
+  "name": "nc-snapshot-auto",
+  "title": "nc-snapshot-auto",
+  "description": "Scheduled datadir BTRFS snapshots",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-snapshot-auto.sh b/etc/ncp-config.d/nc-snapshot-auto.sh
deleted file mode 100644
index 03eb25ae..00000000
--- a/etc/ncp-config.d/nc-snapshot-auto.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-ACTIVE_=no
-DESCRIPTION="Scheduled datadir BTRFS snapshots"
-
-install()
-{
-  wget https://raw.githubusercontent.com/nachoparker/btrfs-snp/master/btrfs-snp -O /usr/local/bin/btrfs-snp
-  chmod +x /usr/local/bin/btrfs-snp
-}
-
-configure()
-{ 
-  [[ $ACTIVE_ != "yes" ]] && { 
-    rm -f /etc/cron.hourly/btrfs-snp
-    echo "automatic snapshots disabled"
-    return 0
-  }
-
-  local DATADIR MOUNTPOINT
-  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
-    return 1;
-  }
-
-  # file system check
-  MOUNTPOINT="$( stat -c "%m" "$DATADIR" )" || return 1
-  [[ "$( stat -fc%T "$MOUNTPOINT" )" != "btrfs" ]] && {
-    echo "$MOUNTPOINT is not in a BTRFS filesystem"
-    return 1
-  }
-
-  cat > /etc/cron.hourly/btrfs-snp <<EOF
-#!/bin/bash
-/usr/local/bin/btrfs-snp $MOUNTPOINT hourly  24 3600    ../ncp-snapshots
-/usr/local/bin/btrfs-snp $MOUNTPOINT daily    7 86400   ../ncp-snapshots
-/usr/local/bin/btrfs-snp $MOUNTPOINT weekly   4 604800  ../ncp-snapshots
-/usr/local/bin/btrfs-snp $MOUNTPOINT monthly 12 2592000 ../ncp-snapshots
-EOF
-  chmod +x /etc/cron.hourly/btrfs-snp
-  echo "automatic snapshots enabled"
-}
-
-
-# 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/etc/ncp-config.d/nc-snapshot-sync.cfg b/etc/ncp-config.d/nc-snapshot-sync.cfg
new file mode 100644
index 00000000..f5803836
--- /dev/null
+++ b/etc/ncp-config.d/nc-snapshot-sync.cfg
@@ -0,0 +1,37 @@
+{
+  "id": "nc-snapshot-sync",
+  "name": "nc-snapshot-sync",
+  "title": "nc-snapshot-sync",
+  "description": "Sync BTRFS snapshots to USBdrive or remote machine",
+  "info": "Use format user@ip:/path/to/snapshots for remote sync\n'user' needs permissions for the 'btrfs' command at 'ip'\n'user' needs SSH autologin from the NCP 'root' user at 'ip'\nOnly use compression for internet transfer, because it uses many resources",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "SNAPDIR",
+      "name": "SNAPDIR",
+      "value": "/media/USBdrive/ncp-snapshots"
+    },
+    {
+      "id": "DESTINATION",
+      "name": "DESTINATION",
+      "value": "/media/myBackupDrive/ncp-snapshots"
+    },
+    {
+      "id": "COMPRESSION",
+      "name": "COMPRESSION",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "SYNCDAYS",
+      "name": "SYNCDAYS",
+      "value": "1"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-snapshot-sync.sh b/etc/ncp-config.d/nc-snapshot-sync.sh
deleted file mode 100644
index 7eccd93f..00000000
--- a/etc/ncp-config.d/nc-snapshot-sync.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# Sync Nextcloud 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-ACTIVE_=no
-SNAPDIR_=/media/USBdrive/ncp-snapshots
-DESTINATION_=/media/myBackupDrive/ncp-snapshots
-COMPRESSION_=no
-SYNCDAYS_=1
-DESCRIPTION="Sync BTRFS snapshots to USBdrive or remote machine"
-
-INFO="Use format user@ip:/path/to/snapshots for remote sync
-'user' needs permissions for the 'btrfs' command at 'ip'
-'user' needs SSH autologin from the NCP 'root' user at 'ip'
-Only use compression for internet transfer, because it uses many resources"
-
-install()
-{
-  apt-get update
-  apt-get install -y --no-install-recommends pv openssh-client
-  wget https://raw.githubusercontent.com/nachoparker/btrfs-sync/master/btrfs-sync -O /usr/local/bin/btrfs-sync
-  chmod +x /usr/local/bin/btrfs-sync
-  ssh-keygen -N "" -f /root/.ssh/id_rsa 
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    rm -f /etc/cron.d/ncp-snapsync-auto
-    service cron restart
-    echo "snapshot sync disabled"
-    return 0
-  }
-
-  # checks
-  [[ -d "$SNAPDIR_" ]] || { echo "$SNAPDIR_ does not exist"; return 1; }
-
-  [[ "$DESTINATION_" =~ : ]] && {
-    local NET="$( sed 's|:.*||' <<<"$DESTINATION_" )"
-    local DST="$( sed 's|.*:||' <<<"$DESTINATION_" )"
-    local SSH=( ssh -o "BatchMode=yes" "$NET" )
-    ${SSH[@]} : || { echo "SSH non-interactive not properly configured"; return 1; }
-  } || DST="$DESTINATION_"
-  [[ "$( ${SSH[@]} stat -fc%T "$DST" )" != "btrfs" ]] && {
-    echo "$DESTINATION_ is not in a BTRFS filesystem"
-    return 1
-  }
-
-  [[ "$COMPRESSION_" == "yes" ]] && ZIP="-z"
-
-  echo "30  4  */${SYNCDAYS_}  *  *  root  /usr/local/bin/btrfs-sync -qd $ZIP \"$SNAPDIR_\" \"$DESTINATION_\"" > /etc/cron.d/ncp-snapsync-auto
-  service cron restart
-  echo "snapshot sync enabled"
-}
-
-# 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/etc/ncp-config.d/nc-snapshot.cfg b/etc/ncp-config.d/nc-snapshot.cfg
new file mode 100644
index 00000000..77edb622
--- /dev/null
+++ b/etc/ncp-config.d/nc-snapshot.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-snapshot",
+  "name": "nc-snapshot",
+  "title": "nc-snapshot",
+  "description": "Create BTRFS snapshot of the datadir",
+  "info": "Snapshots take up very little space because only the differences from one \nto the next are saved. This requires the datadir to be in a BTRFS filesystem",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "LIMIT",
+      "name": "LIMIT",
+      "value": "4"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-snapshot.sh b/etc/ncp-config.d/nc-snapshot.sh
deleted file mode 100644
index 607bc47e..00000000
--- a/etc/ncp-config.d/nc-snapshot.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Nextcloud 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-LIMIT_=4
-DESCRIPTION="Create BTRFS snapshot of the datadir"
-
-INFO="Snapshots take up very little space because only the differences from one 
-to the next are saved. This requires the datadir to be in a BTRFS filesystem"
-
-BASEDIR=/var/www
-
-install()
-{
-  wget https://raw.githubusercontent.com/nachoparker/btrfs-snp/master/btrfs-snp -O /usr/local/bin/btrfs-snp
-  chmod +x /usr/local/bin/btrfs-snp
-}
-
-configure()
-{
-  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --on
-
-  local DATADIR MOUNTPOINT
-  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
-    return 1;
-  }
-
-  # file system check
-  MOUNTPOINT="$( stat -c "%m" "$DATADIR" )" || return 1
-  [[ "$( stat -fc%T "$MOUNTPOINT" )" != "btrfs" ]] && {
-    echo "$MOUNTPOINT is not in a BTRFS filesystem"
-    return 1
-  }
-
-  btrfs-snp $MOUNTPOINT manual $LIMIT_ 0 ../ncp-snapshots
-
-  sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
-}
-
-# 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/etc/ncp-config.d/nc-static-IP.cfg b/etc/ncp-config.d/nc-static-IP.cfg
new file mode 100644
index 00000000..df17a9e4
--- /dev/null
+++ b/etc/ncp-config.d/nc-static-IP.cfg
@@ -0,0 +1,21 @@
+{
+  "id": "nc-static-IP",
+  "name": "nc-static-IP",
+  "title": "nc-static-IP",
+  "description": "Set up a static IP address (ACTIVE=yes), or DHCP (ACTIVE=no)",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "IP",
+      "name": "IP",
+      "value": "192.168.1.130"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-static-IP.sh b/etc/ncp-config.d/nc-static-IP.sh
deleted file mode 100644
index 7598f63e..00000000
--- a/etc/ncp-config.d/nc-static-IP.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-
-# Enable static IP or DHCP for 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=no
-IP_=192.168.1.130
-
-DESCRIPTION="Set up a static IP address (ACTIVE=yes), or DHCP (ACTIVE=no)"
-
-configure() 
-{
-  local GW="$( ip r | grep "default via"   | awk '{ print $3 }' )"
-  local DNS="$( grep nameserver /etc/resolv.conf | head -1 | awk '{ print $2 }' )"
-  [[ "$DNS" == "" ]] && DNS="$GW"
-  local IFACE="$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )"
-  [[ "$IFACE" == "" ]] && { echo "Couldn't find default interface"; exit 1; }
-
-  ## DHCPCD
-  [[ -f /etc/dhcpcd.conf ]] && {
-    # delete NCP config
-    grep -q "^# NextCloudPi autogenerated" /etc/dhcpcd.conf && \
-      sed -i '/^# NextCloudPi autogenerated/,+6d' /etc/dhcpcd.conf
-
-    [[ $ACTIVE_ != "yes" ]] && {
-      systemctl restart dhcpcd
-      echo "DHCP enabled"
-      return
-    }
-
-    cat >> /etc/dhcpcd.conf <<EOF
-# NextCloudPi autogenerated
-# don't modify! better use ncp-config
-interface $IFACE
-static ip_address=$IP_/24
-static routers=$GW
-static domain_name_servers=$DNS
-
-# Local loopback
-auto lo
-iface lo inet loopback
-EOF
-
-    systemctl restart dhcpcd
-  } || {
-    ## NETWORK MANAGER
-
-    cp -n /etc/network/interfaces /etc/network/interfaces-ncp-backup-orig
-
-    [[ $ACTIVE_ != "yes" ]] && {
-      cat > /etc/network/interfaces <<EOF
-# Wired adapter #1
-allow-hotplug $IFACE
-no-auto-down $IFACE
-auto $IFACE
-iface $IFACE inet dhcp
-
-# Local loopback
-auto lo
-iface lo inet loopback
-EOF
-      systemctl restart NetworkManager
-      echo "DHCP enabled"
-      return
-    }
-
-    cat > /etc/network/interfaces <<EOF
-# ncp-config generated
-source /etc/network/interfaces.d/*
-
-# Local loopback
-auto lo
-iface lo inet loopback
-
-# Interface $IFACE
-auto $IFACE
-allow-hotplug $IFACE
-iface $IFACE inet static
-    address $IP_
-    netmask 255.255.255.0
-    gateway $GW
-    dns-nameservers $DNS 8.8.8.8
-EOF
-    systemctl restart networking
-  }
- 
-  sudo -u www-data php /var/www/nextcloud/occ config:system:set trusted_domains 1 --value="$IP_"
-  sudo -u www-data php /var/www/nextcloud/occ config:system:set overwrite.cli.url --value=https://"$IP_"/
-  echo "Static IP set to $IP_"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-swapfile.cfg b/etc/ncp-config.d/nc-swapfile.cfg
new file mode 100644
index 00000000..a1f95ff1
--- /dev/null
+++ b/etc/ncp-config.d/nc-swapfile.cfg
@@ -0,0 +1,20 @@
+{
+  "id": "nc-swapfile",
+  "name": "nc-swapfile",
+  "title": "nc-swapfile",
+  "description": "Move and resize your swapfile. Recommended to move to a permanent USB drive",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "SWAPFILE",
+      "name": "SWAPFILE",
+      "value": "/media/USBdrive/swap"
+    },
+    {
+      "id": "SWAPSIZE",
+      "name": "SWAPSIZE",
+      "value": "1024"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-swapfile.sh b/etc/ncp-config.d/nc-swapfile.sh
deleted file mode 100644
index e2799235..00000000
--- a/etc/ncp-config.d/nc-swapfile.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/
-#
-
-SWAPFILE_=/media/USBdrive/swap
-SWAPSIZE_=1024
-DESCRIPTION="Move and resize your swapfile. Recommended to move to a permanent USB drive"
-
-is_active()
-{
-  local DIR=$( swapon -s | sed -n 2p | awk '{ print $1 }' )
-  [[ "$DIR" != "" ]] && [[ "$DIR" != "/var/swap" ]]
-}
-
-configure()
-{
-  local ORIG="$( swapon | tail -1 | awk '{ print $1 }' )"
-  local DSTDIR="$( dirname "$SWAPFILE_" )"
-  [[ "$ORIG" == "$SWAPFILE_" ]] && { echo "nothing to do";                    return 0; }
-  [[ -d "$SWAPFILE_"         ]] && { echo "$SWAPFILE_ is a directory. Abort"; return 1; }
-  [[ -d "$DSTDIR"            ]] || { echo "$DSTDIR Doesn't exist. Abort";     return 1; }
-
-  [[ "$( stat -fc%T "$DSTDIR" )" == "btrfs" ]] && {
-    echo "BTRFS doesn't support swapfiles. You can still use nc-zram"
-    return 1
-  }
-
-  [[ $( stat -fc%d / ) == $( stat -fc%d "$DSTDIR" ) ]] && \
-    echo -e "INFO: moving swapfile to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up"
-
-  sed -i "s|#\?CONF_SWAPFILE=.*|CONF_SWAPFILE=$SWAPFILE_|" /etc/dphys-swapfile
-  sed -i "s|#\?CONF_SWAPSIZE=.*|CONF_SWAPSIZE=$SWAPSIZE_|" /etc/dphys-swapfile
-  grep -q vm.swappiness /etc/sysctl.conf || echo "vm.swappiness = 10" >> /etc/sysctl.conf && sysctl --load &>/dev/null
-
-  dphys-swapfile setup && dphys-swapfile swapon && {
-    [[ -f "$ORIG" ]] && swapoff "$ORIG" && rm -f "$ORIG"
-    echo "swapfile moved successfully"
-    return 0
-  }
-
-  echo "moving swapfile failed"
-  return 1
-}
-
-install()
-{
-  apt-get update
-  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dphys-swapfile
-  # delay init because of automount
-  sed -i "/\<start)/asleep 30" /etc/init.d/dphys-swapfile 
-}
-
-
-# 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/etc/ncp-config.d/nc-update-nextcloud.cfg b/etc/ncp-config.d/nc-update-nextcloud.cfg
new file mode 100644
index 00000000..8358867e
--- /dev/null
+++ b/etc/ncp-config.d/nc-update-nextcloud.cfg
@@ -0,0 +1,15 @@
+{
+  "id": "nc-update-nextcloud",
+  "name": "nc-update-nextcloud",
+  "title": "nc-update-nextcloud",
+  "description": "Update current instance to a new Nextcloud version",
+  "info": "Set to 0 to update to the latest avaliable version",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "VERSION",
+      "name": "VERSION",
+      "value": "0"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-update-nextcloud.sh b/etc/ncp-config.d/nc-update-nextcloud.sh
deleted file mode 100644
index 664baad6..00000000
--- a/etc/ncp-config.d/nc-update-nextcloud.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# Update current instance to a new Nextcloud version
-#
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-VERSION_=0
-LATEST=14.0.4
-DESCRIPTION="Update current instance to a new Nextcloud version"
-INFO="Set to 0 to update to the latest avaliable version"
-
-configure()
-{
-  [[ "$VERSION_" == "0" ]] && VERSION_="$LATEST"
-  bash /usr/local/bin/ncp-update-nc "$VERSION_"
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-update.cfg b/etc/ncp-config.d/nc-update.cfg
new file mode 100644
index 00000000..c653340b
--- /dev/null
+++ b/etc/ncp-config.d/nc-update.cfg
@@ -0,0 +1,9 @@
+{
+  "id": "nc-update",
+  "name": "nc-update",
+  "title": "nc-update",
+  "description": "Update NextCloudPi",
+  "info": "",
+  "infotitle": "",
+  "params": []
+}
diff --git a/etc/ncp-config.d/nc-update.sh b/etc/ncp-config.d/nc-update.sh
deleted file mode 100644
index 6f297dd3..00000000
--- a/etc/ncp-config.d/nc-update.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/
-#
-
-DESCRIPTION="Update NextCloudPi"
-
-configure()
-{
-  /usr/local/bin/ncp-update
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-webui.cfg b/etc/ncp-config.d/nc-webui.cfg
new file mode 100644
index 00000000..33a5f4ef
--- /dev/null
+++ b/etc/ncp-config.d/nc-webui.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-webui",
+  "name": "nc-webui",
+  "title": "nc-webui",
+  "description": "Enable or disable the NCP web interface",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-webui.sh b/etc/ncp-config.d/nc-webui.sh
deleted file mode 100644
index ef22ea3a..00000000
--- a/etc/ncp-config.d/nc-webui.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# Periodically synchronize NextCloud for externally modified files
-#
-# 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=no
-DESCRIPTION="Enable or disable the NCP web interface"
-
-is_active()
-{
-  a2query -s ncp &>/dev/null
-}
-
-configure() 
-{
-  if [[ $ACTIVE_ != "yes" ]]; then
-    a2dissite ncp
-    echo "ncp-web disabled"
-  else
-    a2ensite ncp
-    echo "ncp-web enabled"
-  fi
-
-  # delayed in bg so it does not kill the connection, and we get AJAX response
-  bash -c "sleep 2 && service apache2 reload" &>/dev/null &
-}
-
-install() { :; }
-
-# 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/etc/ncp-config.d/nc-wifi.cfg b/etc/ncp-config.d/nc-wifi.cfg
new file mode 100644
index 00000000..18061cf5
--- /dev/null
+++ b/etc/ncp-config.d/nc-wifi.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-wifi",
+  "name": "nc-wifi",
+  "title": "nc-wifi",
+  "description": "Configure your Wi-Fi connection",
+  "info": "\n0) Write 'yes' to activate wifi, and 'no' to disable it\n1) Select a Wi-Fi network\n2) Press right arrow ->\n3) Enter the passphrase for your Wi-Fi\n4) Make sure to select 'connect automatically'\n5) F10 to save\n6) C to connect",
+  "infotitle": "Instructions to configure Wi-Fi",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-wifi.sh b/etc/ncp-config.d/nc-wifi.sh
deleted file mode 100644
index 18e52bd3..00000000
--- a/etc/ncp-config.d/nc-wifi.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/
-#
-
-ACTIVE_=no
-DESCRIPTION="Configure your Wi-Fi connection"
-
-INFOTITLE="Instructions to configure Wi-Fi"
-INFO="
-0) Write 'yes' to activate wifi, and 'no' to disable it
-1) Select a Wi-Fi network
-2) Press right arrow ->
-3) Enter the passphrase for your Wi-Fi
-4) Make sure to select 'connect automatically'
-5) F10 to save
-6) C to connect"
-
-install()
-{
-  apt-get update
-  apt install -y --no-install-recommends wicd-curses
-  systemctl disable wicd 
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    systemctl stop     wicd
-    systemctl disable  wicd 
-    systemctl start   dhcpcd
-    systemctl enable  dhcpcd
-    ip link set down dev wlan0
-    systemctl start nextcloud-domain
-    return; 
-  } 
-
-  ip link set up dev wlan0
-  systemctl stop    dhcpcd
-  systemctl disable dhcpcd
-  systemctl enable  wicd 
-  systemctl start   wicd
-
-  wicd-curses
-  clear
-
-  systemctl start nextcloud-domain
-}
-
-# 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/etc/ncp-config.d/nc-zram.cfg b/etc/ncp-config.d/nc-zram.cfg
new file mode 100644
index 00000000..afbb27e1
--- /dev/null
+++ b/etc/ncp-config.d/nc-zram.cfg
@@ -0,0 +1,16 @@
+{
+  "id": "nc-zram",
+  "name": "nc-zram",
+  "title": "nc-zram",
+  "description": "Enable compressed RAM to improve swap performance",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/nc-zram.sh b/etc/ncp-config.d/nc-zram.sh
deleted file mode 100644
index a7d57037..00000000
--- a/etc/ncp-config.d/nc-zram.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# 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!
-#
-# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-#
-
-ACTIVE_=no
-DESCRIPTION="Enable compressed RAM to improve swap performance"
-
-install()
-{
-  cat > /etc/systemd/system/zram.service <<EOF
-[Unit]
-Description=Set up ZRAM
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/bin/ncp-zram start
-ExecStop=/usr/local/bin/ncp-zram  stop
-RemainAfterExit=yes
-
-[Install]
-WantedBy=sysinit.target
-EOF
-
-cat > /usr/local/bin/ncp-zram <<'EOF'
-#!/bin/bash
-# inspired by https://github.com/novaspirit/rpi_zram/blob/master/zram.sh
-
-case "$1" in
-  start)
-      CORES=$(nproc --all)
-      modprobe zram num_devices=$CORES || exit 1
-
-      swapoff -a
-
-      TOTALMEM=`free | grep -e "^Mem:" | awk '{print $2}'`
-      MEM=$(( ($TOTALMEM / $CORES)* 1024 ))
-
-      core=0
-      while [ $core -lt $CORES ]; do
-        echo $MEM > /sys/block/zram$core/disksize
-        mkswap /dev/zram$core
-        swapon -p 5 /dev/zram$core
-        let core=core+1
-      done
-      ;;
-
-  stop)
-      swapoff -a
-      rmmod zram
-      ;;
-  *)
-      echo "Usage: $0 {start|stop}" >&2
-      exit 1
-      ;;
-esac
-EOF
-chmod +x /usr/local/bin/ncp-zram
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    systemctl stop    zram
-    systemctl disable zram
-    echo "ZRAM disabled"
-    return 0
-  }
-  systemctl start  zram
-  systemctl enable zram
-  echo "ZRAM enabled"
-}
-
-# 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/etc/ncp-config.d/samba.cfg b/etc/ncp-config.d/samba.cfg
new file mode 100644
index 00000000..2c2d8054
--- /dev/null
+++ b/etc/ncp-config.d/samba.cfg
@@ -0,0 +1,21 @@
+{
+  "id": "samba",
+  "name": "samba",
+  "title": "samba",
+  "description": "SMB/CIFS file server (for Mac/Linux/Windows)",
+  "info": "The username will be the Nextcloud username, and the password will be one we setup here.\nIf we intend to modify the data folder through SAMBA,\nthen we have to synchronize NextCloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'",
+  "infotitle": "Instructions for external synchronization",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "no",
+      "type": "bool"
+    },
+    {
+      "id": "PWD",
+      "name": "PWD",
+      "value": "ownyourbits"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/samba.sh b/etc/ncp-config.d/samba.sh
deleted file mode 100644
index aac737dd..00000000
--- a/etc/ncp-config.d/samba.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash
-
-# SAMBA server for 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!
-#
-# More at: https://ownyourbits.com
-#
-
-ACTIVE_=no
-PWD_=ownyourbits
-DESCRIPTION="SMB/CIFS file server (for Mac/Linux/Windows)"
-
-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'"
-
-install()
-{
-  apt-get update
-  apt-get install --no-install-recommends -y samba
-  update-rc.d smbd disable
-  update-rc.d nmbd disable
-
-  # the directory needs to be recreated if we are using nc-ramlogs
-  grep -q mkdir /etc/init.d/smbd || sed -i "/\<start)/amkdir -p /var/log/samba" /etc/init.d/smbd
-
-  # disable SMB1 and SMB2
-  grep -q SMB3 /etc/samba/smb.conf || sed -i '/\[global\]/aprotocol = SMB3' /etc/samba/smb.conf
-
-  # disable the [homes] share by default
-  sed -i /\[homes\]/s/homes/homes_disabled_ncp/ /etc/samba/smb.conf
-
-  cat >> /etc/samba/smb.conf <<EOF
-
-# NextCloudPi automatically generated from here. Do not remove this comment
-EOF
-}
-
-configure()
-{
-  [[ $ACTIVE_ != "yes" ]] && { 
-    service smbd stop
-    update-rc.d smbd disable
-    update-rc.d nmbd disable
-    echo "SMB disabled"
-    return
-  } 
-
-  # CHECKS
-  ################################
-  local DATADIR
-  DATADIR=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?"; 
-    return 1;
-  }
-  [ -d "$DATADIR" ] || { echo -e "data directory $DATADIR not found"   ; return 1; }
-
-  # CONFIG
-  ################################
-  
-  # remove files from this line to the end
-  sed -i '/# NextCloudPi 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
-EOF
-
-  # create a share per Nextcloud user
-  local USERS=()
-  while read -r path; do 
-    USERS+=( "$( basename $( dirname "$path" ) )" )
-  done < <( ls -d "$DATADIR"/*/files )
-
-  for user in ${USERS[@]}; do
-    echo "adding SAMBA share for user $user"
-    local DIR="$DATADIR/$user/files"
-    [ -d "$DIR" ] || { echo -e "INFO: directory $DIR does not exist."; return 1; }
-
-    cat >> /etc/samba/smb.conf <<EOF
-
-[ncp-$user]
-    path = $DIR
-    writeable = yes
-;	browseable = yes
-    valid users = $user
-    force user = www-data
-    force group = www-data
-    create mask = 0770
-    directory mask = 0771
-    force create mode = 0660
-    force directory mode = 0770
-
-EOF
-
-    ## create user with no login if it doesn't exist
-    id "$user" &>/dev/null || adduser --disabled-password --force-badname --gecos "" "$user" || return 1
-    echo -e "$PWD_\n$PWD_" | smbpasswd -s -a $user
-
-    usermod -aG www-data $user
-    sudo chmod g+w $DIR
-  done
-
-  update-rc.d smbd defaults
-  update-rc.d smbd enable
-  service smbd restart
-
-  update-rc.d nmbd enable
-  service nmbd restart
-
-  echo "SMB enabled"
-}
-
-# 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/etc/ncp-config.d/unattended-upgrades.cfg b/etc/ncp-config.d/unattended-upgrades.cfg
new file mode 100644
index 00000000..fae568c8
--- /dev/null
+++ b/etc/ncp-config.d/unattended-upgrades.cfg
@@ -0,0 +1,22 @@
+{
+  "id": "unattended-upgrades",
+  "name": "unattended-upgrades",
+  "title": "unattended-upgrades",
+  "description": "Automatic installation of security updates. Keep your cloud safe",
+  "info": "",
+  "infotitle": "",
+  "params": [
+    {
+      "id": "ACTIVE",
+      "name": "ACTIVE",
+      "value": "yes",
+      "type": "bool"
+    },
+    {
+      "id": "AUTOREBOOT",
+      "name": "AUTOREBOOT",
+      "value": "yes",
+      "type": "bool"
+    }
+  ]
+}
diff --git a/etc/ncp-config.d/unattended-upgrades.sh b/etc/ncp-config.d/unattended-upgrades.sh
deleted file mode 100644
index eba93a5d..00000000
--- a/etc/ncp-config.d/unattended-upgrades.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Unattended upgrades installation on 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!
-#
-# More at: ownyourbits.com 
-#
-
-ACTIVE_=yes
-AUTOREBOOT_=yes
-DESCRIPTION="Automatic installation of security updates. Keep your cloud safe"
-
-install()
-{
-  apt-get update
-  apt install -y --no-install-recommends unattended-upgrades 
-  rm /etc/apt/apt.conf.d/20auto-upgrades
-}
-
-configure() 
-{ 
-  [[ $ACTIVE_     == "yes" ]] && local AUTOUPGRADE=1   || local AUTOUPGRADE=0
-  [[ $AUTOREBOOT_ == "yes" ]] && local AUTOREBOOT=true || local AUTOREBOOT=false
-
-  # Raspbian case
-  grep -q Raspbian /etc/issue && {
-
-    # 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/20ncp-upgrades <<EOF
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "$AUTOUPGRADE";
-APT::Periodic::MaxAge "14"; 
-APT::Periodic::AutocleanInterval "7";
-Unattended-Upgrade::Automatic-Reboot "$AUTOREBOOT";
-Unattended-Upgrade::Automatic-Reboot-Time "04:00";
-Unattended-Upgrade::Origins-Pattern {
-o=Raspbian,n=stretch,l=Raspbian;
-}
-Dpkg::Options {
-   "--force-confdef";
-   "--force-confold";
-};
-EOF
-
-  # Armbian case # TODO security only?
-  } || {
-    cat > /etc/apt/apt.conf.d/20ncp-upgrades <<EOF
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "$AUTOUPGRADE";
-APT::Periodic::MaxAge "14"; 
-APT::Periodic::AutocleanInterval "7";
-Unattended-Upgrade::Automatic-Reboot "$AUTOREBOOT";
-Unattended-Upgrade::Automatic-Reboot-Time "04:00";
-Unattended-Upgrade::Origins-Pattern {
-o=Debian,n=stretch,l=Debian;
-}
-Dpkg::Options {
-   "--force-confdef";
-   "--force-confold";
-};
-EOF
-  }
-  echo "Unattended upgrades active: $ACTIVE_ (autoreboot $AUTOREBOOT_)"
-}
-
-# 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/install.sh b/install.sh
index be671504..2889522c 100644
--- a/install.sh
+++ b/install.sh
@@ -46,12 +46,11 @@ cd - && cd "$TMPDIR"/nextcloudpi-"$BRANCH"
 echo -e "\nInstalling NextCloudPi"
 source etc/library.sh
 
-install_script  lamp.sh
-install_script  etc/ncp-config.d/nc-nextcloud.sh
-activate_script etc/ncp-config.d/nc-nextcloud.sh
-install_script  ncp.sh
-activate_script etc/ncp-config.d/nc-init.sh
-bash /usr/local/bin/ncp-provisioning.sh
+install_app  lamp.sh
+install_app  etc/ncp-config.d/nc-nextcloud.sh
+run_app      etc/ncp-config.d/nc-nextcloud.sh
+install_app  ncp.sh
+run_app      etc/ncp-config.d/nc-init.sh
 
 popd
 
diff --git a/ncp-web/L10N.php b/ncp-web/L10N.php
index 2fdf5434..d786413b 100644
--- a/ncp-web/L10N.php
+++ b/ncp-web/L10N.php
@@ -69,7 +69,6 @@ class L10N
   function save($lang)
   {
     $cfg = 'ncp-web.cfg';
-    $line = file_get_contents( $cfg );
     $str = "LANGUAGE_=$lang";
     return file_put_contents( $cfg , $str );
   }
@@ -141,12 +140,14 @@ class L10N
 
   function load_language_setting()
   {
-    $webui_config_file = 'ncp-web.cfg';
-    $fh = fopen($webui_config_file, 'r');
+    $cfg = 'ncp-web.cfg';
+    if (!file_exists($cfg))
+      return "auto";
+    $fh = fopen($cfg, 'r');
     if ($fh === false)
       return "auto";
 
-    $lang=file_get_contents($webui_config_file);
+    $lang=file_get_contents($cfg);
     fclose($fh);
     return ltrim($lang, 'LANGUAGE_=');
   }
diff --git a/ncp-web/css/ncp.css b/ncp-web/css/ncp.css
new file mode 100644
index 00000000..bfd2a1cb
--- /dev/null
+++ b/ncp-web/css/ncp.css
@@ -0,0 +1,1338 @@
+/* 
+ * 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!
+ *
+ * More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+*/
+
+
+html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,dialog,figure,footer,header,hgroup,nav,section {
+ margin:0;
+ padding:0;
+ border:0;
+ outline:0;
+ font-weight:inherit;
+ font-size:100%;
+ font-family:inherit;
+ vertical-align:baseline;
+ cursor:default
+}
+html,body {
+ height:100%
+}
+article,aside,dialog,figure,footer,header,hgroup,nav,section {
+ display:block
+}
+body {
+ line-height:1.5
+}
+table {
+ border-collapse:separate;
+ border-spacing:0;
+ white-space:nowrap
+}
+caption,th,td {
+ text-align:left;
+ font-weight:normal
+}
+table,td,th {
+ vertical-align:middle;
+ padding-right: 5px;
+}
+a {
+ border:0;
+ color:#000;
+ text-decoration:none;
+ cursor:pointer
+}
+a * {
+ cursor:pointer
+}
+select,.button span,label {
+ cursor:pointer
+}
+ul {
+ list-style:none
+}
+body {
+ background-color:#fff;
+ font-weight:400;
+ font-size:0.8em;
+ line-height:1.6em;
+ font-family:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+ color:#000;
+ height:auto
+}
+#nojavascript {
+ position:fixed;
+ top:0;
+ bottom:0;
+ height:100%;
+ width:100%;
+ z-index:9000;
+ text-align:center;
+ background-color:rgba(0, 0, 0, 0.5);
+ color:#fff;
+ line-height:125%;
+ font-size:24px
+}
+#nojavascript div {
+ display:block;
+ position:relative;
+ width:50%;
+ top:35%;
+ margin:0px auto
+}
+#nojavascript a {
+ color:#fff;
+ border-bottom:2px dotted #fff
+}
+#nojavascript a:hover,#nojavascript a:focus {
+ color:#dbdbdb
+}
+::-webkit-scrollbar {
+ width:5px
+}
+::-webkit-scrollbar-track-piece {
+ background-color:transparent
+}
+::-webkit-scrollbar-thumb {
+ background:#dbdbdb;
+ border-radius:3px
+}
+#content {
+ position:relative;
+ height:100%;
+ width:100%
+}
+#content-wrapper {
+ position:absolute;
+ height:100%;
+ width:100%;
+ overflow-x:hidden;
+ padding-top:45px;
+ box-sizing:border-box
+}
+tbody tr:hover,tbody tr:focus,tbody tr:active {
+ background-color:#f7f7f7
+}
+code {
+ font-family:'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', monospace
+}
+@-ms-viewport {
+ width:device-width;
+}
+input,textarea,select,button {
+ font-family:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif
+}
+select,button,input,textarea {
+ width:130px;
+ min-height:32px;
+ box-sizing:border-box
+}
+select,button,.button,input:not([type='range']),textarea,#quota,.pager li a {
+ margin:3px 3px 3px 0;
+ padding:7px 6px;
+ font-size:13px;
+ background-color:#fff;
+ color:#545454;
+ border:1px solid #dbdbdb;
+ outline:none;
+ border-radius:3px;
+}
+select:not(:disabled):not(.primary),button:not(:disabled):not(.primary),.button:not(:disabled):not(.primary),input:not([type='range']):not(:disabled):not(.primary),textarea:not(:disabled):not(.primary),#quota:not(:disabled):not(.primary),.pager li a:not(:disabled):not(.primary) {
+}
+select:not(:disabled):not(.primary):not(#quota):hover,button:not(:disabled):not(.primary):not(#quota):hover,.button:not(:disabled):not(.primary):not(#quota):hover,input:not([type='range']):not(:disabled):not(.primary):not(#quota):hover,textarea:not(:disabled):not(.primary):not(#quota):hover,#quota:not(:disabled):not(.primary):not(#quota):hover,.pager li a:not(:disabled):not(.primary):not(#quota):hover,select:not(:disabled):not(.primary):focus,button:not(:disabled):not(.primary):focus,.button:not(:disabled):not(.primary):focus,input:not([type='range']):not(:disabled):not(.primary):focus,textarea:not(:disabled):not(.primary):focus,#quota:not(:disabled):not(.primary):focus,.pager li a:not(:disabled):not(.primary):focus,select:not(:disabled):not(.primary).active,button:not(:disabled):not(.primary).active,.button:not(:disabled):not(.primary).active,input:not([type='range']):not(:disabled):not(.primary).active,textarea:not(:disabled):not(.primary).active,#quota:not(:disabled):not(.primary).active,.pager li a:not(:disabled):not(.primary).active {
+ border-color:#0082c9;
+ outline:none
+}
+select:not(:disabled):not(.primary):active,button:not(:disabled):not(.primary):active,.button:not(:disabled):not(.primary):active,input:not([type='range']):not(:disabled):not(.primary):active,textarea:not(:disabled):not(.primary):active,#quota:not(:disabled):not(.primary):active,.pager li a:not(:disabled):not(.primary):active {
+ outline:none;
+ background-color:#fff
+}
+select:disabled,button:disabled,.button:disabled,input:not([type='range']):disabled,textarea:disabled,#quota:disabled,.pager li a:disabled {
+ background-color:#ebebeb;
+ color:rgba(0, 0, 0, 0.4);
+ cursor:default;
+ opacity:0.5
+}
+select.primary,button.primary,.button.primary,input:not([type='range']).primary,textarea.primary,#quota.primary,.pager li a.primary {
+ border:1px solid #0082c9;
+ background-color:rgba(0, 130, 201, .7);
+ color:#fff;
+ cursor:pointer
+}
+select.primary:not(:disabled):hover,button.primary:not(:disabled):hover,.button.primary:not(:disabled):hover,input:not([type='range']).primary:not(:disabled):hover,textarea.primary:not(:disabled):hover,#quota.primary:not(:disabled):hover,.pager li a.primary:not(:disabled):hover,select.primary:not(:disabled):focus,button.primary:not(:disabled):focus,.button.primary:not(:disabled):focus,input:not([type='range']).primary:not(:disabled):focus,textarea.primary:not(:disabled):focus,#quota.primary:not(:disabled):focus,.pager li a.primary:not(:disabled):focus {
+ background-color:rgba(0, 130, 201, .85)
+}
+select.primary:not(:disabled):active,button.primary:not(:disabled):active,.button.primary:not(:disabled):active,input:not([type='range']).primary:not(:disabled):active,textarea.primary:not(:disabled):active,#quota.primary:not(:disabled):active,.pager li a.primary:not(:disabled):active {
+ background-color:rgba(0, 130, 201, .7)
+}
+select.primary:disabled,button.primary:disabled,.button.primary:disabled,input:not([type='range']).primary:disabled,textarea.primary:disabled,#quota.primary:disabled,.pager li a.primary:disabled {
+ background-color:rgba(0, 130, 201, .7);
+ color:#bababa
+}
+input {
+}
+input:not([type='radio']):not([type='checkbox']):not([type='range']):not([type='submit']):not([type='button']):not([type='reset']):not([type='color']):not([type='file']):not([type='image']) {
+ -webkit-appearance:textfield;
+ -moz-appearance:textfield
+}
+input[type='radio'],input[type='checkbox'],input[type='file'],input[type='image'] {
+ height:auto;
+ width:auto
+}
+input[type='color'] {
+ margin:3px;
+ padding:0 2px;
+ min-height:30px;
+ width:40px;
+ cursor:pointer
+}
+input[type='hidden'] {
+ height:0;
+ width:0
+}
+input[type='time'] {
+ width:initial
+}
+select,button,.button,input[type='button'],input[type='submit'],input[type='reset'] {
+ padding:6px 12px;
+ width:auto;
+ min-height:34px;
+ cursor:pointer;
+ box-sizing:border-box;
+ background-color:#f7f7f7
+}
+button,.button,input[type='button'],input[type='submit'],input[type='reset'] {
+ font-weight:bold;
+}
+button::-moz-focus-inner,.button::-moz-focus-inner,input[type='button']::-moz-focus-inner,input[type='submit']::-moz-focus-inner,input[type='reset']::-moz-focus-inner {
+ border:0
+}
+button,.button {
+}
+button > span[class^='icon-'],.button > span[class^='icon-'],button > span[class*=' icon-'],.button > span[class*=' icon-'] {
+ display:inline-block;
+ vertical-align:text-bottom;
+ opacity:0.5
+}
+textarea {
+ color:#545454;
+ cursor:text;
+ font-family:inherit;
+ height:auto
+}
+textarea:not(:disabled):active,textarea:not(:disabled):hover,textarea:not(:disabled):focus {
+ border-color:#dbdbdb !important;
+ background-color:#fff !important
+}
+select {
+ -webkit-appearance:none;
+ -moz-appearance:none;
+ appearance:none;
+ #background:url('../../../core/css/../img/actions/triangle-s.svg') no-repeat right 4px center;
+ background-color:inherit;
+ outline:0;
+ padding-right:24px !important
+}
+button img,.button img {
+ cursor:pointer
+}
+input[type='checkbox'].radio,input[type='radio'].radio,input[type='checkbox'].checkbox,input[type='radio'].checkbox {
+ position:absolute;
+ left:-10000px;
+ top:auto;
+ width:1px;
+ height:1px;
+ overflow:hidden
+}
+input[type='checkbox'].radio + label,input[type='radio'].radio + label,input[type='checkbox'].checkbox + label,input[type='radio'].checkbox + label {
+ user-select:none
+}
+input[type='checkbox'].radio:disabled + label,input[type='radio'].radio:disabled + label,input[type='checkbox'].checkbox:disabled + label,input[type='radio'].checkbox:disabled + label,input[type='checkbox'].radio:disabled + label:before,input[type='radio'].radio:disabled + label:before,input[type='checkbox'].checkbox:disabled + label:before,input[type='radio'].checkbox:disabled + label:before {
+ cursor:default
+}
+input[type='checkbox'].radio + label:before,input[type='radio'].radio + label:before,input[type='checkbox'].checkbox + label:before,input[type='radio'].checkbox + label:before {
+ content:'';
+ display:inline-block;
+ height:12px;
+ width:12px;
+ vertical-align:middle;
+ border-radius:50%;
+ margin:3px;
+ margin-top:1px;
+ border:1px solid #878787
+}
+input[type='checkbox'].radio:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].radio:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].checkbox:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].checkbox:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].radio:focus + label:before,input[type='radio'].radio:focus + label:before,input[type='checkbox'].checkbox:focus + label:before,input[type='radio'].checkbox:focus + label:before {
+ border-color:#0082c9
+}
+input[type='checkbox'].radio:checked + label:before,input[type='radio'].radio:checked + label:before,input[type='checkbox'].checkbox:checked + label:before,input[type='radio'].checkbox:checked + label:before,input[type='checkbox'].radio.checkbox:indeterminate + label:before,input[type='radio'].radio.checkbox:indeterminate + label:before,input[type='checkbox'].checkbox.checkbox:indeterminate + label:before,input[type='radio'].checkbox.checkbox:indeterminate + label:before {
+ box-shadow:inset 0px 0px 0px 2px #fff;
+ background-color:#0082c9;
+ border-color:#0082c9
+}
+input[type='checkbox'].radio:disabled + label:before,input[type='radio'].radio:disabled + label:before,input[type='checkbox'].checkbox:disabled + label:before,input[type='radio'].checkbox:disabled + label:before {
+ border:1px solid #878787;
+ background-color:#bababa !important;
+}
+input[type='checkbox'].radio:checked:disabled + label:before,input[type='radio'].radio:checked:disabled + label:before,input[type='checkbox'].checkbox:checked:disabled + label:before,input[type='radio'].checkbox:checked:disabled + label:before {
+ background-color:#bababa
+}
+input[type='checkbox'].checkbox + label:before,input[type='radio'].checkbox + label:before {
+ border-radius:1px;
+ height:10px;
+ width:10px;
+ box-shadow:none !important;
+ background-position:center
+}
+input[type='checkbox'].checkbox:checked + label:before,input[type='radio'].checkbox:checked + label:before {
+ background-image:url('../../../core/css/../img/actions/checkbox-mark.svg')
+}
+input[type='checkbox'].checkbox:indeterminate + label:before,input[type='radio'].checkbox:indeterminate + label:before {
+ background-image:url('../../../core/css/../img/actions/checkbox-mixed.svg')
+}
+input[type='checkbox'].radio--white + label:before,input[type='radio'].radio--white + label:before,input[type='checkbox'].checkbox--white + label:before,input[type='radio'].checkbox--white + label:before {
+ border-color:#dbdbdb
+}
+input[type='checkbox'].radio--white:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].radio--white:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].checkbox--white:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].checkbox--white:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].radio--white:focus + label:before,input[type='radio'].radio--white:focus + label:before,input[type='checkbox'].checkbox--white:focus + label:before,input[type='radio'].checkbox--white:focus + label:before {
+ border-color:#fff
+}
+input[type='checkbox'].radio--white:checked + label:before,input[type='radio'].radio--white:checked + label:before,input[type='checkbox'].checkbox--white:checked + label:before,input[type='radio'].checkbox--white:checked + label:before {
+ box-shadow:inset 0px 0px 0px 2px #000;
+ background-color:#ebebeb;
+ border-color:#ebebeb
+}
+input[type='checkbox'].radio--white:disabled + label:before,input[type='radio'].radio--white:disabled + label:before,input[type='checkbox'].checkbox--white:disabled + label:before,input[type='radio'].checkbox--white:disabled + label:before {
+ background-color:#545454 !important;
+ border-color:rgba(0, 0, 0, 0.4) !important;
+}
+input[type='checkbox'].radio--white:checked:disabled + label:before,input[type='radio'].radio--white:checked:disabled + label:before,input[type='checkbox'].checkbox--white:checked:disabled + label:before,input[type='radio'].checkbox--white:checked:disabled + label:before {
+ box-shadow:inset 0px 0px 0px 2px #000;
+ border-color:#545454;
+ background-color:#545454
+}
+input[type='checkbox'].checkbox--white:checked + label:before,input[type='radio'].checkbox--white:checked + label:before,input[type='checkbox'].checkbox--white:indeterminate + label:before,input[type='radio'].checkbox--white:indeterminate + label:before {
+ background-color:transparent !important;
+ border-color:#fff !important;
+ background-image:url('../../../core/css/../img/actions/checkbox-mark-white.svg')
+}
+input[type='checkbox'].checkbox--white:indeterminate + label:before,input[type='radio'].checkbox--white:indeterminate + label:before {
+ background-image:url('../../../core/css/../img/actions/checkbox-mixed-white.svg')
+}
+input[type='checkbox'].checkbox--white:checked:disabled + label:after,input[type='radio'].checkbox--white:checked:disabled + label:after {
+ border-color:#bababa
+}
+input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after,input[type='radio'].checkbox--white:indeterminate:disabled + label:after {
+ background-color:#bababa
+}
+#header,#navigation,#expanddiv {
+ -webkit-user-select:none;
+ -moz-user-select:none;
+ -ms-user-select:none
+}
+#body-user #header,#body-settings #header,#body-public #header {
+ display:inline-flex;
+ position:fixed;
+ top:0;
+ left:0;
+ right:0;
+ z-index:5000;
+ height:45px;
+ background-color:#0082c9;
+ box-sizing:border-box;
+ justify-content:space-between
+}
+
+#notification-container {
+ position:absolute;
+ top:0;
+ width:100%;
+ text-align:center
+}
+#notification {
+ margin:0 auto;
+ max-width:60%;
+ z-index:8000;
+ background-color:#fff;
+ border:0;
+ padding:1px 8px;
+ display:inline-block;
+ position:relative;
+ top:0;
+ border-bottom-left-radius:3px;
+ border-bottom-right-radius:3px;
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=90)';
+ opacity:0.9;
+ overflow-x:hidden;
+ overflow-y:auto;
+ max-height:100px
+}
+#notification span {
+ cursor:pointer;
+ margin-left:1em
+}
+#notification .row {
+ position:relative
+}
+#notification .row .close {
+ display:inline-block;
+ vertical-align:middle;
+ position:absolute;
+ right:0;
+ top:0;
+ margin-top:2px
+}
+#notification .row.closeable {
+ padding-right:20px
+}
+
+#nextcloudpi {
+ padding:5px;
+ padding-bottom:0;
+ height:45px;
+ box-sizing:border-box;
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+ opacity:1
+}
+#nextcloudpi:focus {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
+ opacity:0.75
+}
+#nextcloudpi:hover,#nextcloudpi:active {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+ opacity:1
+}
+#header {
+ color: white;
+}
+
+#header .logo {
+ background-image:url("../img/logo.svg");
+ background-repeat:no-repeat;
+ background-size:175px;
+ background-position:center;
+ width:252px;
+ height:120px;
+ margin:0 auto
+}
+#header .logo img {
+ opacity:0;
+ max-width:100%;
+ max-height:200px
+}
+#header .logo-icon {
+ display:inline-block;
+ background-image:url('../img/ncp-logo.svg');
+ background-repeat:no-repeat;
+ background-position:center center;
+ background-size:contain;
+ width:62px;
+ height:34px
+}
+#header .header-appname-container {
+ display:none;
+ padding-top:22px;
+ padding-right:10px;
+ flex-shrink:0
+}
+#header .icon-caret {
+ display:inline-block;
+ width:12px;
+ height:12px;
+ margin:0;
+ margin-top:-21px;
+ padding:0;
+ vertical-align:middle
+}
+#header #header-left,#header #header-right {
+ display:inline-flex;
+ align-items:center
+}
+#header #header-left {
+ flex:0 0;
+ flex-grow:1
+}
+#header #header-right {
+ justify-content:flex-end
+}
+.header-appname-container .header-appname {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
+ opacity:0.75
+}
+.menutoggle .icon-caret {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
+ opacity:0.75
+}
+.menutoggle:hover .header-appname,.menutoggle:hover .icon-caret {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+ opacity:1
+}
+.menutoggle:focus .header-appname,.menutoggle:focus .icon-caret {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+ opacity:1
+}
+.menutoggle.active .header-appname,.menutoggle.active .icon-caret {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+ opacity:1
+}
+.header-appname {
+ display:inline-block;
+ position:relative;
+ color:#fff;
+ font-size:16px;
+ font-weight:300;
+ margin:0;
+ margin-top:-26px;
+ padding:7px 0 7px 5px;
+ vertical-align:middle
+}
+#body-public #header .icon-caret {
+ display:none
+}
+nav {
+ display:inline-block;
+ width:44px;
+ height:44px;
+ margin-left:-54px
+}
+[class^='icon-'],[class*=' icon-'] {
+ background-repeat:no-repeat;
+ background-position:center;
+ min-width:16px;
+ min-height:16px
+}
+@keyframes rotate {
+ from {
+  transform:rotate(0deg)
+ }
+ to {
+  transform:rotate(360deg)
+ }
+}
+@media (-webkit-max-device-pixel-ratio:1.3),(max-resolution:124.8dpi) {
+ @font-face {
+  font-family:'Open Sans';
+  font-style:normal;
+  font-weight:normal;
+  src:local('Open Sans'), local('OpenSans'), url('../../../core/css/../fonts/OpenSans-Regular.woff') format('woff');
+ }
+}
+@font-face {
+ font-family:'Open Sans';
+ font-style:normal;
+ font-weight:300;
+ src:local('Open Sans Light'), local('OpenSans-Light'), url('../../../core/css/../fonts/OpenSans-Light.woff') format('woff');
+}
+@font-face {
+ font-family:'Open Sans';
+ font-style:normal;
+ font-weight:600;
+ src:local('Open Sans Semibold'), local('OpenSans-Semibold'), url('../../../core/css/../fonts/OpenSans-Semibold.woff') format('woff');
+}
+h2 {
+ font-size:20px;
+ font-weight:300;
+ margin-bottom:12px;
+ line-height:140%
+}
+h3 {
+ font-size:15px;
+ font-weight:300;
+ margin:12px 0
+}
+em {
+ font-style:normal;
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
+ opacity:0.5
+}
+dl {
+ padding:12px 0
+}
+dt,dd {
+ display:inline-block;
+ padding:12px;
+ padding-left:0
+}
+dt {
+ width:130px;
+ white-space:nowrap;
+ text-align:right
+}
+kbd {
+ padding:4px 10px;
+ border:1px solid #ccc;
+ box-shadow:0 1px 0 rgba(0, 0, 0, .2);
+ border-radius:3px;
+ display:inline-block;
+ white-space:nowrap
+}
+#app {
+ height:100%;
+ width:100%
+}
+#app * {
+ box-sizing:border-box
+}
+#app-navigation {
+ width:250px;
+ height:100%;
+ float:left;
+ box-sizing:border-box;
+ background-color:#fff;
+ padding-bottom:44px;
+ -webkit-user-select:none;
+ -moz-user-select:none;
+ -ms-user-select:none;
+ user-select:none;
+ border-right:1px solid #ebebeb;
+ display:flex;
+ flex-direction:column;
+ z-index: 3000;
+}
+#app-navigation > ul {
+ position:relative;
+ height:100%;
+ width:inherit;
+ overflow:auto;
+ box-sizing:border-box
+}
+#app-navigation > ul > li:focus,#app-navigation ul:hover,#app-navigation ul.active,#app-navigation > ul > li a.selected,#app-navigation > ul > li:focus > a,#app-navigation > ul > li:hover > a,#app-navigation > ul > li.active > a,#app-navigation > ul > li a.selected > a {
+ opacity:1;
+ box-shadow:inset 2px 0 #0082c9
+}
+#app-navigation li {
+ position:relative;
+ width:100%;
+ box-sizing:border-box
+}
+#app-navigation.hidden {
+ display:none
+}
+#app-navigation.without-app-settings {
+ padding-bottom:0
+}
+#app-navigation .active.with-menu > a,#app-navigation .with-counter > a {
+ padding-right:50px
+}
+#app-navigation .active.with-menu.with-counter > a {
+ padding-right:90px
+}
+#app-navigation .with-icon a,#app-navigation .app-navigation-entry-loading a {
+ padding-left:44px;
+ background-size:16px 16px;
+ background-position:14px center;
+ background-repeat:no-repeat
+}
+#app-navigation li > span, #app-navigation ul {
+ display:block;
+ width:90%;
+ line-height:44px;
+ min-height:44px;
+ padding:0 12px;
+ overflow:hidden;
+ box-sizing:border-box;
+ white-space:nowrap;
+ text-overflow:ellipsis;
+ color:#000;
+ opacity:0.57;
+ font-weight: normal;
+}
+#app-navigation li > span {
+ font-weight: bold;
+ background-image:url('../img/files.svg');
+ background-size: 16px 16px;
+ background-position: 10px center;
+ background-repeat: no-repeat;
+ padding: 0px 12px 0px 36px;
+}
+#app-navigation ul {
+  padding-left: 2em;
+}
+#app-navigation li > a:first-child img {
+ margin-bottom:-3px;
+ margin-right:11px;
+ width:16px;
+ margin-left:2px
+}
+#app-navigation .collapse {
+ display:none;
+}
+#app-navigation .collapsible > .collapse {
+ position:absolute;
+ height:44px;
+ width:44px;
+ margin:0;
+ padding:0;
+ background:none;
+#background-image:url('../../../core/css/../img/actions/triangle-s.svg?v=1');
+ background-size:16px;
+ background-repeat:no-repeat;
+ background-position:center;
+ border:none;
+ border-radius:0;
+ outline:none !important;
+ box-shadow:none
+}
+#app-navigation .collapsible:hover > a,#app-navigation .collapsible:focus > a {
+ background-image:none
+}
+#app-navigation .collapsible:hover > .collapse,#app-navigation .collapsible:focus > .collapse {
+ display:block
+}
+#app-navigation .collapsible .collapse {
+ -webkit-transform:rotate(-90deg);
+ -ms-transform:rotate(-90deg);
+ transform:rotate(-90deg)
+}
+#app-navigation .collapsible.open {
+ background-image:linear-gradient(top, #ebebeb 0%, #f7f7f7 100%);
+ background-image:-webkit-linear-gradient(top, #ebebeb 0%, #f7f7f7 100%);
+ background-image:-ms-linear-gradient(top, #ebebeb 0%, #f7f7f7 100%)
+}
+#app-navigation .collapsible.open .collapse {
+ -webkit-transform:rotate(0);
+ -ms-transform:rotate(0);
+ transform:rotate(0)
+}
+#app-navigation {
+ overflow-y: scroll
+}
+#app-navigation > ul ul {
+ /* display:none */
+}
+#app-navigation > ul ul li > a {
+ padding-left:32px
+}
+#app-navigation > .with-icon ul li > a,#app-navigation > .with-icon ul li.app-navigation-entry-loading > a {
+ padding-left:68px;
+ background-position:44px center
+}
+#app-navigation > ul .collapsible.open:hover,#app-navigation > ul .collapsible.open:focus {
+ box-shadow:inset 0 0 3px rgba(51, 51, 51, 0.75)
+}
+#app-navigation > ul .collapsible.open ul {
+ display:block
+}
+#app-navigation .app-navigation-entry-deleted {
+ display:inline-block;
+ height:44px;
+ width:100%
+}
+#app-navigation .app-navigation-entry-deleted-description {
+ padding-left:12px;
+ position:relative;
+ white-space:nowrap;
+ text-overflow:ellipsis;
+ overflow:hidden;
+ display:inline-block;
+ width:calc(100% - 49px);
+ line-height:44px;
+ float:left
+}
+#app-navigation .app-navigation-entry-deleted-button {
+ margin:0;
+ height:44px;
+ width:44px;
+ line-height:44px;
+ border:0;
+ display:inline-block;
+ background-color:transparent;
+ opacity:0.5
+}
+#app-navigation .app-navigation-entry-deleted-button:hover,#app-navigation .app-navigation-entry-deleted-button:focus {
+ opacity:1
+}
+#app-navigation .utils {
+ position:absolute;
+ padding:7px 7px 0 0;
+ right:0;
+ top:0;
+ bottom:0;
+ font-size:12px
+}
+#app-navigation .utils button,#app-navigation .utils .counter {
+ width:44px;
+ height:44px;
+ padding-top:12px
+}
+#app-navigation .drag-and-drop {
+ -webkit-transition:padding-bottom 500ms ease 0s;
+ transition:padding-bottom 500ms ease 0s;
+ padding-bottom:40px
+}
+#app-navigation .error {
+ color:#e9322d
+}
+#app-navigation .app-navigation-separator {
+ border-bottom:1px solid #dbdbdb
+}
+#app-navigation .app-navigation-entry-utils {
+ position:absolute;
+ top:0;
+ right:0;
+ z-index:105
+}
+#app-navigation .app-navigation-entry-utils ul {
+ display:flex !important;
+ align-items:center;
+ justify-content:flex-end
+}
+#app-navigation .app-navigation-entry-utils li {
+ width:44px !important;
+ height:44px
+}
+#app-navigation .active > .app-navigation-entry-utils li {
+ display:inline-block
+}
+#app-navigation .app-navigation-entry-utils button {
+ height:100%;
+ width:100%;
+ margin:0;
+ box-shadow:none
+}
+#app-navigation .app-navigation-entry-utils-menu-button button {
+ border:0;
+ opacity:0.5;
+ background-color:transparent;
+ background-repeat:no-repeat;
+ background-position:center;
+ background-image:url('../../../core/css/../img/actions/more.svg?v=1')
+}
+#app-navigation .app-navigation-entry-utils-menu-button:hover button,#app-navigation .app-navigation-entry-utils-menu-button:focus button {
+ background-color:transparent;
+ opacity:1
+}
+#app-navigation .app-navigation-entry-utils-counter {
+ overflow:hidden;
+ text-overflow:hidden;
+ text-align:right;
+ font-size:9pt;
+ width:38px;
+ line-height:44px;
+ padding:0 10px
+}
+#app-navigation .app-navigation-entry-utils ul,#app-navigation .app-navigation-entry-menu ul {
+ list-style-type:none
+}
+#app-navigation .app-navigation-entry-edit {
+ padding-left:5px;
+ padding-right:5px;
+ display:inline-block;
+ height:39px;
+ width:100%
+}
+#app-navigation .app-navigation-entry-edit input {
+ border-bottom-right-radius:0;
+ border-top-right-radius:0;
+ width:calc(100% - 36px);
+ padding:5px;
+ margin-right:0;
+ height:38px;
+ float:left;
+ border:1px solid rgba(186, 186, 186, 0.9)
+}
+#app-navigation .app-navigation-entry-edit button,#app-navigation .app-navigation-entry-edit input[type='submit'] {
+ width:36px;
+ height:38px;
+ float:left
+}
+#app-navigation .app-navigation-entry-edit .icon-checkmark {
+ border-bottom-left-radius:0;
+ border-top-left-radius:0;
+ border-left:0;
+ margin-right:0
+}
+
+#app-content {
+ position:relative;
+ height:100%;
+ overflow-y:auto;
+}
+#app-content > .section:first-child {
+ border-top:none
+}
+#app-content.with-app-sidebar {
+ margin-right:27%
+}
+#app-content-wrapper {
+ min-width:100%;
+ min-height:100%
+}
+.pull-left {
+ float:left
+}
+.pull-right {
+ float:right
+}
+.clear-left {
+ clear:left
+}
+.clear-right {
+ clear:right
+}
+.clear-both {
+ clear:both
+}
+.bold {
+ font-weight:600
+}
+.center {
+ text-align:center
+}
+.inlineblock {
+ display:inline-block
+}
+::-moz-focus-inner {
+ border:0
+}
+select {
+ height:32px
+}
+.ie #show,.ie #show + label {
+ display:none;
+ visibility:hidden
+}
+@media only screen and (max-width:768px) {
+ #app-content {
+  position:absolute !important;
+  top:0;
+  left:0;
+  right:0;
+  bottom:0;
+  padding: 0px 24px;
+  background-color:#fff;
+  overflow-x:hidden !important;
+  z-index:1000
+ }
+ #app-navigation {
+  width:0px;
+ }
+ #body-settings #app-content {
+  overflow-x:auto !important
+ }
+ #app-navigation-toggle {
+  position:fixed;
+  display:inline-block !important;
+  top:45px;
+  left:0;
+  width:44px;
+  height:44px;
+  z-index:149;
+  background-color:rgba(255, 255, 255, .7);
+  cursor:pointer;
+  opacity:0.6
+ }
+ #app-navigation-toggle:hover,#app-navigation-toggle:focus {
+  opacity:1
+ }
+ #controls {
+  min-width:initial !important;
+  left:0 !important;
+  padding-left:0
+ }
+ #app-navigation + #app-content #controls {
+  padding-left:44px
+ }
+ #body-user .app-files.viewer-mode #controls {
+  padding-left:0 !important
+ }
+ .app-files.viewer-mode #app-navigation-toggle {
+  display:none !important
+ }
+}
+.tooltip {
+ position:absolute;
+ display:block;
+ font-family:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+ font-style:normal;
+ font-weight:400;
+ letter-spacing:normal;
+ line-break:auto;
+ line-height:1.6;
+ text-align:left;
+ text-align:start;
+ text-decoration:none;
+ text-shadow:none;
+ text-transform:none;
+ white-space:normal;
+ word-break:normal;
+ word-spacing:normal;
+ word-wrap:normal;
+ font-size:12px;
+ opacity:0;
+ z-index:100000;
+ filter:alpha(opacity=0);
+}
+.tooltip.in {
+ opacity:1;
+ filter:alpha(opacity=100)
+}
+.tooltip.top {
+ margin-top:-3px;
+ padding:10px 0
+}
+.tooltip.bottom {
+ margin-top:3px;
+ padding:10px 0
+}
+.tooltip.right {
+ margin-left:3px;
+ padding:0 10px
+}
+.tooltip.right .tooltip-arrow {
+ top:50%;
+ left:0;
+ margin-top:-10px;
+ border-width:10px 10px 10px 0;
+ border-right-color:#fff
+}
+.tooltip.left {
+ margin-left:-3px;
+ padding:0 5px
+}
+.tooltip.left .tooltip-arrow {
+ top:50%;
+ right:0;
+ margin-top:-10px;
+ border-width:10px 0 10px 10px;
+ border-left-color:#fff
+}
+.tooltip.top .tooltip-arrow,.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow {
+ bottom:0;
+ border-width:10px 10px 0;
+ border-top-color:#fff
+}
+.tooltip.top .tooltip-arrow {
+ left:50%;
+ margin-left:-10px
+}
+.tooltip.top-left .tooltip-arrow {
+ right:10px;
+ margin-bottom:-10px
+}
+.tooltip.top-right .tooltip-arrow {
+ left:10px;
+ margin-bottom:-10px
+}
+.tooltip.bottom .tooltip-arrow,.tooltip.bottom-left .tooltip-arrow,.tooltip.bottom-right .tooltip-arrow {
+ top:0;
+ border-width:0 10px 10px;
+ border-bottom-color:#fff
+}
+.tooltip.bottom .tooltip-arrow {
+ left:50%;
+ margin-left:-10px
+}
+.tooltip.bottom-left .tooltip-arrow {
+ right:10px;
+ margin-top:-10px
+}
+.tooltip.bottom-right .tooltip-arrow {
+ left:10px;
+ margin-top:-10px
+}
+.tooltip-inner {
+ max-width:350px;
+ padding:5px 8px;
+ background-color:#fff;
+ color:#000;
+ box-shadow:0 1px 10px rgba(150, 150, 150, .75);
+ text-align:center;
+ border-radius:3px
+}
+.tooltip-arrow {
+ position:absolute;
+ width:0;
+ height:0;
+ border-color:transparent;
+ border-style:solid
+}
+
+.table-wrapper {
+  width: 80%;
+  max-width: 450px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.table-wrapper table {
+  width: 100%;
+  max-width: 450px;
+  margin: 0 auto;
+}
+
+.table-wrapper input[type='text'] {
+  width: 100%;
+}
+
+.outputbox {
+  width: 100%;
+}
+
+.loading-gif {
+  display: none;
+}
+
+#loading-info-gif {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 96px;
+}
+
+.text-title {
+  text-align: center;
+}
+
+.config-box-info-txt {
+  white-space: pre-wrap;
+  text-align: center;
+}
+
+.config-button-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.icon-close {
+ background-image:url('../img/close.svg')
+}
+
+.icon-menu {
+  background-image: url('../img/menu.svg');
+}
+
+#power {
+  display: inline-block;
+  color: rgba(255, 255, 255, 0.7);
+  cursor: pointer;
+  flex: 0 0 auto;
+}
+
+#expand {
+  position: relative;
+  display: flex;
+  align-items: center;
+  padding: 7px 20px 6px 10px;
+  cursor: pointer;
+}
+
+#expand * {
+  cursor: pointer;
+}
+
+#expand:hover img,#expand:focus img,#expand:active img,#expand:hover #expandDisplayName,#expand:focus #expandDisplayName,#expand:active #expandDisplayName {
+ -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+ opacity:1
+}
+
+.icon-power-white {
+  background-image: url('../img/poweroff.svg');
+}
+.icon-nc-white {
+  background-image: url('../img/nc-button.svg');
+}
+.icon-nc-info {
+  background-image: url('../img/info-white.svg');
+}
+.icon-config {
+  background-image: url('../img/settings-white.svg');
+}
+.icon-reboot-white {
+  background-image: url('../img/reboot.svg');
+}
+.icon-dashboard {
+  background-image: url('../img/dashboard.svg');
+}
+
+.icon-wizard-white {
+  background-image: url('../img/wizard.svg');
+}
+.icon-red-circle {
+  background-image: url('../img/red-circle.svg');
+  padding: 8px;
+  display: none;
+}
+
+.icon-green-circle {
+  background-image: url('../img/green-circle.svg');
+  padding: 8px;
+}
+
+.icon-info {
+  background-image: url('../img/info.svg');
+  position: absolute;
+  top: 5px;
+  right: 1em;
+}
+
+#expand #expandDisplayName {
+  padding: 8px;
+  opacity: 0.6;
+}
+
+a#versionlink{
+ border:0;
+ color:white;
+ text-decoration:none;
+ cursor:pointer
+}
+
+a#versionlink:hover {
+  opacity: 0.8;
+}
+
+#update-notification {
+  cursor: pointer;
+}
+
+/* lower version link */
+#header #header-left {
+  align-items:baseline
+}
+
+#first-run-wizard {
+  position:fixed;
+  top:0;
+  bottom:0;
+  height:100%;
+  width:100%;
+  background-color:rgba(0, 0, 0, 0.5);
+  z-index:9000;
+  text-align:center;
+  cursor:pointer;
+}
+
+#first-run-wizard img {
+  width: 70%;
+  max-width: 210px;
+}
+
+.dialog {
+  display:block;
+  background: white;
+  position:relative;
+  width:50%;
+  max-width: 400px;
+  top:25%;
+  margin:0px auto;
+}
+
+.big-button {
+  display:block;
+  background: #0082c9;
+  width:100%;
+  margin:0px auto;
+  color: white;
+  cursor: pointer;
+  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+  opacity:1
+}
+.big-button:hover {
+  border-color: white !important;
+  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
+  opacity:0.75
+}
+
+#close-wizard {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  display: block;
+  background: none;
+  background-image:url('../img/view-close.svg');
+  width: 38px;
+  height: 19px;
+  text-indent: -9999px;
+  border: none;
+}
+
+#wizard-btn {
+  cursor: pointer;
+}
+
+#poweroff-dialog {
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: space-around;
+  align-items: center;
+  width: 200px;
+  background-color: white;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  text-align: center;
+  z-index: 10000;
+  line-height: 60px;
+  border-radius: 3px;
+}
+
+#poweroff-dialog button {
+   font-size: 2em;
+}
+
+#overlay {
+  display: block;
+  background-color: rgba(0, 0, 0, 0.2);
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 2500;
+}
+
+.ok-field{
+  color: green;
+}
+
+.error-field{
+  color: red;
+}
+
+.val-field{
+  color: gray;
+}
+
+.dashtable tr {
+  height: 25px;
+  border-bottom: 1px solid #ebebeb;
+}
+
+.dashtable td {
+  border-bottom: 1px solid #ebebeb;
+}
+
+#dashboard-suggestions {
+  margin-bottom: 1em;
+}
+
+.hidden {
+ display:none
+}
+
+.hidden-visually {
+ position:absolute;
+ left:-10000px;
+ top:auto;
+ width:1px;
+ height:1px;
+ overflow:hidden
+}
+
+.details-box {
+  background-color: #fbfbfb;
+  border: solid 1px lightgray;
+  color: #565656;
+  overflow: auto;
+}
+
+#language-selection {
+  border: none;
+  color: white;
+}
diff --git a/ncp-web/elements.php b/ncp-web/elements.php
new file mode 100644
index 00000000..dafb3aad
--- /dev/null
+++ b/ncp-web/elements.php
@@ -0,0 +1,154 @@
+<?php
+///
+// 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!
+//
+// More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+///
+
+// fill options with contents from directory
+
+function print_config_form( $ncp_app, $cfg, $l )
+{
+  $ret  = <<<HTML
+    <div id="config-box">
+      <table>
+HTML;
+
+  foreach ($cfg['params'] as $param)
+  {
+    $ret .= "<tr>";
+    $ret .= "<td><label for=\"$ncp_app-$param[id]\">$param[name]</label></td>";
+
+    // default to text input
+    if (!array_key_exists('type', $param))
+    {
+      $ret .= "<td><input type=\"text\" name=\"$param[name]\" id=\"$ncp_app-$param[id]\" value=\"$param[value]\" size=\"40\"></td>";
+    }
+
+    // checkbox
+    else if ($param['type'] == 'bool')
+    {
+      $checked = "";
+      if ($param['value'] == 'yes')
+        $checked = 'checked';
+      $ret .= "<td><input type=\"checkbox\" id=\"$ncp_app-$param[id]\" name=\"$param[name]\" value=\"$param[value]\" $checked></td>";
+    }
+    $ret .= "</tr>";
+  }
+
+  $ret .= <<<HTML
+      </table>
+    </div>
+    <div class="config-button-wrapper">
+      <button id="$ncp_app-config-button" class="config-button">Run</button>
+      <img class="loading-gif" src="img/loading-small.gif">
+      <div class="circle-retstatus" class="icon-red-circle"></div>
+    </div>
+  </form>
+HTML;
+  return $ret;
+}
+
+function print_config_forms( $l /* translations l10n object */ )
+{
+  $bin_dir    = '/usr/local/bin/ncp/';
+  $cfg_dir    = '/usr/local/etc/ncp-config.d/';
+  $d_iterator = new RecursiveDirectoryIterator($bin_dir);
+  $iterator   = new RecursiveIteratorIterator($d_iterator);
+  $objects    = new RegexIterator($iterator, '/^.+\.sh$/i', RecursiveRegexIterator::GET_MATCH);
+
+  $ret      = "";
+  $sections = array_diff(scandir($bin_dir), array('.', '..', 'l10n'));
+  foreach ($sections as $section)
+  {
+    $scripts = array_diff(scandir($bin_dir . $section), array('.', '..', 'nc-wifi.sh', 'nc-info.sh'));
+    foreach ($scripts as $script)
+    {
+      $ncp_app  = pathinfo($script, PATHINFO_FILENAME);
+      $cfg_file = $cfg_dir . $ncp_app . ".cfg";
+      $cfg      = json_decode(file_get_contents($cfg_file), true);
+
+      $hidden = 'hidden';
+      if (array_key_exists('app',$_GET) && $_GET['app'] == $ncp_app)
+        $hidden = '';
+      $ret .= <<<HTML
+        <div id="$cfg[id]-config-box" class="$hidden">
+          <h2 class="text-title">$cfg[description]</h2>
+          <div class="config-box-info-txt">$cfg[info]</div>
+          <a href="#" target="_blank">
+            <div class="icon-info"></div>
+          </a>
+          <br/>
+          <div class="table-wrapper">
+HTML;
+
+      $ret .= print_config_form($ncp_app, $cfg, $l);
+      $ret .= <<<HTML
+            <div id="$ncp_app-details-box" class="details-box outputbox hidden"></div>
+          </div>
+        </div>
+HTML;
+    }
+  }
+  return $ret;
+}
+
+function print_sidebar( $l /* translations l10n object */, $ticks /* wether to calculate ticks(slow) */ )
+{
+  $bin_dir    = '/usr/local/bin/ncp/';
+  $cfg_dir    = '/usr/local/etc/ncp-config.d/';
+  $d_iterator = new RecursiveDirectoryIterator($bin_dir);
+  $iterator   = new RecursiveIteratorIterator($d_iterator);
+  $objects    = new RegexIterator($iterator, '/^.+\.sh$/i', RecursiveRegexIterator::GET_MATCH);
+
+  $ret      = "";
+  $sections = array_diff(scandir($bin_dir), array('.', '..', 'l10n'));
+  foreach ($sections as $section)
+  {
+    $ret .= "<li id=\"$section\" class=\"nav-recent\"><span>{$l->__($section, $section)}</span>";
+
+    $scripts = array_diff(scandir($bin_dir . $section), array('.', '..', 'nc-wifi.sh', 'nc-info.sh'));
+    foreach ($scripts as $script)
+    {
+      $ncp_app  = pathinfo($script, PATHINFO_FILENAME);
+      $cfg_file = $cfg_dir . $ncp_app . ".cfg";
+      $cfg      = json_decode(file_get_contents($cfg_file), true);
+
+      $active = "";
+      if ( $ticks ) {
+        exec("bash -c \"source /usr/local/etc/library.sh && is_active_app $ncp_app\"", $output, $retval);
+        if ($retval == 0)
+          $active = " ✓";
+      } else if (sizeof($cfg['params']) > 0 && $cfg['params'][0]['id'] == 'ACTIVE' && $cfg['params'][0]['value'] == 'yes')
+        $active = " ✓";
+
+      $ret .= "<ul id=\"$ncp_app\" class=\"nav-recent\">";
+      $ret .=   "<a href=\"#\"> {$l->__($ncp_app, $ncp_app)}$active </a>";
+      $ret .= "</ul>";
+    }
+    $ret .= "</li>";
+  }
+
+  return $ret;
+}
+
+// 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/ncp-web/img/files.svg b/ncp-web/img/files.svg
new file mode 100644
index 00000000..15365027
--- /dev/null
+++ b/ncp-web/img/files.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path d="m1.5 2c-0.25 0-0.5 0.25-0.5 0.5v11c0 0.26 0.24 0.5 0.5 0.5h13c0.26 0 0.5-0.241 0.5-0.5v-9c0-0.25-0.25-0.5-0.5-0.5h-6.5l-2-2z"/></svg>
diff --git a/ncp-web/index.php b/ncp-web/index.php
index d12b6c0f..fdd30260 100644
--- a/ncp-web/index.php
+++ b/ncp-web/index.php
@@ -17,15 +17,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
     <meta name="mobile-web-app-capable" content="yes">
   <?php
+
     // redirect to activation first time
     exec("a2query -s ncp-activation", $output, $ret);
     if ($ret == 0) {
       header("Location: activate");
       exit();
     }
+    ini_set('session.cookie_httponly', 1);
+    if (isset($_SERVER['HTTPS']))
+      ini_set('session.cookie_secure', 1);
     session_start();
 
-    include('sidebar.php');
+    include('elements.php');
     $modules_path = '/usr/local/etc/ncp-config.d/';
     $l10nDir = "l10n";
 
@@ -38,16 +42,14 @@
     header("X-Frame-Options: DENY");
     header("Cache-Control: no-cache");
     header('Pragma: no-cache');
-    ini_set('session.cookie_httponly', 1);
-    if (isset($_SERVER['HTTPS']))
-      ini_set('session.cookie_secure', 1);
+    header('Expires: -1');
 
     // HTTP2 push headers
-    header("Link: </minified.js>; rel=preload; as=script;,</ncp.js>; rel=preload; as=script;,</ncp.css>; rel=preload; as=style;,</img/ncp-logo.svg>; rel=preload; as=image;, </img/loading-small.gif>; rel=preload; as=image;, rel=preconnect href=ncp-launcher.php;");
+    header("Link: </js/minified.js>; rel=preload; as=script;,</js/ncp.js>; rel=preload; as=script;,</css/ncp.css>; rel=preload; as=style;,</img/ncp-logo.svg>; rel=preload; as=image;, </img/loading-small.gif>; rel=preload; as=image;, rel=preconnect href=ncp-launcher.php;");
 
   ?>
     <link rel="icon" type="image/png" href="img/favicon.png"/>
-    <link rel="stylesheet" href="ncp.css">
+    <link rel="stylesheet" href="css/ncp.css">
 </head>
 <body id="body-user">
 <?php
@@ -70,9 +72,13 @@
   <?php
     exec("ncp-test-updates", $output, $ret);
     if ($ret == 0) {
+      $version  = "v0.0";
+      $ver_file = '/var/run/.ncp-latest-version';
+      if (file_exists($ver_file))
+        $version = file_get_contents($ver_file);
       echo '<div id="notification">';
       echo '<div id="update-notification" class="row type-error closeable">';
-      echo "version " . file_get_contents( '/var/run/.ncp-latest-version' ) . " is available";
+      echo "version " . $version . " is available";
       echo '<a class="action close icon-close" href="#" alt="Dismiss"></a>';
       echo '</div>';
       echo '</div>';
@@ -110,25 +116,30 @@ HTML;
         </div>
       </a>
       <a id=versionlink target="_blank" href="https://github.com/nextcloud/nextcloudpi/blob/master/changelog.md">
-        <?php echo file_get_contents( "/usr/local/etc/ncp-version" ) ?>
+        <?php
+          $version  = "v0.0";
+          $ver_file = "/usr/local/etc/ncp-version";
+          if (file_exists($ver_file))
+            $version = file_get_contents($ver_file);
+          echo $version;
+      ?>
       </a>
-<?php
-    // language selection drop
-    $selected_lang=$l->load_language_setting();
+      <?php
+        // language selection drop
+        $selected_lang=$l->load_language_setting();
 
-    $fh = fopen('langs.cfg', 'r');
-    echo "<select id=\"language-selection\" name=\"language-selection\">";
-    while ($line = fgets($fh)) {
-      echo "<option value='" . $line . "' ";
-      error_log("NACHO $line - $selected_lang");
-      if( $line == $selected_lang )
-        echo "selected='selected'";
-      echo ">". $line ."</option>";
-    }
-    echo "<option value=\"[new]\">new..</option>";
-    echo "</select>";
-    fclose($fh);
-?>
+        $fh = fopen('langs.cfg', 'r');
+        echo "<select id=\"language-selection\" name=\"language-selection\">";
+        while ($line = fgets($fh)) {
+          echo "<option value='" . $line . "' ";
+          if( $line == $selected_lang )
+            echo "selected='selected'";
+          echo ">". $line ."</option>";
+        }
+        echo "<option value=\"[new]\">new..</option>";
+        echo "</select>";
+        fclose($fh);
+    ?>
     </div>
     <div id="header-right">
       <a href="https://ownyourbits.com" id="nextcloud-btn" target="_blank" tabindex="1" title="<?php echo $l->__("Launch Nextcloud"); ?>">
@@ -174,42 +185,26 @@ HTML;
 	<div id="content" class="app-files" role="main">
         <div id='overlay' class="hidden"></div>
 		<div id="app-navigation">
-        	<ul id="ncp-options">
+        	<div id="ncp-options">
               <?php echo print_sidebar($l, false); ?>
-            </ul>
+            </div>
           </div>
 
       <div id="app-content">
         <div id="app-navigation-toggle" class="icon-menu hidden"></div>
 
-        <div id="config-wrapper" class="hidden">
-          <h2 id="config-box-title" class="text-title"><?php echo $l->__("System Info"); ?></h2>
-          <div id="config-box-info-txt"></div>
-          <a href="#" target="_blank">
-            <div id="config-extra-info" class="icon-info"></div>
-          </a>
-          <br/>
-          <div id="config-box-wrapper" class="table-wrapper">
-            <form>
-              <div id="config-box"></div>
-                <div id="config-button-wrapper">
-                  <button id="config-button"><?php echo $l->__("Run"); ?></button>
-                  <img id="loading-gif" src="img/loading-small.gif">
-                  <div id="circle-retstatus" class="icon-red-circle"></div>
-                </div>
-            </form>
-            <div id="details-box" class="outputbox"></div>
-          </div>
+        <div id="config-wrapper">
+          <?php echo print_config_forms($l); ?>
         </div>
 
-        <div id="dashboard-wrapper">
+        <div id="dashboard-wrapper" <?php if(array_key_exists('app',$_GET) && ($_GET['app'] != 'dashboard')) echo 'class="hidden"'; ?>>
           <h2 class="text-title"><?php echo $l->__("System Info"); ?></h2>
           <div id="dashboard-suggestions" class="table-wrapper"></div>
           <div id="dashboard-table" class="outputbox table-wrapper"></div>
           <div id="loading-info-gif"> <img src="img/loading-small.gif"> </div>
         </div>
 
-        <div id="nc-config-wrapper" class="hidden">
+        <div id="nc-config-wrapper" <?php if($_GET['app'] != 'config') echo 'class="hidden"';?>>
           <h2 class="text-title"><?php echo $l->__("Nextcloud configuration"); ?></h2>
           <div id="nc-config-box" class="table-wrapper">
 <?php
@@ -253,8 +248,8 @@ HTML;
     echo '<input type="hidden" id="csrf-token-ui"  name="csrf-token-ui"  value="' . getCSRFToken() . '"/>';
     echo '<input type="hidden" id="csrf-token-cfg" name="csrf-token-cfg" value="' . getCSRFToken() . '"/>';
   ?>
-    <script src="minified.js"></script>
-    <script src="ncp.js"></script>
+    <script src="js/minified.js"></script>
+    <script src="js/ncp.js"></script>
 </body>
 </html>
 
diff --git a/ncp-web/js/minified.js b/ncp-web/js/minified.js
new file mode 100644
index 00000000..251866b7
--- /dev/null
+++ b/ncp-web/js/minified.js
@@ -0,0 +1 @@
+/^u/.test(typeof define)&&function(a){var b=this.require=function(b){return a[b]};this.define=function(c,d){a[c]=a[c]||d(b)}}({}),define("minified",function(){function a(a){return a.substr(0,3)}function b(a){return a!=Eb?""+a:""}function c(a){return"string"==typeof a}function d(a){return!!a&&"object"==typeof a}function e(a){return a&&a.nodeType}function f(a){return"number"==typeof a}function g(a){return d(a)&&!!a.getDay}function h(a){return!0===a||!1===a}function i(a){var b=typeof a;return"object"==b?!(!a||!a.getDay):"string"==b||"number"==b||h(a)}function j(a){return a}function k(a){return a+1}function l(a,c,d){return b(a).replace(c,d!=Eb?d:"")}function m(a){return l(a,/[\\\[\]\/{}()*+?.$|^-]/g,"\\$&")}function n(a){return l(a,/^\s+|\s+$/g)}function o(a,b,c){for(var d in a)a.hasOwnProperty(d)&&b.call(c||a,d,a[d]);return a}function p(a,b,c){if(a)for(var d=0;d<a.length;d++)b.call(c||a,a[d],d);return a}function q(a,b,c){var d=[],e=db(b)?b:function(a){return b!=a};return p(a,function(b,f){e.call(c||a,b,f)&&d.push(b)}),d}function r(a,b,c,d){var e=[];return a(b,function(a,f){eb(a=c.call(d||b,a,f))?p(a,function(a){e.push(a)}):a!=Eb&&e.push(a)}),e}function s(a,b,c){return r(p,a,b,c)}function t(a){var b=0;return o(a,function(){b++}),b}function u(a){var b=[];return o(a,function(a){b.push(a)}),b}function v(a,b,c){var d=[];return p(a,function(e,f){d.push(b.call(c||a,e,f))}),d}function w(a,b){if(eb(a)){var c=vb(b);return M(G(a,0,c.length),c)}return b!=Eb&&a.substr(0,b.length)==b}function x(a,b){if(eb(a)){var c=vb(b);return M(G(a,-c.length),c)||!c.length}return b!=Eb&&a.substr(a.length-b.length)==b}function y(a){var b=a.length;return eb(a)?new ub(v(a,function(){return a[--b]})):l(a,/[\s\S]/g,function(){return a.charAt(--b)})}function z(a,b){var c={};return p(a,function(a){c[a]=b}),c}function A(a,b){var c,d=b||{};for(c in a)d[c]=a[c];return d}function B(a,b){for(var c=b,d=0;d<a.length;d++)c=A(a[d],c);return c}function C(a){return db(a)?a:function(b,c){return a===b?c:void 0}}function D(a,b,c){return b==Eb?c:0>b?Math.max(a.length+b,0):Math.min(a.length,b)}function E(a,b,c,d){b=C(b),d=D(a,d,a.length);for(var e=D(a,c,0);d>e;e++)if((c=b.call(a,a[e],e))!=Eb)return c}function F(a,b,c,d){b=C(b),d=D(a,d,-1);for(var e=D(a,c,a.length-1);e>d;e--)if((c=b.call(a,a[e],e))!=Eb)return c}function G(a,b,c){var d=[];if(a)for(c=D(a,c,a.length),b=D(a,b,0);c>b;b++)d.push(a[b]);return d}function H(a){return v(a,j)}function I(a){return function(){return new ub(O(a,arguments))}}function J(a){var b={};return q(a,function(a){return b[a]?!1:b[a]=1})}function K(a,b){var c=z(b,1);return q(a,function(a){var b=c[a];return c[a]=0,b})}function L(a,b){for(var c=0;c<a.length;c++)if(a[c]==b)return!0;return!1}function M(a,b){var c,d=db(a)?a():a,e=db(b)?b():b;return d==e?!0:d==Eb||e==Eb?!1:i(d)||i(e)?g(d)&&g(e)&&+d==+e:eb(d)?d.length==e.length&&!E(d,function(a,b){return M(a,e[b])?void 0:!0}):!eb(e)&&(c=u(d)).length==t(e)&&!E(c,function(a){return M(d[a],e[a])?void 0:!0})}function N(a,b,c){return db(a)?a.apply(c&&b,v(c||b,j)):void 0}function O(a,b,c){return v(a,function(a){return N(a,b,c)})}function P(a,b,c,d){return function(){return N(a,b,s([c,arguments,d],j))}}function Q(a,b){for(var c=0>b?"-":"",d=(c?-b:b).toFixed(0);d.length<a;)d="0"+d;return c+d}function R(a,b,c){var d,e=0,f=c?b:y(b);return a=(c?a:y(a)).replace(/./g,function(a){return"0"==a?(d=!1,f.charAt(e++)||"0"):"#"==a?(d=!0,f.charAt(e++)||""):d&&!f.charAt(e)?"":a}),c?a:b.substr(0,b.length-e)+y(a)}function S(a,b,c){return b!=Eb&&a?60*parseFloat(a[b]+a[b+1])+parseFloat(a[b]+a[b+2])+c.getTimezoneOffset():0}function T(a){return new Date(+a)}function U(a,b,c){return a["set"+b](a["get"+b]()+c),a}function V(a,b,c){return c==Eb?V(new Date,a,b):U(T(a),b.charAt(0).toUpperCase()+b.substr(1),c)}function W(a,b,c){var d=+b,e=+c,f=e-d;if(0>f)return-W(a,c,b);if(b={milliseconds:1,seconds:1e3,minutes:6e4,hours:36e5}[a])return f/b;for(b=a.charAt(0).toUpperCase()+a.substr(1),a=Math.floor(f/{fullYear:31536e6,month:2628e6,date:864e5}[a]-2),d=U(new Date(d),b,a),f=a;1.2*a+4>f;f++)if(+U(d,b,1)>e)return f}function X(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}function Y(a){return l(a,/[\x00-\x1f'"\u2028\u2029]/g,X)}function Z(a,b){function c(a,c){var d=[];return e.call(c||a,a,function(a,b){eb(a)?p(a,function(a,c){b.call(a,a,c)}):o(a,function(a,c){b.call(c,a,c)})},b||j,function(){N(d.push,d,arguments)},vb),d.join("")}if(Lb[a])return Lb[a];var d="with(_.isObject(obj)?obj:{}){"+v(a.split(/{{|}}}?/g),function(a,b){var c,d=n(a),e=l(d,/^{/),d=d==e?"esc(":"";return b%2?(c=/^each\b(\s+([\w_]+(\s*,\s*[\w_]+)?)\s*:)?(.*)/.exec(e))?"each("+(n(c[4])?c[4]:"this")+", function("+c[2]+"){":(c=/^if\b(.*)/.exec(e))?"if("+c[1]+"){":(c=/^else\b\s*(if\b(.*))?/.exec(e))?"}else "+(c[1]?"if("+c[2]+")":"")+"{":(c=/^\/(if)?/.exec(e))?c[1]?"}\n":"});\n":(c=/^(var\s.*)/.exec(e))?c[1]+";":(c=/^#(.*)/.exec(e))?c[1]:(c=/(.*)::\s*(.*)/.exec(e))?"print("+d+'_.formatValue("'+Y(c[2])+'",'+(n(c[1])?c[1]:"this")+(d&&")")+"));\n":"print("+d+(n(e)?e:"this")+(d&&")")+");\n":a?'print("'+Y(a)+'");\n':void 0}).join("")+"}",e=Function("obj","each","esc","print","_",d);return 99<Mb.push(c)&&delete Lb[Mb.shift()],Lb[a]=c}function $(a){return l(a,/[<>'"&]/g,function(a){return"&#"+a.charCodeAt(0)+";"})}function _(a,b){return Z(a,$)(b)}function ab(a){return function(b,c){return new ub(a(this,b,c))}}function bb(a){return function(b,c,d){return a(this,b,c,d)}}function cb(a){return function(b,c,d){return new ub(a(b,c,d))}}function db(a){return"function"==typeof a&&!a.item}function eb(a){return a&&a.length!=Eb&&!c(a)&&!e(a)&&!db(a)&&a!==xb}function fb(a){return parseFloat(l(a,/^[^\d-]+/))}function gb(a){return a.Nia=a.Nia||++Ab}function hb(a,b){var c,d=[],e={};return rb(a,function(a){rb(b(a),function(a){e[c=gb(a)]||(d.push(a),e[c]=!0)})}),d}function ib(a,b){var c={$position:"absolute",$visibility:"hidden",$display:"block",$height:Eb},d=a.get(c),c=a.set(c).get("clientHeight");return a.set(d),c*b+"px"}function jb(a){Bb?Bb.push(a):setTimeout(a,0)}function kb(a,b,c){return ob(a,b,c)[0]}function lb(a,b,c){return a=nb(document.createElement(a)),eb(b)||b!=Eb&&!d(b)?a.add(b):a.set(b).add(c)}function mb(a){return r(rb,a,function(a){return eb(a)?mb(a):(e(a)&&(a=a.cloneNode(!0),a.removeAttribute&&a.removeAttribute("id")),a)})}function nb(a,b,c){return db(a)?jb(a):new ub(ob(a,b,c))}function ob(a,b,d){function f(a){return eb(a)?r(rb,a,f):a}function g(a){return q(r(rb,a,f),function(a){for(;a=a.parentNode;)if(a==b[0]||d)return a==b[0]})}return b?1!=(b=ob(b)).length?hb(b,function(b){return ob(a,b,d)}):c(a)?1!=e(b[0])?[]:d?g(b[0].querySelectorAll(a)):b[0].querySelectorAll(a):g(a):c(a)?document.querySelectorAll(a):r(rb,a,f)}function pb(a,b){function d(a,b){var c=RegExp("(^|\\s+)"+a+"(?=$|\\s)","i");return function(d){return a?c.test(d[b]):!0}}var g,h,i={},j=i;return db(a)?a:f(a)?function(b,c){return c==a}:!a||"*"==a||c(a)&&(j=/^([\w-]*)\.?([\w-]*)$/.exec(a))?(g=d(j[1],"tagName"),h=d(j[2],"className"),function(a){return 1==e(a)&&g(a)&&h(a)}):b?function(c){return nb(a,b).find(c)!=Eb}:(nb(a).each(function(a){i[gb(a)]=!0}),function(a){return i[gb(a)]})}function qb(a){var b=pb(a);return function(a){return b(a)?Eb:!0}}function rb(a,b){return eb(a)?p(a,b):a!=Eb&&b(a,0),a}function sb(){this.state=null,this.values=[],this.parent=null}function tb(){var a,b,c=[],e=arguments,f=e.length,g=0,h=0,i=new sb;return i.errHandled=function(){h++,i.parent&&i.parent.errHandled()},a=i.fire=function(a,b){return null==i.state&&null!=a&&(i.state=!!a,i.values=eb(b)?b:[b],setTimeout(function(){p(c,function(a){a()})},0)),i},p(e,function j(b,c){try{b.then?b.then(function(b){(d(b)||db(b))&&db(b.then)?j(b,c):(i.values[c]=H(arguments),++g==f&&a(!0,2>f?i.values[c]:i.values))},function(){i.values[c]=H(arguments),a(!1,2>f?i.values[c]:[i.values[c][0],i.values,c])}):b(function(){a(!0,H(arguments))},function(){a(!1,H(arguments))})}catch(e){a(!1,[e,i.values,c])}}),i.stop=function(){return p(e,function(a){a.stop&&a.stop()}),i.stop0&&N(i.stop0)},b=i.then=function(a,b){function e(){try{var c=i.state?a:b;db(c)?function g(a){try{var b,c=0;if((d(a)||db(a))&&db(b=a.then)){if(a===f)throw new TypeError;b.call(a,function(a){c++||g(a)},function(a){c++||f.fire(!1,[a])}),f.stop0=a.stop}else f.fire(!0,[a])}catch(e){if(!c++&&(f.fire(!1,[e]),!h))throw e}}(N(c,wb,i.values)):f.fire(i.state,i.values)}catch(e){if(f.fire(!1,[e]),!h)throw e}}var f=tb();return db(b)&&i.errHandled(),f.stop0=i.stop,f.parent=i,null!=i.state?setTimeout(e,0):c.push(e),f},i.always=function(a){return b(a,a)},i.error=function(a){return b(0,a)},i}function ub(a,b){var c,d,e,f,g,h=0;if(a)for(c=0,d=a.length;d>c;c++)if(e=a[c],b&&eb(e))for(f=0,g=e.length;g>f;f++)this[h++]=e[f];else this[h++]=e;else this[h++]=b;this.length=h,this._=!0}function vb(){return new ub(arguments,!0)}var wb,xb=window,yb={},zb={},Ab=1,Bb=/^[ic]/.test(document.readyState)?Eb:[],Cb={},Db=0,Eb=null,Fb="January,February,March,April,May,June,July,August,September,October,November,December".split(/,/g),Gb=v(Fb,a),Hb="Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(/,/g),Ib=v(Hb,a),Jb={y:["FullYear",j],Y:["FullYear",function(a){return a%100}],M:["Month",k],n:["Month",Gb],N:["Month",Fb],d:["Date",j],m:["Minutes",j],H:["Hours",j],h:["Hours",function(a){return a%12||12}],k:["Hours",k],K:["Hours",function(a){return a%12}],s:["Seconds",j],S:["Milliseconds",j],a:["Hours","am,am,am,am,am,am,am,am,am,am,am,am,pm,pm,pm,pm,pm,pm,pm,pm,pm,pm,pm,pm".split(/,/g)],w:["Day",Ib],W:["Day",Hb],z:["TimezoneOffset",function(a,b,c){return c?c:(b=0>a?-a:a,(a>0?"-":"+")+Q(2,Math.floor(b/60))+Q(2,b%60))}]},Kb={y:0,Y:[0,-2e3],M:[1,1],n:[1,Gb],N:[1,Fb],d:2,m:4,H:3,h:3,K:[3,1],k:[3,1],s:5,S:6,a:[3,"am,pm".split(/,/g)]},Lb={},Mb=[];return A({each:bb(p),filter:ab(q),collect:ab(s),map:ab(v),toObject:bb(z),equals:bb(M),sub:ab(G),reverse:bb(y),find:bb(E),findLast:bb(F),startsWith:bb(w),endsWith:bb(x),contains:bb(L),call:ab(O),array:bb(H),unite:bb(I),merge:bb(B),uniq:ab(J),intersection:ab(K),join:function(a){return v(this,j).join(a)},reduce:function(a,b){return p(this,function(c,d){b=a.call(this,b,c,d)}),b},sort:function(a){return new ub(v(this,j).sort(a))},remove:function(){rb(this,function(a){a.parentNode.removeChild(a)})},text:function(){return r(rb,this,function(a){return a.textContent}).join("")},trav:function(a,b,c){var d=f(b),e=pb(d?Eb:b),g=d?b:c;return new ub(hb(this,function(b){for(var c=[];(b=b[a])&&c.length!=g;)e(b)&&c.push(b);return c}))},next:function(a,b){return this.trav("nextSibling",a,b||1)},up:function(a,b){return this.trav("parentNode",a,b||1)},select:function(a,b){return nb(a,this,b)},is:function(a){return!this.find(qb(a))},only:function(a){return new ub(q(this,pb(a)))},not:function(a){return new ub(q(this,qb(a)))},get:function(a,b){var d,e,f,g=this,h=g[0];return h?c(a)?(d=/^(\W*)(.*)/.exec(l(a,/^%/,"@data-")),e=d[1],h=zb[e]?zb[e](this,d[2]):"$"==a?g.get("className"):"$$"==a?g.get("@style"):"$$slide"==a?g.get("$height"):"$$fade"==a||"$$show"==a?"hidden"==g.get("$visibility")||"none"==g.get("$display")?0:"$$fade"==a?isNaN(g.get("$opacity",!0))?1:g.get("$opacity",!0):1:"$"==e?xb.getComputedStyle(h,Eb).getPropertyValue(l(d[2],/[A-Z]/g,function(a){return"-"+a.toLowerCase()})):"@"==e?h.getAttribute(d[2]):h[d[2]],b?fb(h):h):(f={},(eb(a)?rb:o)(a,function(a){f[a]=g.get(a,b)}),f):void 0},set:function(a,b){var d,e,f=this;return b!==wb?(d=/^(\W*)(.*)/.exec(l(l(a,/^\$float$/,"cssFloat"),/^%/,"@data-")),e=d[1],yb[e]?yb[e](this,d[2],b):"$$fade"==a?this.set({$visibility:b?"visible":"hidden",$opacity:b}):"$$slide"==a?f.set({$visibility:b?"visible":"hidden",$overflow:"hidden",$height:/px/.test(b)?b:function(a,c,d){return ib(nb(d),b)}}):"$$show"==a?b?f.set({$visibility:b?"visible":"hidden",$display:""}).set({$display:function(a){return"none"==a?"block":a}}):f.set({$display:"none"}):"$$"==a?f.set("@style",b):rb(this,function(c,f){var g=db(b)?b(nb(c).get(a),f,c):b;"$"==e?d[2]?c.style[d[2]]=g:rb(g&&g.split(/\s+/),function(a){var b=l(a,/^[+-]/),d=c.className||"",e=l(d,RegExp("(^|\\s+)"+b+"(?=$|\\s)"));(/^\+/.test(a)||b==a&&d==e)&&(e+=" "+b),c.className=n(e)}):"$$scrollX"==a?c.scroll(g,nb(c).get("$$scrollY")):"$$scrollY"==a?c.scroll(nb(c).get("$$scrollX"),g):"@"==e?g==Eb?c.removeAttribute(d[2]):c.setAttribute(d[2],g):c[d[2]]=g})):c(a)||db(a)?f.set("$",a):o(a,function(a,b){f.set(a,b)}),f},show:function(){return this.set("$$show",1)},hide:function(){return this.set("$$show",0)},add:function(a,b){return this.each(function(c,d){function f(a){eb(a)?rb(a,f):db(a)?f(a(c,d)):a!=Eb&&(a=e(a)?a:document.createTextNode(a),g?g.parentNode.insertBefore(a,g.nextSibling):b?b(a,c,c.parentNode):c.appendChild(a),g=a)}var g;f(d&&!db(a)?mb(a):a)})},fill:function(a){return this.each(function(a){nb(a.childNodes).remove()}).add(a)},addAfter:function(a){return this.add(a,function(a,b,c){c.insertBefore(a,b.nextSibling)})},addBefore:function(a){return this.add(a,function(a,b,c){c.insertBefore(a,b)})},addFront:function(a){return this.add(a,function(a,b){b.insertBefore(a,b.firstChild)})},replace:function(a){return this.add(a,function(a,b,c){c.replaceChild(a,b)})},clone:ab(mb),animate:function(a,b,c){var d,e=tb(),f=this,g=r(rb,this,function(b,d){var e,f=nb(b),g={};return o(e=f.get(a),function(c,e){var h=a[c];g[c]=db(h)?h(e,d,b):"$$slide"==c?ib(f,h):h}),f.dial(e,g,c)}),h=b||500;return e.stop0=function(){return e.fire(!1),d()},d=nb.loop(function(a){O(g,[a/h]),a>=h&&(d(),e.fire(!0,[f]))}),e},dial:function(a,c,d){function e(a,b){return/^#/.test(a)?parseInt(6<a.length?a.substr(2*b+1,2):(a=a.charAt(b+1))+a,16):fb(a.split(",")[b])}var f=this,g=d||0,h=db(g)?g:function(a,b,c){return c*(b-a)*(g+(1-g)*c*(3-2*c))+a};return function(d){o(a,function(a,g){var i=c[a],j=0;f.set(a,0>=d?g:d>=1?i:/^#|rgb\(/.test(i)?"rgb("+Math.round(h(e(g,j),e(i,j++),d))+","+Math.round(h(e(g,j),e(i,j++),d))+","+Math.round(h(e(g,j),e(i,j++),d))+")":l(i,/-?[\d.]+/,b(h(fb(g),fb(i),d))))})}},toggle:function(a,b,c,d){var e,f,g=this,h=!1;return b?(g.set(a),function(i){i!==h&&(f=(h=!0===i||!1===i?i:!h)?b:a,c?(e=g.animate(f,e?e.stop():c,d)).then(function(){e=Eb}):g.set(f))}):g.toggle(l(a,/\b(?=\w)/g,"-"),l(a,/\b(?=\w)/g,"+"))},values:function(a){var c=a||{};return this.each(function(a){var d=a.name||a.id,e=b(a.value);if(/form/i.test(a.tagName))for(d=0;d<a.elements.length;d++)nb(a.elements[d]).values(c);else!d||/ox|io/i.test(a.type)&&!a.checked||(c[d]=c[d]==Eb?e:r(rb,[c[d],e],j))}),c},offset:function(){for(var a=this[0],b={x:0,y:0};a;)b.x+=a.offsetLeft,b.y+=a.offsetTop,a=a.offsetParent;return b},on:function(a,d,e,f,g){return db(d)?this.on(Eb,a,d,e,f):c(f)?this.on(a,d,e,Eb,f):this.each(function(c,h){rb(a?ob(a,c):c,function(a){rb(b(d).split(/\s/),function(b){function c(b,c,d){var j,l=!g;if(d=g?d:a,g)for(j=pb(g,a);d&&d!=a&&!(l=j(d));)d=d.parentNode;return!l||i!=b||e.apply(nb(d),f||[c,h])&&"?"==k||"|"==k}function d(a){c(i,a,a.target)||(a.preventDefault(),a.stopPropagation())}var i=l(b,/[?|]/g),k=l(b,/[^?|]/g),m=("blur"==i||"focus"==i)&&!!g,n=Ab++;a.addEventListener(i,d,m),a.M||(a.M={}),a.M[n]=c,e.M=r(rb,[e.M,function(){a.removeEventListener(i,d,m),delete a.M[n]}],j)})})})},onOver:function(a,b){var c=this,d=[];return db(b)?this.on(a,"|mouseover |mouseout",function(a,e){var f=a.relatedTarget||a.toElement,g="mouseout"!=a.type;d[e]===g||!g&&f&&(f==c[e]||nb(f).up(c[e]).length)||(d[e]=g,b.call(this,g,a))}):this.onOver(Eb,a)},onFocus:function(a,b,c){return db(b)?this.on(a,"|blur",b,[!1],c).on(a,"|focus",b,[!0],c):this.onFocus(Eb,a,b)},onChange:function(a,b,c){return db(b)?this.on(a,"|input |change |click",function(a,c){var d=this[0],e=/ox|io/i.test(d.type)?d.checked:d.value;d.NiaP!=e&&b.call(this,d.NiaP=e,c)},c):this.onChange(Eb,a,b)},onClick:function(a,b,c,d){return db(b)?this.on(a,"click",b,c,d):this.onClick(Eb,a,b,c)},trigger:function(a,b){return this.each(function(c){for(var d=!0,e=c;e&&d;)o(e.M,function(e,f){d=d&&f(a,b,c)}),e=e.parentNode})},per:function(a,b){if(db(a))for(var c=this.length,d=0;c>d;d++)a.call(this,new ub(Eb,this[d]),d);else nb(a,this).per(b);return this},ht:function(a,b){var c=2<arguments.length?B(G(arguments,1)):b;return this.set("innerHTML",db(a)?a(c):/{{/.test(a)?_(a,c):/^#\S+$/.test(a)?_(kb(a).text,c):a)}},ub.prototype),A({request:function(a,c,d,e){e=e||{};var f,g=0,h=tb(),i=d&&d.constructor==e.constructor;try{h.xhr=f=new XMLHttpRequest,h.stop0=function(){f.abort()},i&&(d=r(o,d,function(a,b){return r(rb,b,function(b){return encodeURIComponent(a)+(b!=Eb?"="+encodeURIComponent(b):"")})}).join("&")),d==Eb||/post/i.test(a)||(c+="?"+d,d=Eb),f.open(a,c,!0,e.user,e.pass),i&&/post/i.test(a)&&f.setRequestHeader("Content-Type","application/x-www-form-urlencoded"),o(e.headers,function(a,b){f.setRequestHeader(a,b)}),o(e.xhr,function(a,b){f[a]=b}),f.onreadystatechange=function(){4!=f.readyState||g++||(200<=f.status&&300>f.status?h.fire(!0,[f.responseText,f]):h.fire(!1,[f.status,f.responseText,f]))},f.send(d)}catch(j){g||h.fire(!1,[0,Eb,b(j)])}return h},toJSON:JSON.stringify,parseJSON:JSON.parse,ready:jb,loop:function(a){function b(a){o(Cb,function(b,c){c(a)}),Db&&g(b)}function c(){return Cb[f]&&(delete Cb[f],Db--),e}var d,e=0,f=Ab++,g=xb.requestAnimationFrame||function(a){setTimeout(function(){a(+new Date)},33)};return Cb[f]=function(b){d=d||b,a(e=b-d,c)},Db++||g(b),c},off:function(a){O(a.M),a.M=Eb},setCookie:function(a,b,c,e){document.cookie=a+"="+(e?b:escape(b))+(c?"; expires="+(d(c)?c:new Date(+new Date+864e5*c)).toUTCString():"")},getCookie:function(a,b){var c,d=(c=RegExp("(^|;)\\s*"+a+"=([^;]*)").exec(document.cookie))&&c[2];return b?d:d&&unescape(d)},wait:function(a,b){var c=tb(),d=setTimeout(function(){c.fire(!0,b)},a);return c.stop0=function(){c.fire(!1),clearTimeout(d)},c}},nb),A({filter:cb(q),collect:cb(s),map:cb(v),sub:cb(G),reverse:y,each:p,toObject:z,find:E,findLast:F,contains:L,startsWith:w,endsWith:x,equals:M,call:cb(O),array:H,unite:I,merge:B,uniq:cb(J),intersection:cb(K),keys:cb(u),values:cb(function(a,b){var c=[];return b?p(b,function(b){c.push(a[b])}):o(a,function(a,b){c.push(b)}),c}),copyObj:A,extend:function(a){return B(G(arguments,1),a)},range:function(a,b){for(var c=[],d=b==Eb?a:b,e=b!=Eb?a:0;d>e;e++)c.push(e);return new ub(c)},bind:P,partial:function(a,b,c){return P(a,this,b,c)},eachObj:o,mapObj:function(a,b,c){var d={};return o(a,function(e,f){d[e]=b.call(c||a,e,f)}),d},filterObj:function(a,b,c){var d={};return o(a,function(e,f){b.call(c||a,e,f)&&(d[e]=f)}),d},isList:eb,isFunction:db,isObject:d,isNumber:f,isBool:h,isDate:g,isValue:i,isString:c,toString:b,dateClone:T,dateAdd:V,dateDiff:W,dateMidnight:function(a){return a=a||new Date,new Date(a.getFullYear(),a.getMonth(),a.getDate())},pad:Q,formatValue:function(a,d){var e,h,i=l(a,/^\?/);return g(d)?((h=/^\[(([+-])(\d\d)(\d\d))\]\s*(.*)/.exec(i))&&(e=h[1],d=V(d,"minutes",S(h,2,d)),i=h[5]),l(i,/(\w)(\1*)(?:\[([^\]]+)\])?/g,function(a,b,f,g){return(b=Jb[b])&&(a=d["get"+b[0]](),g=g&&g.split(","),a=eb(b[1])?(g||b[1])[a]:b[1](a,g,e),a==Eb||c(a)||(a=Q(f.length+1,a))),a})):E(i.split(/\s*\|\s*/),function(a){var c,e;if(c=/^([<>]?)(=?)([^:]*?)\s*:\s*(.*)$/.exec(a)){if(a=d,e=+c[3],(isNaN(e)||!f(a))&&(a=a==Eb?"null":b(a),e=c[3]),c[1]){if(!c[2]&&a==e||"<"==c[1]&&a>e||">"==c[1]&&e>a)return Eb}else if(a!=e)return Eb;c=c[4]}else c=a;return f(d)?c.replace(/[0#](.*[0#])?/,function(a){var b,c=/^([^.]+)(\.)([^.]+)$/.exec(a)||/^([^,]+)(,)([^,]+)$/.exec(a),e=0>d?"-":"",f=/(\d+)(\.(\d+))?/.exec((e?-d:d).toFixed(c?c[3].length:0));return a=c?c[1]:a,b=c?R(c[3],l(f[3],/0+$/),!0):"",(e?"-":"")+("#"==a?f[1]:R(a,f[1]))+(b.length?c[2]:"")+b}):c})},parseDate:function(a,b){var c,d,e,f,g,h,i,j,k,o={},p=1,q=l(a,/^\?/);if(q!=a&&!n(b))return Eb;if((e=/^\[([+-])(\d\d)(\d\d)\]\s*(.*)/.exec(q))&&(c=e,q=e[4]),!(e=RegExp(q.replace(/(.)(\1*)(?:\[([^\]]*)\])?/g,function(a,b,c,e){return/[dmhkyhs]/i.test(b)?(o[p++]=b,a=c.length+1,"(\\d"+(2>a?"+":"{1,"+a+"}")+")"):"z"==b?(d=p,p+=3,"([+-])(\\d\\d)(\\d\\d)"):/[Nna]/.test(b)?(o[p++]=[b,e&&e.split(",")],"([a-zA-Z\\u0080-\\u1fff]+)"):/w/i.test(b)?"[a-zA-Z\\u0080-\\u1fff]+":/\s/.test(b)?"\\s+":m(a)})).exec(b)))return wb;for(q=[0,0,0,0,0,0,0],f=1;p>f;f++)if(g=e[f],h=o[f],eb(h)){if(i=h[0],j=Kb[i],k=j[0],h=E(h[1]||j[1],function(a,b){return w(g.toLowerCase(),a.toLowerCase())?b:void 0}),h==Eb)return wb;q[k]="a"==i?q[k]+12*h:h}else h&&(i=parseFloat(g),j=Kb[h],eb(j)?q[j[0]]+=i-j[1]:q[j]+=i);return q=new Date(q[0],q[1],q[2],q[3],q[4],q[5],q[6]),V(q,"minutes",-S(c,1,q)-S(e,d,q))},parseNumber:function(a,b){var c=l(a,/^\?/);return c==a||n(b)?(c=/(^|[^0#.,])(,|[0#.]*,[0#]+|[0#]+\.[0#]+\.[0#.,]*)($|[^0#.,])/.test(c)?",":".",c=parseFloat(l(l(l(b,","==c?/\./g:/,/g),c,"."),/^[^\d-]*(-?\d)/,"$1")),isNaN(c)?wb:c):Eb},trim:n,isEmpty:function(a,b){return a==Eb||!a.length||b&&/^\s*$/.test(a)},escapeRegExp:m,escapeHtml:$,format:function(a,b,c){return Z(a,c)(b)},template:Z,formatHtml:_,promise:tb},vb),document.addEventListener("DOMContentLoaded",function(){O(Bb),Bb=Eb},!1),{HTML:function(){var a=lb("div");return vb(N(a.ht,a,arguments)[0].childNodes)},_:vb,$:nb,$$:kb,EE:lb,M:ub,getter:zb,setter:yb}});
\ No newline at end of file
diff --git a/ncp-web/js/ncp.js b/ncp-web/js/ncp.js
new file mode 100644
index 00000000..3f4e6d38
--- /dev/null
+++ b/ncp-web/js/ncp.js
@@ -0,0 +1,411 @@
+///
+// 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!
+//
+// More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+///
+
+var MINI = require('minified');
+var $ = MINI.$, $$ = MINI.$$, EE = MINI.EE;
+var selectedID = null;
+var lock       = false;
+
+// URL based navigation
+window.onpopstate = function(event) {
+  var ncp_app = location.search.split('=')[1];
+  if (ncp_app == 'config')
+    switch_to_section('nc-config');
+  else if (ncp_app == 'dashboard')
+    switch_to_section('dashboard');
+  else
+    app_clicked($('#' + ncp_app));
+};
+
+function errorMsg()
+{ 
+  $('#config-box').fill( "Something went wrong. Try refreshing the page" ); 
+}
+
+function switch_to_section(section)
+{
+  $( '#config-wrapper > div'    ).hide();
+  $( '#dashboard-wrapper'       ).hide();
+  $( '#nc-config-wrapper'       ).hide();
+  $( '#' + section + '-wrapper' ).show();
+  $( '#' + selectedID ).set('-active');
+  selectedID = null;
+}
+
+// slide menu
+var slide_menu_enabled = false;
+
+function open_menu()
+{
+  if ( !slide_menu_enabled ) return;
+  if ( $('#app-navigation').get('$width') != '250px' )
+  {
+    $('#overlay').show();
+    $('#overlay').on('|click', close_menu );
+    $('#app-navigation').animate( {$width: '250px'}, 150 );
+  }
+}
+
+function close_menu()
+{
+  if ( !slide_menu_enabled ) return;
+  if ( $('#app-navigation').get('$width') == '250px' )
+  {
+    $('#app-navigation').animate( {$width: '0px'}, 150 );
+    $('#overlay').hide();
+    $.off( close_menu );
+  }
+}
+
+function hide_overlay(e) { $('#overlay').hide() }
+
+function close_menu_on_click_out(e) { close_menu(); }
+
+function enable_slide_menu()
+{
+  if ( slide_menu_enabled ) return;
+  $( '#app-navigation' ).set( { $width: '0px' } );
+  $( '#app-navigation' ).set( { $position: 'absolute' } );
+  $( '#app-navigation-toggle' ).on('click', open_menu );
+  $( '#app-content' ).on('|click', close_menu_on_click_out );
+  slide_menu_enabled = true;
+}
+
+function disable_slide_menu()
+{
+  if ( !slide_menu_enabled ) return;
+  $.off( open_menu );
+  $.off( close_menu );
+  $.off( close_menu_on_click_out );
+  $( '#app-navigation' ).set( { $width: '250px' } );
+  $( '#app-navigation' ).set( { $position: 'unset' } );
+  $('#overlay').hide();
+  slide_menu_enabled = false;
+}
+
+function set_sidebar_click_handlers()
+{
+  // Show selected option configuration box
+  $( 'ul' , '#app-navigation' ).on('click', function(e)
+  {
+    if ( selectedID == this.get( '.id' ) ) // already selected
+      return;
+
+    if ( lock ) return;
+
+    if ( window.innerWidth <= 768 )
+      close_menu();
+
+    $( '#' + selectedID ).set('-active');
+    app_clicked(this);
+    history.pushState(null, selectedID, "?app=" + selectedID);
+  });
+}
+
+function print_dashboard()
+{
+  $.request('post', 'ncp-launcher.php', { action: 'info',
+                                          csrf_token: $( '#csrf-token-ui' ).get( '.value' ) }).then(
+
+    function success( result )
+    {
+      var ret = $.parseJSON( result );
+      if ( ret.token )
+        $('#csrf-token-ui').set( { value: ret.token } );
+      $('#loading-info-gif').hide();
+      $('#dashboard-table').ht( ret.table );
+      $('#dashboard-suggestions').ht( ret.suggestions );
+      reload_sidebar();
+    } ).error( errorMsg );
+}
+
+function reload_sidebar()
+{
+  // request
+  $.request('post', 'ncp-launcher.php', { action:'sidebar', 
+    csrf_token: $( '#csrf-token-ui' ).get( '.value' ) }).then( 
+      function success( result ) 
+      {
+        var ret = $.parseJSON( result );
+        if ( ret.token )
+          $('#csrf-token-ui').set( { value: ret.token } );
+        if ( ret.ret && ret.ret == '0' ) {
+          $('#ncp-options').ht( ret.output );
+          set_sidebar_click_handlers();
+        }
+      }).error( errorMsg );
+}
+
+function app_clicked(item)
+{
+  $('.details-box').hide();
+  $('.circle-retstatus').hide();
+  $('#' + selectedID + '-config-box').hide();
+  switch_to_section('config');
+  selectedID = item.get('.id');
+  item.set('+active');
+  $('#' + selectedID + '-config-box').show();
+  var baseURL = 'https://github.com/nextcloud/nextcloudpi/wiki/Configuration-Reference#';
+  $('#' + selectedID + '-config-box .icon-info').up().set( '@href', baseURL + selectedID );
+}
+
+$(function() 
+{
+  // Event source to receive process output in real time
+  if (!!window.EventSource)
+    var source = new EventSource('ncp-output.php');
+  else
+    $('#config-box-title').fill( "Browser not supported" );
+
+  $('#poweroff-dialog').hide();
+  $('#overlay').hide();
+
+  source.addEventListener('message', function(e) 
+    {
+      if ( e.origin != 'https://' + window.location.hostname + ':4443') 
+      {
+        $('.details-box').fill( "Invalid origin" ); 
+        return;
+      }
+
+      var box = $$('.details-box');
+      $('.details-box').ht( box.innerHTML + e.data + '<br>' );
+      box.scrollTop = box.scrollHeight;
+    }, false);
+
+  set_sidebar_click_handlers();
+
+  // Launch selected script
+  $( '.config-button' ).on('click', function(e)
+  {
+    lock = true;
+    $('.details-box').hide( '' );
+    $('.config-button').set('@disabled',true);
+    $('.loading-gif').set( { $display: 'inline' } );
+
+    // create configuration object
+    var cfg = {};
+    $( 'input' , '#' + selectedID + '-config-box' ).each( function(item){
+      if( item.getAttribute('type') == 'checkbox' )
+        item.value = item.checked ? 'yes' : 'no';
+
+      cfg[item.name] = item.value;
+    } );
+
+    $( 'select', '#config-box' ).each( function(item) {
+      var select = {
+        'id': item.name,
+        'value': []
+      };
+      $("#" + item.id + '>option').each(function(option) {
+        select.value.push(option.selected ? "_" + option.value + "_" : "" + option.value);
+      });
+      cfg[select.id] = select.value;
+    });
+
+
+    // reset box
+    $('.details-box').fill();
+    $('.details-box').show();
+    $('.details-box').set( {$height: '0vh'} );
+    $('.details-box').animate( {$height: '50vh'}, 150 );
+    $('.circle-retstatus').hide();
+
+    $( 'input' , '#config-box-wrapper' ).set('@disabled',true);
+
+    // request
+    $.request('post', 'ncp-launcher.php', { action:'launch', 
+                                            ref   : selectedID,
+                                            config: $.toJSON(cfg),
+                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then(
+      function success( result ) 
+      {
+        var ret = $.parseJSON( result );
+        if ( ret.token )
+          $('#csrf-token').set( { value: ret.token } );
+        if ( ret.ret )                           // means that the process was launched
+        {
+          if ( ret.ret == '0' ) 
+          {
+            if( ret.ref && ret.ref == 'nc-update' )
+              window.location.reload( true );
+            reload_sidebar();
+            $('.circle-retstatus').set( '+icon-green-circle' );
+          }
+          else 
+            $('.circle-retstatus').set( '-icon-green-circle' );
+          $('.circle-retstatus').show();
+        }
+        else                                     // print error from server instead
+          $('.details-box').fill(ret.output);
+        $( 'input' , '#config-box-wrapper' ).set('@disabled', null);
+        $('.config-button').set('@disabled',null);
+        $('.loading-gif').hide();
+        lock = false;
+      }).error( errorMsg );
+  });
+
+  // Update notification
+  $( '#notification' ).on('click', function(e)
+  {
+    if ( lock ) return;
+    lock = true;
+    
+    $( '#' + selectedID ).set('-active');
+
+    app_clicked( $('#nc-update') );
+
+    //clear details box
+    $('.details-box').hide( '' );
+  } );
+
+  // slide menu
+  if ( window.innerWidth <= 768 ) 
+    enable_slide_menu();
+
+  window.addEventListener('resize', function(){ 
+    if ( window.innerWidth <= 768 ) 
+      enable_slide_menu();
+    else
+      disable_slide_menu();
+  } );
+
+  // Power-off button
+  function hide_poweroff_dialog(ev)
+  {
+    $('#poweroff-dialog').hide();
+    $('#overlay').hide();
+    $('#overlay').off('click');
+  }
+  function poweroff_event_handler(e)
+  {
+    $('#overlay').show();
+    $('#poweroff-dialog').show();
+    $('#overlay').on('click', hide_poweroff_dialog );
+  }
+  $( '#poweroff' ).on('click', poweroff_event_handler );
+
+  $( '#poweroff-option_shutdown' ).on('click', function(e)
+  {
+    $('#poweroff-dialog').hide();
+    $('#overlay').hide();
+
+    // request
+    $.request('post', 'ncp-launcher.php', { action:'poweroff', 
+                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( 
+      function success( result ) 
+      {
+        switch_to_section( 'nc-config' );
+        $.off( poweroff_event_handler );
+        $('#nc-config-wrapper').ht('<h2 class="text-title">Shutting down...<h2>');
+      }).error( errorMsg );
+  } );
+
+  $( '#poweroff-option_reboot' ).on('click', function(e)
+  {
+    $('#poweroff-dialog').hide();
+    $('#overlay').hide();
+    // request
+    $.request('post', 'ncp-launcher.php', { action:'reboot', 
+                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( 
+      function success( result ) 
+      {
+        switch_to_section( 'nc-config' );
+        $.off( poweroff_event_handler );
+        $('#nc-config-wrapper').ht('<h2 class="text-title">Rebooting...<h2>');
+      }).error( errorMsg );
+  } );
+
+  // close notification icon
+  $( '.icon-close' ).on('click', function(e)
+  {
+    $( '#notification' ).hide();
+  } );
+ 
+  // close first run box
+  $( '.first-run-close' ).on('click', function(e)
+  {
+    $( '#first-run-wizard' ).hide();
+  } );
+  $( '#first-run-wizard' ).on('|click', function(e)
+  {
+    if( e.target.id == 'first-run-wizard' )
+      $( '#first-run-wizard' ).hide();
+  } );
+
+  // click to nextcloud button
+  $('#nextcloud-btn').set( '@href', window.location.protocol + '//' + window.location.hostname );
+
+  // dashboard button
+  $( '#dashboard-btn' ).on('click', function(e)
+  {
+    if ( lock ) return;
+    close_menu();
+    switch_to_section( 'dashboard' );
+    history.pushState(null, selectedID, "?app=dashboard");
+  } );
+
+  // config button
+  $( '#config-btn' ).on('click', function(e)
+  {
+    if ( lock ) return;
+    close_menu();
+    switch_to_section( 'nc-config' );
+    history.pushState(null, selectedID, "?app=config");
+  } );
+
+  // language selection
+  var langold = $( '#language-selection' ).get( '.value' );
+  $( '#language-selection' ).on( 'change', function(e)
+    {
+      if( '[new]' == this.get( '.value' ) )
+      {
+        this.set( '.value', langold );
+        var url = 'https://github.com/nextcloud/nextcloudpi/wiki/Add-a-new-language-to-ncp-web';
+        if ( !window.open( url, '_blank' ) ) // try to open in a new tab first
+          window.location.href = url;
+        return;
+      }
+      // request
+      $.request('post', 'ncp-launcher.php', { action:'cfg-ui',
+                                              value: this.get( '.value' ),
+                                              csrf_token: $( '#csrf-token-cfg' ).get( '.value' ) }).then(
+        function success( result )
+        {
+          var ret = $.parseJSON( result );
+          if ( ret.token )
+            $('#csrf-token-cfg').set( { value: ret.token } );
+          if ( ret.ret && ret.ret == '0' )                        // means that the process was launched
+            window.location.reload( true );
+          else
+            this.set( '.value', langold );
+        }
+    ).error( errorMsg )
+  } );
+
+  // load dashboard info
+  print_dashboard();
+} );
+
+// 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/ncp-web/minified.js b/ncp-web/minified.js
deleted file mode 100644
index 251866b7..00000000
--- a/ncp-web/minified.js
+++ /dev/null
@@ -1 +0,0 @@
-/^u/.test(typeof define)&&function(a){var b=this.require=function(b){return a[b]};this.define=function(c,d){a[c]=a[c]||d(b)}}({}),define("minified",function(){function a(a){return a.substr(0,3)}function b(a){return a!=Eb?""+a:""}function c(a){return"string"==typeof a}function d(a){return!!a&&"object"==typeof a}function e(a){return a&&a.nodeType}function f(a){return"number"==typeof a}function g(a){return d(a)&&!!a.getDay}function h(a){return!0===a||!1===a}function i(a){var b=typeof a;return"object"==b?!(!a||!a.getDay):"string"==b||"number"==b||h(a)}function j(a){return a}function k(a){return a+1}function l(a,c,d){return b(a).replace(c,d!=Eb?d:"")}function m(a){return l(a,/[\\\[\]\/{}()*+?.$|^-]/g,"\\$&")}function n(a){return l(a,/^\s+|\s+$/g)}function o(a,b,c){for(var d in a)a.hasOwnProperty(d)&&b.call(c||a,d,a[d]);return a}function p(a,b,c){if(a)for(var d=0;d<a.length;d++)b.call(c||a,a[d],d);return a}function q(a,b,c){var d=[],e=db(b)?b:function(a){return b!=a};return p(a,function(b,f){e.call(c||a,b,f)&&d.push(b)}),d}function r(a,b,c,d){var e=[];return a(b,function(a,f){eb(a=c.call(d||b,a,f))?p(a,function(a){e.push(a)}):a!=Eb&&e.push(a)}),e}function s(a,b,c){return r(p,a,b,c)}function t(a){var b=0;return o(a,function(){b++}),b}function u(a){var b=[];return o(a,function(a){b.push(a)}),b}function v(a,b,c){var d=[];return p(a,function(e,f){d.push(b.call(c||a,e,f))}),d}function w(a,b){if(eb(a)){var c=vb(b);return M(G(a,0,c.length),c)}return b!=Eb&&a.substr(0,b.length)==b}function x(a,b){if(eb(a)){var c=vb(b);return M(G(a,-c.length),c)||!c.length}return b!=Eb&&a.substr(a.length-b.length)==b}function y(a){var b=a.length;return eb(a)?new ub(v(a,function(){return a[--b]})):l(a,/[\s\S]/g,function(){return a.charAt(--b)})}function z(a,b){var c={};return p(a,function(a){c[a]=b}),c}function A(a,b){var c,d=b||{};for(c in a)d[c]=a[c];return d}function B(a,b){for(var c=b,d=0;d<a.length;d++)c=A(a[d],c);return c}function C(a){return db(a)?a:function(b,c){return a===b?c:void 0}}function D(a,b,c){return b==Eb?c:0>b?Math.max(a.length+b,0):Math.min(a.length,b)}function E(a,b,c,d){b=C(b),d=D(a,d,a.length);for(var e=D(a,c,0);d>e;e++)if((c=b.call(a,a[e],e))!=Eb)return c}function F(a,b,c,d){b=C(b),d=D(a,d,-1);for(var e=D(a,c,a.length-1);e>d;e--)if((c=b.call(a,a[e],e))!=Eb)return c}function G(a,b,c){var d=[];if(a)for(c=D(a,c,a.length),b=D(a,b,0);c>b;b++)d.push(a[b]);return d}function H(a){return v(a,j)}function I(a){return function(){return new ub(O(a,arguments))}}function J(a){var b={};return q(a,function(a){return b[a]?!1:b[a]=1})}function K(a,b){var c=z(b,1);return q(a,function(a){var b=c[a];return c[a]=0,b})}function L(a,b){for(var c=0;c<a.length;c++)if(a[c]==b)return!0;return!1}function M(a,b){var c,d=db(a)?a():a,e=db(b)?b():b;return d==e?!0:d==Eb||e==Eb?!1:i(d)||i(e)?g(d)&&g(e)&&+d==+e:eb(d)?d.length==e.length&&!E(d,function(a,b){return M(a,e[b])?void 0:!0}):!eb(e)&&(c=u(d)).length==t(e)&&!E(c,function(a){return M(d[a],e[a])?void 0:!0})}function N(a,b,c){return db(a)?a.apply(c&&b,v(c||b,j)):void 0}function O(a,b,c){return v(a,function(a){return N(a,b,c)})}function P(a,b,c,d){return function(){return N(a,b,s([c,arguments,d],j))}}function Q(a,b){for(var c=0>b?"-":"",d=(c?-b:b).toFixed(0);d.length<a;)d="0"+d;return c+d}function R(a,b,c){var d,e=0,f=c?b:y(b);return a=(c?a:y(a)).replace(/./g,function(a){return"0"==a?(d=!1,f.charAt(e++)||"0"):"#"==a?(d=!0,f.charAt(e++)||""):d&&!f.charAt(e)?"":a}),c?a:b.substr(0,b.length-e)+y(a)}function S(a,b,c){return b!=Eb&&a?60*parseFloat(a[b]+a[b+1])+parseFloat(a[b]+a[b+2])+c.getTimezoneOffset():0}function T(a){return new Date(+a)}function U(a,b,c){return a["set"+b](a["get"+b]()+c),a}function V(a,b,c){return c==Eb?V(new Date,a,b):U(T(a),b.charAt(0).toUpperCase()+b.substr(1),c)}function W(a,b,c){var d=+b,e=+c,f=e-d;if(0>f)return-W(a,c,b);if(b={milliseconds:1,seconds:1e3,minutes:6e4,hours:36e5}[a])return f/b;for(b=a.charAt(0).toUpperCase()+a.substr(1),a=Math.floor(f/{fullYear:31536e6,month:2628e6,date:864e5}[a]-2),d=U(new Date(d),b,a),f=a;1.2*a+4>f;f++)if(+U(d,b,1)>e)return f}function X(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}function Y(a){return l(a,/[\x00-\x1f'"\u2028\u2029]/g,X)}function Z(a,b){function c(a,c){var d=[];return e.call(c||a,a,function(a,b){eb(a)?p(a,function(a,c){b.call(a,a,c)}):o(a,function(a,c){b.call(c,a,c)})},b||j,function(){N(d.push,d,arguments)},vb),d.join("")}if(Lb[a])return Lb[a];var d="with(_.isObject(obj)?obj:{}){"+v(a.split(/{{|}}}?/g),function(a,b){var c,d=n(a),e=l(d,/^{/),d=d==e?"esc(":"";return b%2?(c=/^each\b(\s+([\w_]+(\s*,\s*[\w_]+)?)\s*:)?(.*)/.exec(e))?"each("+(n(c[4])?c[4]:"this")+", function("+c[2]+"){":(c=/^if\b(.*)/.exec(e))?"if("+c[1]+"){":(c=/^else\b\s*(if\b(.*))?/.exec(e))?"}else "+(c[1]?"if("+c[2]+")":"")+"{":(c=/^\/(if)?/.exec(e))?c[1]?"}\n":"});\n":(c=/^(var\s.*)/.exec(e))?c[1]+";":(c=/^#(.*)/.exec(e))?c[1]:(c=/(.*)::\s*(.*)/.exec(e))?"print("+d+'_.formatValue("'+Y(c[2])+'",'+(n(c[1])?c[1]:"this")+(d&&")")+"));\n":"print("+d+(n(e)?e:"this")+(d&&")")+");\n":a?'print("'+Y(a)+'");\n':void 0}).join("")+"}",e=Function("obj","each","esc","print","_",d);return 99<Mb.push(c)&&delete Lb[Mb.shift()],Lb[a]=c}function $(a){return l(a,/[<>'"&]/g,function(a){return"&#"+a.charCodeAt(0)+";"})}function _(a,b){return Z(a,$)(b)}function ab(a){return function(b,c){return new ub(a(this,b,c))}}function bb(a){return function(b,c,d){return a(this,b,c,d)}}function cb(a){return function(b,c,d){return new ub(a(b,c,d))}}function db(a){return"function"==typeof a&&!a.item}function eb(a){return a&&a.length!=Eb&&!c(a)&&!e(a)&&!db(a)&&a!==xb}function fb(a){return parseFloat(l(a,/^[^\d-]+/))}function gb(a){return a.Nia=a.Nia||++Ab}function hb(a,b){var c,d=[],e={};return rb(a,function(a){rb(b(a),function(a){e[c=gb(a)]||(d.push(a),e[c]=!0)})}),d}function ib(a,b){var c={$position:"absolute",$visibility:"hidden",$display:"block",$height:Eb},d=a.get(c),c=a.set(c).get("clientHeight");return a.set(d),c*b+"px"}function jb(a){Bb?Bb.push(a):setTimeout(a,0)}function kb(a,b,c){return ob(a,b,c)[0]}function lb(a,b,c){return a=nb(document.createElement(a)),eb(b)||b!=Eb&&!d(b)?a.add(b):a.set(b).add(c)}function mb(a){return r(rb,a,function(a){return eb(a)?mb(a):(e(a)&&(a=a.cloneNode(!0),a.removeAttribute&&a.removeAttribute("id")),a)})}function nb(a,b,c){return db(a)?jb(a):new ub(ob(a,b,c))}function ob(a,b,d){function f(a){return eb(a)?r(rb,a,f):a}function g(a){return q(r(rb,a,f),function(a){for(;a=a.parentNode;)if(a==b[0]||d)return a==b[0]})}return b?1!=(b=ob(b)).length?hb(b,function(b){return ob(a,b,d)}):c(a)?1!=e(b[0])?[]:d?g(b[0].querySelectorAll(a)):b[0].querySelectorAll(a):g(a):c(a)?document.querySelectorAll(a):r(rb,a,f)}function pb(a,b){function d(a,b){var c=RegExp("(^|\\s+)"+a+"(?=$|\\s)","i");return function(d){return a?c.test(d[b]):!0}}var g,h,i={},j=i;return db(a)?a:f(a)?function(b,c){return c==a}:!a||"*"==a||c(a)&&(j=/^([\w-]*)\.?([\w-]*)$/.exec(a))?(g=d(j[1],"tagName"),h=d(j[2],"className"),function(a){return 1==e(a)&&g(a)&&h(a)}):b?function(c){return nb(a,b).find(c)!=Eb}:(nb(a).each(function(a){i[gb(a)]=!0}),function(a){return i[gb(a)]})}function qb(a){var b=pb(a);return function(a){return b(a)?Eb:!0}}function rb(a,b){return eb(a)?p(a,b):a!=Eb&&b(a,0),a}function sb(){this.state=null,this.values=[],this.parent=null}function tb(){var a,b,c=[],e=arguments,f=e.length,g=0,h=0,i=new sb;return i.errHandled=function(){h++,i.parent&&i.parent.errHandled()},a=i.fire=function(a,b){return null==i.state&&null!=a&&(i.state=!!a,i.values=eb(b)?b:[b],setTimeout(function(){p(c,function(a){a()})},0)),i},p(e,function j(b,c){try{b.then?b.then(function(b){(d(b)||db(b))&&db(b.then)?j(b,c):(i.values[c]=H(arguments),++g==f&&a(!0,2>f?i.values[c]:i.values))},function(){i.values[c]=H(arguments),a(!1,2>f?i.values[c]:[i.values[c][0],i.values,c])}):b(function(){a(!0,H(arguments))},function(){a(!1,H(arguments))})}catch(e){a(!1,[e,i.values,c])}}),i.stop=function(){return p(e,function(a){a.stop&&a.stop()}),i.stop0&&N(i.stop0)},b=i.then=function(a,b){function e(){try{var c=i.state?a:b;db(c)?function g(a){try{var b,c=0;if((d(a)||db(a))&&db(b=a.then)){if(a===f)throw new TypeError;b.call(a,function(a){c++||g(a)},function(a){c++||f.fire(!1,[a])}),f.stop0=a.stop}else f.fire(!0,[a])}catch(e){if(!c++&&(f.fire(!1,[e]),!h))throw e}}(N(c,wb,i.values)):f.fire(i.state,i.values)}catch(e){if(f.fire(!1,[e]),!h)throw e}}var f=tb();return db(b)&&i.errHandled(),f.stop0=i.stop,f.parent=i,null!=i.state?setTimeout(e,0):c.push(e),f},i.always=function(a){return b(a,a)},i.error=function(a){return b(0,a)},i}function ub(a,b){var c,d,e,f,g,h=0;if(a)for(c=0,d=a.length;d>c;c++)if(e=a[c],b&&eb(e))for(f=0,g=e.length;g>f;f++)this[h++]=e[f];else this[h++]=e;else this[h++]=b;this.length=h,this._=!0}function vb(){return new ub(arguments,!0)}var wb,xb=window,yb={},zb={},Ab=1,Bb=/^[ic]/.test(document.readyState)?Eb:[],Cb={},Db=0,Eb=null,Fb="January,February,March,April,May,June,July,August,September,October,November,December".split(/,/g),Gb=v(Fb,a),Hb="Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(/,/g),Ib=v(Hb,a),Jb={y:["FullYear",j],Y:["FullYear",function(a){return a%100}],M:["Month",k],n:["Month",Gb],N:["Month",Fb],d:["Date",j],m:["Minutes",j],H:["Hours",j],h:["Hours",function(a){return a%12||12}],k:["Hours",k],K:["Hours",function(a){return a%12}],s:["Seconds",j],S:["Milliseconds",j],a:["Hours","am,am,am,am,am,am,am,am,am,am,am,am,pm,pm,pm,pm,pm,pm,pm,pm,pm,pm,pm,pm".split(/,/g)],w:["Day",Ib],W:["Day",Hb],z:["TimezoneOffset",function(a,b,c){return c?c:(b=0>a?-a:a,(a>0?"-":"+")+Q(2,Math.floor(b/60))+Q(2,b%60))}]},Kb={y:0,Y:[0,-2e3],M:[1,1],n:[1,Gb],N:[1,Fb],d:2,m:4,H:3,h:3,K:[3,1],k:[3,1],s:5,S:6,a:[3,"am,pm".split(/,/g)]},Lb={},Mb=[];return A({each:bb(p),filter:ab(q),collect:ab(s),map:ab(v),toObject:bb(z),equals:bb(M),sub:ab(G),reverse:bb(y),find:bb(E),findLast:bb(F),startsWith:bb(w),endsWith:bb(x),contains:bb(L),call:ab(O),array:bb(H),unite:bb(I),merge:bb(B),uniq:ab(J),intersection:ab(K),join:function(a){return v(this,j).join(a)},reduce:function(a,b){return p(this,function(c,d){b=a.call(this,b,c,d)}),b},sort:function(a){return new ub(v(this,j).sort(a))},remove:function(){rb(this,function(a){a.parentNode.removeChild(a)})},text:function(){return r(rb,this,function(a){return a.textContent}).join("")},trav:function(a,b,c){var d=f(b),e=pb(d?Eb:b),g=d?b:c;return new ub(hb(this,function(b){for(var c=[];(b=b[a])&&c.length!=g;)e(b)&&c.push(b);return c}))},next:function(a,b){return this.trav("nextSibling",a,b||1)},up:function(a,b){return this.trav("parentNode",a,b||1)},select:function(a,b){return nb(a,this,b)},is:function(a){return!this.find(qb(a))},only:function(a){return new ub(q(this,pb(a)))},not:function(a){return new ub(q(this,qb(a)))},get:function(a,b){var d,e,f,g=this,h=g[0];return h?c(a)?(d=/^(\W*)(.*)/.exec(l(a,/^%/,"@data-")),e=d[1],h=zb[e]?zb[e](this,d[2]):"$"==a?g.get("className"):"$$"==a?g.get("@style"):"$$slide"==a?g.get("$height"):"$$fade"==a||"$$show"==a?"hidden"==g.get("$visibility")||"none"==g.get("$display")?0:"$$fade"==a?isNaN(g.get("$opacity",!0))?1:g.get("$opacity",!0):1:"$"==e?xb.getComputedStyle(h,Eb).getPropertyValue(l(d[2],/[A-Z]/g,function(a){return"-"+a.toLowerCase()})):"@"==e?h.getAttribute(d[2]):h[d[2]],b?fb(h):h):(f={},(eb(a)?rb:o)(a,function(a){f[a]=g.get(a,b)}),f):void 0},set:function(a,b){var d,e,f=this;return b!==wb?(d=/^(\W*)(.*)/.exec(l(l(a,/^\$float$/,"cssFloat"),/^%/,"@data-")),e=d[1],yb[e]?yb[e](this,d[2],b):"$$fade"==a?this.set({$visibility:b?"visible":"hidden",$opacity:b}):"$$slide"==a?f.set({$visibility:b?"visible":"hidden",$overflow:"hidden",$height:/px/.test(b)?b:function(a,c,d){return ib(nb(d),b)}}):"$$show"==a?b?f.set({$visibility:b?"visible":"hidden",$display:""}).set({$display:function(a){return"none"==a?"block":a}}):f.set({$display:"none"}):"$$"==a?f.set("@style",b):rb(this,function(c,f){var g=db(b)?b(nb(c).get(a),f,c):b;"$"==e?d[2]?c.style[d[2]]=g:rb(g&&g.split(/\s+/),function(a){var b=l(a,/^[+-]/),d=c.className||"",e=l(d,RegExp("(^|\\s+)"+b+"(?=$|\\s)"));(/^\+/.test(a)||b==a&&d==e)&&(e+=" "+b),c.className=n(e)}):"$$scrollX"==a?c.scroll(g,nb(c).get("$$scrollY")):"$$scrollY"==a?c.scroll(nb(c).get("$$scrollX"),g):"@"==e?g==Eb?c.removeAttribute(d[2]):c.setAttribute(d[2],g):c[d[2]]=g})):c(a)||db(a)?f.set("$",a):o(a,function(a,b){f.set(a,b)}),f},show:function(){return this.set("$$show",1)},hide:function(){return this.set("$$show",0)},add:function(a,b){return this.each(function(c,d){function f(a){eb(a)?rb(a,f):db(a)?f(a(c,d)):a!=Eb&&(a=e(a)?a:document.createTextNode(a),g?g.parentNode.insertBefore(a,g.nextSibling):b?b(a,c,c.parentNode):c.appendChild(a),g=a)}var g;f(d&&!db(a)?mb(a):a)})},fill:function(a){return this.each(function(a){nb(a.childNodes).remove()}).add(a)},addAfter:function(a){return this.add(a,function(a,b,c){c.insertBefore(a,b.nextSibling)})},addBefore:function(a){return this.add(a,function(a,b,c){c.insertBefore(a,b)})},addFront:function(a){return this.add(a,function(a,b){b.insertBefore(a,b.firstChild)})},replace:function(a){return this.add(a,function(a,b,c){c.replaceChild(a,b)})},clone:ab(mb),animate:function(a,b,c){var d,e=tb(),f=this,g=r(rb,this,function(b,d){var e,f=nb(b),g={};return o(e=f.get(a),function(c,e){var h=a[c];g[c]=db(h)?h(e,d,b):"$$slide"==c?ib(f,h):h}),f.dial(e,g,c)}),h=b||500;return e.stop0=function(){return e.fire(!1),d()},d=nb.loop(function(a){O(g,[a/h]),a>=h&&(d(),e.fire(!0,[f]))}),e},dial:function(a,c,d){function e(a,b){return/^#/.test(a)?parseInt(6<a.length?a.substr(2*b+1,2):(a=a.charAt(b+1))+a,16):fb(a.split(",")[b])}var f=this,g=d||0,h=db(g)?g:function(a,b,c){return c*(b-a)*(g+(1-g)*c*(3-2*c))+a};return function(d){o(a,function(a,g){var i=c[a],j=0;f.set(a,0>=d?g:d>=1?i:/^#|rgb\(/.test(i)?"rgb("+Math.round(h(e(g,j),e(i,j++),d))+","+Math.round(h(e(g,j),e(i,j++),d))+","+Math.round(h(e(g,j),e(i,j++),d))+")":l(i,/-?[\d.]+/,b(h(fb(g),fb(i),d))))})}},toggle:function(a,b,c,d){var e,f,g=this,h=!1;return b?(g.set(a),function(i){i!==h&&(f=(h=!0===i||!1===i?i:!h)?b:a,c?(e=g.animate(f,e?e.stop():c,d)).then(function(){e=Eb}):g.set(f))}):g.toggle(l(a,/\b(?=\w)/g,"-"),l(a,/\b(?=\w)/g,"+"))},values:function(a){var c=a||{};return this.each(function(a){var d=a.name||a.id,e=b(a.value);if(/form/i.test(a.tagName))for(d=0;d<a.elements.length;d++)nb(a.elements[d]).values(c);else!d||/ox|io/i.test(a.type)&&!a.checked||(c[d]=c[d]==Eb?e:r(rb,[c[d],e],j))}),c},offset:function(){for(var a=this[0],b={x:0,y:0};a;)b.x+=a.offsetLeft,b.y+=a.offsetTop,a=a.offsetParent;return b},on:function(a,d,e,f,g){return db(d)?this.on(Eb,a,d,e,f):c(f)?this.on(a,d,e,Eb,f):this.each(function(c,h){rb(a?ob(a,c):c,function(a){rb(b(d).split(/\s/),function(b){function c(b,c,d){var j,l=!g;if(d=g?d:a,g)for(j=pb(g,a);d&&d!=a&&!(l=j(d));)d=d.parentNode;return!l||i!=b||e.apply(nb(d),f||[c,h])&&"?"==k||"|"==k}function d(a){c(i,a,a.target)||(a.preventDefault(),a.stopPropagation())}var i=l(b,/[?|]/g),k=l(b,/[^?|]/g),m=("blur"==i||"focus"==i)&&!!g,n=Ab++;a.addEventListener(i,d,m),a.M||(a.M={}),a.M[n]=c,e.M=r(rb,[e.M,function(){a.removeEventListener(i,d,m),delete a.M[n]}],j)})})})},onOver:function(a,b){var c=this,d=[];return db(b)?this.on(a,"|mouseover |mouseout",function(a,e){var f=a.relatedTarget||a.toElement,g="mouseout"!=a.type;d[e]===g||!g&&f&&(f==c[e]||nb(f).up(c[e]).length)||(d[e]=g,b.call(this,g,a))}):this.onOver(Eb,a)},onFocus:function(a,b,c){return db(b)?this.on(a,"|blur",b,[!1],c).on(a,"|focus",b,[!0],c):this.onFocus(Eb,a,b)},onChange:function(a,b,c){return db(b)?this.on(a,"|input |change |click",function(a,c){var d=this[0],e=/ox|io/i.test(d.type)?d.checked:d.value;d.NiaP!=e&&b.call(this,d.NiaP=e,c)},c):this.onChange(Eb,a,b)},onClick:function(a,b,c,d){return db(b)?this.on(a,"click",b,c,d):this.onClick(Eb,a,b,c)},trigger:function(a,b){return this.each(function(c){for(var d=!0,e=c;e&&d;)o(e.M,function(e,f){d=d&&f(a,b,c)}),e=e.parentNode})},per:function(a,b){if(db(a))for(var c=this.length,d=0;c>d;d++)a.call(this,new ub(Eb,this[d]),d);else nb(a,this).per(b);return this},ht:function(a,b){var c=2<arguments.length?B(G(arguments,1)):b;return this.set("innerHTML",db(a)?a(c):/{{/.test(a)?_(a,c):/^#\S+$/.test(a)?_(kb(a).text,c):a)}},ub.prototype),A({request:function(a,c,d,e){e=e||{};var f,g=0,h=tb(),i=d&&d.constructor==e.constructor;try{h.xhr=f=new XMLHttpRequest,h.stop0=function(){f.abort()},i&&(d=r(o,d,function(a,b){return r(rb,b,function(b){return encodeURIComponent(a)+(b!=Eb?"="+encodeURIComponent(b):"")})}).join("&")),d==Eb||/post/i.test(a)||(c+="?"+d,d=Eb),f.open(a,c,!0,e.user,e.pass),i&&/post/i.test(a)&&f.setRequestHeader("Content-Type","application/x-www-form-urlencoded"),o(e.headers,function(a,b){f.setRequestHeader(a,b)}),o(e.xhr,function(a,b){f[a]=b}),f.onreadystatechange=function(){4!=f.readyState||g++||(200<=f.status&&300>f.status?h.fire(!0,[f.responseText,f]):h.fire(!1,[f.status,f.responseText,f]))},f.send(d)}catch(j){g||h.fire(!1,[0,Eb,b(j)])}return h},toJSON:JSON.stringify,parseJSON:JSON.parse,ready:jb,loop:function(a){function b(a){o(Cb,function(b,c){c(a)}),Db&&g(b)}function c(){return Cb[f]&&(delete Cb[f],Db--),e}var d,e=0,f=Ab++,g=xb.requestAnimationFrame||function(a){setTimeout(function(){a(+new Date)},33)};return Cb[f]=function(b){d=d||b,a(e=b-d,c)},Db++||g(b),c},off:function(a){O(a.M),a.M=Eb},setCookie:function(a,b,c,e){document.cookie=a+"="+(e?b:escape(b))+(c?"; expires="+(d(c)?c:new Date(+new Date+864e5*c)).toUTCString():"")},getCookie:function(a,b){var c,d=(c=RegExp("(^|;)\\s*"+a+"=([^;]*)").exec(document.cookie))&&c[2];return b?d:d&&unescape(d)},wait:function(a,b){var c=tb(),d=setTimeout(function(){c.fire(!0,b)},a);return c.stop0=function(){c.fire(!1),clearTimeout(d)},c}},nb),A({filter:cb(q),collect:cb(s),map:cb(v),sub:cb(G),reverse:y,each:p,toObject:z,find:E,findLast:F,contains:L,startsWith:w,endsWith:x,equals:M,call:cb(O),array:H,unite:I,merge:B,uniq:cb(J),intersection:cb(K),keys:cb(u),values:cb(function(a,b){var c=[];return b?p(b,function(b){c.push(a[b])}):o(a,function(a,b){c.push(b)}),c}),copyObj:A,extend:function(a){return B(G(arguments,1),a)},range:function(a,b){for(var c=[],d=b==Eb?a:b,e=b!=Eb?a:0;d>e;e++)c.push(e);return new ub(c)},bind:P,partial:function(a,b,c){return P(a,this,b,c)},eachObj:o,mapObj:function(a,b,c){var d={};return o(a,function(e,f){d[e]=b.call(c||a,e,f)}),d},filterObj:function(a,b,c){var d={};return o(a,function(e,f){b.call(c||a,e,f)&&(d[e]=f)}),d},isList:eb,isFunction:db,isObject:d,isNumber:f,isBool:h,isDate:g,isValue:i,isString:c,toString:b,dateClone:T,dateAdd:V,dateDiff:W,dateMidnight:function(a){return a=a||new Date,new Date(a.getFullYear(),a.getMonth(),a.getDate())},pad:Q,formatValue:function(a,d){var e,h,i=l(a,/^\?/);return g(d)?((h=/^\[(([+-])(\d\d)(\d\d))\]\s*(.*)/.exec(i))&&(e=h[1],d=V(d,"minutes",S(h,2,d)),i=h[5]),l(i,/(\w)(\1*)(?:\[([^\]]+)\])?/g,function(a,b,f,g){return(b=Jb[b])&&(a=d["get"+b[0]](),g=g&&g.split(","),a=eb(b[1])?(g||b[1])[a]:b[1](a,g,e),a==Eb||c(a)||(a=Q(f.length+1,a))),a})):E(i.split(/\s*\|\s*/),function(a){var c,e;if(c=/^([<>]?)(=?)([^:]*?)\s*:\s*(.*)$/.exec(a)){if(a=d,e=+c[3],(isNaN(e)||!f(a))&&(a=a==Eb?"null":b(a),e=c[3]),c[1]){if(!c[2]&&a==e||"<"==c[1]&&a>e||">"==c[1]&&e>a)return Eb}else if(a!=e)return Eb;c=c[4]}else c=a;return f(d)?c.replace(/[0#](.*[0#])?/,function(a){var b,c=/^([^.]+)(\.)([^.]+)$/.exec(a)||/^([^,]+)(,)([^,]+)$/.exec(a),e=0>d?"-":"",f=/(\d+)(\.(\d+))?/.exec((e?-d:d).toFixed(c?c[3].length:0));return a=c?c[1]:a,b=c?R(c[3],l(f[3],/0+$/),!0):"",(e?"-":"")+("#"==a?f[1]:R(a,f[1]))+(b.length?c[2]:"")+b}):c})},parseDate:function(a,b){var c,d,e,f,g,h,i,j,k,o={},p=1,q=l(a,/^\?/);if(q!=a&&!n(b))return Eb;if((e=/^\[([+-])(\d\d)(\d\d)\]\s*(.*)/.exec(q))&&(c=e,q=e[4]),!(e=RegExp(q.replace(/(.)(\1*)(?:\[([^\]]*)\])?/g,function(a,b,c,e){return/[dmhkyhs]/i.test(b)?(o[p++]=b,a=c.length+1,"(\\d"+(2>a?"+":"{1,"+a+"}")+")"):"z"==b?(d=p,p+=3,"([+-])(\\d\\d)(\\d\\d)"):/[Nna]/.test(b)?(o[p++]=[b,e&&e.split(",")],"([a-zA-Z\\u0080-\\u1fff]+)"):/w/i.test(b)?"[a-zA-Z\\u0080-\\u1fff]+":/\s/.test(b)?"\\s+":m(a)})).exec(b)))return wb;for(q=[0,0,0,0,0,0,0],f=1;p>f;f++)if(g=e[f],h=o[f],eb(h)){if(i=h[0],j=Kb[i],k=j[0],h=E(h[1]||j[1],function(a,b){return w(g.toLowerCase(),a.toLowerCase())?b:void 0}),h==Eb)return wb;q[k]="a"==i?q[k]+12*h:h}else h&&(i=parseFloat(g),j=Kb[h],eb(j)?q[j[0]]+=i-j[1]:q[j]+=i);return q=new Date(q[0],q[1],q[2],q[3],q[4],q[5],q[6]),V(q,"minutes",-S(c,1,q)-S(e,d,q))},parseNumber:function(a,b){var c=l(a,/^\?/);return c==a||n(b)?(c=/(^|[^0#.,])(,|[0#.]*,[0#]+|[0#]+\.[0#]+\.[0#.,]*)($|[^0#.,])/.test(c)?",":".",c=parseFloat(l(l(l(b,","==c?/\./g:/,/g),c,"."),/^[^\d-]*(-?\d)/,"$1")),isNaN(c)?wb:c):Eb},trim:n,isEmpty:function(a,b){return a==Eb||!a.length||b&&/^\s*$/.test(a)},escapeRegExp:m,escapeHtml:$,format:function(a,b,c){return Z(a,c)(b)},template:Z,formatHtml:_,promise:tb},vb),document.addEventListener("DOMContentLoaded",function(){O(Bb),Bb=Eb},!1),{HTML:function(){var a=lb("div");return vb(N(a.ht,a,arguments)[0].childNodes)},_:vb,$:nb,$$:kb,EE:lb,M:ub,getter:zb,setter:yb}});
\ No newline at end of file
diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php
index 9fca90c4..4d720ced 100644
--- a/ncp-web/ncp-launcher.php
+++ b/ncp-web/ncp-launcher.php
@@ -2,218 +2,165 @@
 ///
 // NextCloudPi Web Panel backend
 //
-// Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
+// 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!
 //
-// More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+// More at https://nextcloudpi.com
 ///
 
 include ('csrf.php');
 
 session_start();
-$modules_path = '/usr/local/etc/ncp-config.d/';
+$cfg_dir = '/usr/local/etc/ncp-config.d/';
 $l10nDir = "l10n";
-ignore_user_abort( true );
-
+ignore_user_abort(true);
 
+// 
+// language
+//
 require("L10N.php");
 try {
-  $l = new L10N($_SERVER["HTTP_ACCEPT_LANGUAGE"], $l10nDir, $modules_path);
+  $l = new L10N($_SERVER["HTTP_ACCEPT_LANGUAGE"], $l10nDir, $cfg_dir);
 } catch (Exception $e) {
   die(json_encode("<p class='error'>Error while loading localizations!</p>"));
 }
 
-if ( $_POST['action'] == "cfgreq" ) 
+// CSRF check
+$token = isset($_POST['csrf_token']) ? $_POST['csrf_token'] : '';
+if ( empty($token) || !validateCSRFToken($token) )
+  exit( '{ "output": "Unauthorized request. Try reloading the page" }' );
+
+//
+// launch
+//
+if ( $_POST['action'] == "launch" && $_POST['config'] )
 {
+  // sanity checks
   if ( !$_POST['ref'] ) exit( '{ "output": "Invalid request" }' );
 
-  //CSFR check
-  $token = isset($_POST['csrf_token']) ? $_POST['csrf_token'] : '';
-  if ( empty($token) || !validateCSRFToken($token) )
-    exit( '{ "output": "Unauthorized request. Try reloading the page" }' );
-
-  $path  = '/usr/local/etc/ncp-config.d/';
-  $files = array_diff(scandir($path), array('.', '..'));
+  $ncp_app = $_POST['ref'];
 
-  $fh    = fopen( $path . $_POST['ref'] . '.sh' ,'r')
-             or exit( '{ "output": "' . $file . ' read error" }' );
-
-  echo '{ "token": "' . getCSRFToken() . '",';    // Get new token
-  echo ' "output": ';
-
-  $output = "<table>";
+  preg_match( '/^[0-9A-Za-z_-]+$/' , $_POST['ref'] , $matches )
+    or exit( '{ "output": "Invalid input" , "token": "' . getCSRFToken() . '" }' );
 
-  while ( $line = fgets($fh) ) 
+  // save new config
+  if ( $_POST['config'] != "{}" )
   {
-    // checkbox (yes/no) field
-    if ( preg_match('/^(\w+)_=(yes|no)$/', $line, $matches) )
-    {
-      $checked = "";
-      if ( $matches[2] == "yes" )
-        $checked = "checked";
-      $output .= "<tr>";
-      $output .= "<td><label for=\"$matches[1]\">". $l->__($matches[1], $_POST['ref']) ."</label></td>";
-      $output .= "<td><input type=\"checkbox\" id=\"$matches[1]\" name=\"$matches[1]\" value=\"$matches[2]\" $checked></td>";
-      $output .= "</tr>";
-    }
-    // drop down menu
-    else if(preg_match('/^(\w+)_=\[(([_\w]+,)*[_\w]+)\]$/', $line, $matches))
-    {
-      $options = explode(",", $matches[2]);
-      $output .= "<tr>";
-      $output .= "<td><label for=\"$matches[1]\">". $l->__($matches[1], $_POST['ref']) ."</label></td>";
-      $output .= "<td><select id=\"$matches[1]\" name=\"$matches[1]\">";
-      foreach($options as $option)
-      {
-        $output .= "<option value='". trim($option, "_") ."' ";
-        if( $option[0] == "_" && $option[count($option) - 1] == "_" )
-        {
-          $output .="selected='selected'";
-        }
-        $output .= ">". $l->__(trim($option, "_"), $_POST['ref']) ."</option>";
-      }
-      $output .= "</select></td></tr>";
-    }
-    // text field
-    else if ( preg_match('/^(\w+)_=(.*)$/', $line, $matches) )
-    {
-      $output .= "<tr>";
-      $output .= "<td><label for=\"$matches[1]\">". $l->__($matches[1], $_POST['ref']) ."</label></td>";
-      $output .= "<td><input type=\"text\" name=\"$matches[1]\" id=\"$matches[1]\" value=\"$matches[2]\" size=\"40\"></td>";
-      $output .= "</tr>";
-    }
-  }
+    $cfg_file = $cfg_dir . $ncp_app . '.cfg';
 
-  $output .= "</table>";
-  fclose($fh);
+    $cfg_str = file_get_contents($cfg_file)
+      or exit('{ "output": "' . $ncp_app . ' read error" }');
 
-  echo json_encode( $output ) . ' }'; // close JSON
-}
+    $cfg = json_decode($cfg_str, true)
+      or exit('{ "output": "' . $ncp_app . ' read error" }');
 
-else if ( $_POST['action'] == "launch" && $_POST['config'] )
-{
-  // sanity checks
-  if ( !$_POST['ref'] ) exit( '{ "output": "Invalid request" }' );
-
-  preg_match( '/^[0-9A-Za-z_-]+$/' , $_POST['ref'] , $matches )
-    or exit( '{ "output": "Invalid input" , "token": "' . getCSRFToken() . '" }' );
-
-  // CSRF check
-  $token = isset($_POST['csrf_token']) ? $_POST['csrf_token'] : '';
-  if ( empty($token) || !validateCSRFToken($token) )
-    exit( '{ "output": "Unauthorized request. Try reloading the page" }' );
+    $new_params = json_decode($_POST['config'], true)
+      or exit('{ "output": "Invalid request" }');
 
-  chdir('/usr/local/etc/ncp-config.d/');
+    foreach ($cfg['params'] as $index => $param)
+      $cfg['params'][$index]['value'] = $new_params[$cfg['params'][$index]['id']];
 
-  $file = $_POST['ref'] . '.sh';
+    $cfg_str = json_encode($cfg)
+      or exit('{ "output": "' . $ncp_app . ' internal error" }');
 
-  if ( $_POST['config'] != "{}" )
-    $params = json_decode( $_POST['config'], true )
-                or exit( '{ "output": "Invalid request" }' );
-
-  $code = file_get_contents( $file )
-            or exit( '{ "output": "' . $file . ' read error" }' );
-
-  if ( !empty( $params ) )
-    foreach( $params as $name => $value ) 
-    {
-      if( is_array($value))
-      {
-        $value = "[". join(",", $value) ."]";
-      }
-      preg_match( '/^[\[\]\w+-.,@_\/:]+$/' , $value , $matches )
-        or exit( '{ "output": "Invalid input" , "token": "' . getCSRFToken() . '" }' );
-      $code = preg_replace( '/\n' . $name . '_=.*' . PHP_EOL . '/'  ,
-                          PHP_EOL . $name . '_=' . $value . PHP_EOL ,
-                          $code )
-                or exit();
-    }
-
-  file_put_contents($file, $code )
-    or exit( '{ "output": "' . $file . ' write error" }' );
+    file_put_contents($cfg_file, $cfg_str)
+      or exit('{ "output": "' . $ncp_app . ' write error" }');
+  }
 
+  // launch
   echo '{ "token": "' . getCSRFToken() . '",';     // Get new token
-  echo ' "ref": "' . $_POST['ref']     . '",';
+  echo ' "ref": "' . $ncp_app          . '",';
   echo ' "output": "" , ';
   echo ' "ret": ';
 
-  exec( 'bash -c "sudo /home/www/ncp-launcher.sh ' . $file . '"' , $output , $ret );
+  exec( 'bash -c "sudo /home/www/ncp-launcher.sh ' . $ncp_app . '"' , $output , $ret );
   echo '"' . $ret . '" }';
 }
 
-else
+//
+// info
+//
+else if ( $_POST['action'] == "info" )
 {
-  // CSRF check
-  $token = isset($_POST['csrf_token']) ? $_POST['csrf_token'] : '';
-  if ( empty($token) || !validateCSRFToken($token) )
-    exit( '{ "output": "Unauthorized request. Try reloading the page" }' );
+  exec( 'bash /usr/local/bin/ncp-diag', $output, $ret );
 
-  if ( $_POST['action'] == "poweroff" )
-  {
-    shell_exec( 'bash -c "( sleep 2 && sudo halt ) 2>/dev/null >/dev/null &"' );
-  }
-  else if ( $_POST['action'] == "reboot" )
+  // info table
+  $table = '<table class="dashtable">';
+  foreach( $output as $line )
   {
-    shell_exec('bash -c "( sleep 2 && sudo reboot ) 2>/dev/null >/dev/null &"');
+    $table .= "<tr>";
+    $fields = explode( "|", $line );
+    $table .= "<td>$fields[0]</td>";
+
+    $class = 'val-field';
+    if ( strpos( $fields[1], "up"   ) !== false
+      || strpos( $fields[1], "ok"   ) !== false
+      || strpos( $fields[1], "open" ) !== false )
+      $class = 'ok-field';
+    if ( strpos( $fields[1], "down"  ) !== false
+      || strpos( $fields[1], "error" ) !== false )
+      $class = 'error-field';
+
+    $table .= "<td class=\"$class\">$fields[1]</td>";
+    $table .= "</tr>";
   }
-  else if ( $_POST['action'] == "info" )
-  {
-    exec( 'bash /usr/local/bin/ncp-diag', $output, $ret );
-
-    // info table
-    $table = '<table class="dashtable">';
-    foreach( $output as $line )
-    {
-      $table .= "<tr>";
-      $fields = explode( "|", $line );
-      $table .= "<td>$fields[0]</td>";
-
-      $class = 'val-field';
-      if ( strpos( $fields[1], "up"   ) !== false
-        || strpos( $fields[1], "ok"   ) !== false
-        || strpos( $fields[1], "open" ) !== false )
-        $class = 'ok-field';
-      if ( strpos( $fields[1], "down"  ) !== false
-        || strpos( $fields[1], "error" ) !== false )
-        $class = 'error-field';
-
-      $table .= "<td class=\"$class\">$fields[1]</td>";
-      $table .= "</tr>";
-    }
-    $table .= "</table>";
-
-    // suggestions
-    $suggestions = "";
-    if ( $ret == 0 )
-    {
-      exec( "bash /usr/local/bin/ncp-suggestions \"" . implode( "\n", $output ) . '"', $out, $ret );
-      foreach( $out as $line )
-        if ( $line != "" )
-          $suggestions .= "<p class=\"val-field\">‣ $line</p>";
-    }
-
-    // return JSON
-    echo '{ "token": "' . getCSRFToken() . '",';               // Get new token
-    echo ' "table": '       . json_encode( $table       ) . ' , ';
-    echo ' "suggestions": ' . json_encode( $suggestions ) . ' , ';
-    echo ' "ret": "'        . $ret                        . '" }';
-  }
-  else if ( $_POST['action'] == "sidebar" )
-  {
-    require( "sidebar.php" );
-    // return JSON
-    echo '{ "token": "' . getCSRFToken() . '",';               // Get new token
-    echo ' "output": '  . json_encode( print_sidebar( $l, true ) ) . ' , ';
-    echo ' "ret": "0" }';
-  }
-  else if ( $_POST['action'] == "cfg-ui" )
+  $table .= "</table>";
+
+  // suggestions
+  $suggestions = "";
+  if ( $ret == 0 )
   {
-    $ret = $l->save( $_POST['value'] );
-    $ret = $ret !== FALSE ? 0 : 1;
-    // return JSON
-    echo '{ "token": "' . getCSRFToken() . '",';               // Get new token
-    echo ' "ret": "'    . $ret           . '" }';
+    exec( "bash /usr/local/bin/ncp-suggestions \"" . implode( "\n", $output ) . '"', $out, $ret );
+    foreach( $out as $line )
+      if ( $line != "" )
+        $suggestions .= "<p class=\"val-field\">‣ $line</p>";
   }
+
+  // return JSON
+  echo '{ "token": "' . getCSRFToken() . '",';               // Get new token
+  echo ' "table": '       . json_encode( $table       ) . ' , ';
+  echo ' "suggestions": ' . json_encode( $suggestions ) . ' , ';
+  echo ' "ret": "'        . $ret                        . '" }';
+}
+
+//
+// sidebar
+//
+else if ( $_POST['action'] == "sidebar" )
+{
+  require( "elements.php" );
+  // return JSON
+  echo '{ "token": "' . getCSRFToken() . '",';               // Get new token
+  echo ' "output": '  . json_encode( print_sidebar( $l, true ) ) . ' , ';
+  echo ' "ret": "0" }';
+}
+
+//
+// cfg-ui
+//
+else if ( $_POST['action'] == "cfg-ui" )
+{
+  $ret = $l->save( $_POST['value'] );
+  $ret = $ret !== FALSE ? 0 : 1;
+  // return JSON
+  echo '{ "token": "' . getCSRFToken() . '",';               // Get new token
+  echo ' "ret": "'    . $ret           . '" }';
+}
+
+//
+// poweroff
+//
+else if ( $_POST['action'] == "poweroff" )
+{
+  shell_exec( 'bash -c "( sleep 2 && sudo halt ) 2>/dev/null >/dev/null &"' );
+}
+
+//
+// reboot
+//
+else if ( $_POST['action'] == "reboot" )
+{
+  shell_exec('bash -c "( sleep 2 && sudo reboot ) 2>/dev/null >/dev/null &"');
 }
 
 // License
diff --git a/ncp-web/ncp-output.php b/ncp-web/ncp-output.php
index 8bea03bb..704b0a58 100644
--- a/ncp-web/ncp-output.php
+++ b/ncp-web/ncp-output.php
@@ -78,8 +78,11 @@ function follow($file)
 
 session_write_close();
 echo str_pad('',1024*1024*4); // make sure the browser buffer becomes full
-touch(  '/var/log/ncp.log' );
-follow( '/var/log/ncp.log' );
+
+$ncp_log = '/var/log/ncp.log';
+if (!file_exists($ncp_log))
+  touch($ncp_log);
+follow($ncp_log);
 
 // License
 //
diff --git a/ncp-web/ncp.css b/ncp-web/ncp.css
deleted file mode 100644
index e379824f..00000000
--- a/ncp-web/ncp.css
+++ /dev/null
@@ -1,1324 +0,0 @@
-/* 
- * 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!
- *
- * More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-*/
-
-
-html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,dialog,figure,footer,header,hgroup,nav,section {
- margin:0;
- padding:0;
- border:0;
- outline:0;
- font-weight:inherit;
- font-size:100%;
- font-family:inherit;
- vertical-align:baseline;
- cursor:default
-}
-html,body {
- height:100%
-}
-article,aside,dialog,figure,footer,header,hgroup,nav,section {
- display:block
-}
-body {
- line-height:1.5
-}
-table {
- border-collapse:separate;
- border-spacing:0;
- white-space:nowrap
-}
-caption,th,td {
- text-align:left;
- font-weight:normal
-}
-table,td,th {
- vertical-align:middle;
- padding-right: 5px;
-}
-a {
- border:0;
- color:#000;
- text-decoration:none;
- cursor:pointer
-}
-a * {
- cursor:pointer
-}
-select,.button span,label {
- cursor:pointer
-}
-ul {
- list-style:none
-}
-body {
- background-color:#fff;
- font-weight:400;
- font-size:0.8em;
- line-height:1.6em;
- font-family:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
- color:#000;
- height:auto
-}
-#nojavascript {
- position:fixed;
- top:0;
- bottom:0;
- height:100%;
- width:100%;
- z-index:9000;
- text-align:center;
- background-color:rgba(0, 0, 0, 0.5);
- color:#fff;
- line-height:125%;
- font-size:24px
-}
-#nojavascript div {
- display:block;
- position:relative;
- width:50%;
- top:35%;
- margin:0px auto
-}
-#nojavascript a {
- color:#fff;
- border-bottom:2px dotted #fff
-}
-#nojavascript a:hover,#nojavascript a:focus {
- color:#dbdbdb
-}
-::-webkit-scrollbar {
- width:5px
-}
-::-webkit-scrollbar-track-piece {
- background-color:transparent
-}
-::-webkit-scrollbar-thumb {
- background:#dbdbdb;
- border-radius:3px
-}
-#content {
- position:relative;
- height:100%;
- width:100%
-}
-#content-wrapper {
- position:absolute;
- height:100%;
- width:100%;
- overflow-x:hidden;
- padding-top:45px;
- box-sizing:border-box
-}
-tbody tr:hover,tbody tr:focus,tbody tr:active {
- background-color:#f7f7f7
-}
-code {
- font-family:'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', monospace
-}
-@-ms-viewport {
- width:device-width;
-}
-input,textarea,select,button {
- font-family:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif
-}
-select,button,input,textarea {
- width:130px;
- min-height:32px;
- box-sizing:border-box
-}
-select,button,.button,input:not([type='range']),textarea,#quota,.pager li a {
- margin:3px 3px 3px 0;
- padding:7px 6px;
- font-size:13px;
- background-color:#fff;
- color:#545454;
- border:1px solid #dbdbdb;
- outline:none;
- border-radius:3px;
-}
-select:not(:disabled):not(.primary),button:not(:disabled):not(.primary),.button:not(:disabled):not(.primary),input:not([type='range']):not(:disabled):not(.primary),textarea:not(:disabled):not(.primary),#quota:not(:disabled):not(.primary),.pager li a:not(:disabled):not(.primary) {
-}
-select:not(:disabled):not(.primary):not(#quota):hover,button:not(:disabled):not(.primary):not(#quota):hover,.button:not(:disabled):not(.primary):not(#quota):hover,input:not([type='range']):not(:disabled):not(.primary):not(#quota):hover,textarea:not(:disabled):not(.primary):not(#quota):hover,#quota:not(:disabled):not(.primary):not(#quota):hover,.pager li a:not(:disabled):not(.primary):not(#quota):hover,select:not(:disabled):not(.primary):focus,button:not(:disabled):not(.primary):focus,.button:not(:disabled):not(.primary):focus,input:not([type='range']):not(:disabled):not(.primary):focus,textarea:not(:disabled):not(.primary):focus,#quota:not(:disabled):not(.primary):focus,.pager li a:not(:disabled):not(.primary):focus,select:not(:disabled):not(.primary).active,button:not(:disabled):not(.primary).active,.button:not(:disabled):not(.primary).active,input:not([type='range']):not(:disabled):not(.primary).active,textarea:not(:disabled):not(.primary).active,#quota:not(:disabled):not(.primary).active,.pager li a:not(:disabled):not(.primary).active {
- border-color:#0082c9;
- outline:none
-}
-select:not(:disabled):not(.primary):active,button:not(:disabled):not(.primary):active,.button:not(:disabled):not(.primary):active,input:not([type='range']):not(:disabled):not(.primary):active,textarea:not(:disabled):not(.primary):active,#quota:not(:disabled):not(.primary):active,.pager li a:not(:disabled):not(.primary):active {
- outline:none;
- background-color:#fff
-}
-select:disabled,button:disabled,.button:disabled,input:not([type='range']):disabled,textarea:disabled,#quota:disabled,.pager li a:disabled {
- background-color:#ebebeb;
- color:rgba(0, 0, 0, 0.4);
- cursor:default;
- opacity:0.5
-}
-select.primary,button.primary,.button.primary,input:not([type='range']).primary,textarea.primary,#quota.primary,.pager li a.primary {
- border:1px solid #0082c9;
- background-color:rgba(0, 130, 201, .7);
- color:#fff;
- cursor:pointer
-}
-select.primary:not(:disabled):hover,button.primary:not(:disabled):hover,.button.primary:not(:disabled):hover,input:not([type='range']).primary:not(:disabled):hover,textarea.primary:not(:disabled):hover,#quota.primary:not(:disabled):hover,.pager li a.primary:not(:disabled):hover,select.primary:not(:disabled):focus,button.primary:not(:disabled):focus,.button.primary:not(:disabled):focus,input:not([type='range']).primary:not(:disabled):focus,textarea.primary:not(:disabled):focus,#quota.primary:not(:disabled):focus,.pager li a.primary:not(:disabled):focus {
- background-color:rgba(0, 130, 201, .85)
-}
-select.primary:not(:disabled):active,button.primary:not(:disabled):active,.button.primary:not(:disabled):active,input:not([type='range']).primary:not(:disabled):active,textarea.primary:not(:disabled):active,#quota.primary:not(:disabled):active,.pager li a.primary:not(:disabled):active {
- background-color:rgba(0, 130, 201, .7)
-}
-select.primary:disabled,button.primary:disabled,.button.primary:disabled,input:not([type='range']).primary:disabled,textarea.primary:disabled,#quota.primary:disabled,.pager li a.primary:disabled {
- background-color:rgba(0, 130, 201, .7);
- color:#bababa
-}
-input {
-}
-input:not([type='radio']):not([type='checkbox']):not([type='range']):not([type='submit']):not([type='button']):not([type='reset']):not([type='color']):not([type='file']):not([type='image']) {
- -webkit-appearance:textfield;
- -moz-appearance:textfield
-}
-input[type='radio'],input[type='checkbox'],input[type='file'],input[type='image'] {
- height:auto;
- width:auto
-}
-input[type='color'] {
- margin:3px;
- padding:0 2px;
- min-height:30px;
- width:40px;
- cursor:pointer
-}
-input[type='hidden'] {
- height:0;
- width:0
-}
-input[type='time'] {
- width:initial
-}
-select,button,.button,input[type='button'],input[type='submit'],input[type='reset'] {
- padding:6px 12px;
- width:auto;
- min-height:34px;
- cursor:pointer;
- box-sizing:border-box;
- background-color:#f7f7f7
-}
-button,.button,input[type='button'],input[type='submit'],input[type='reset'] {
- font-weight:bold;
-}
-button::-moz-focus-inner,.button::-moz-focus-inner,input[type='button']::-moz-focus-inner,input[type='submit']::-moz-focus-inner,input[type='reset']::-moz-focus-inner {
- border:0
-}
-button,.button {
-}
-button > span[class^='icon-'],.button > span[class^='icon-'],button > span[class*=' icon-'],.button > span[class*=' icon-'] {
- display:inline-block;
- vertical-align:text-bottom;
- opacity:0.5
-}
-textarea {
- color:#545454;
- cursor:text;
- font-family:inherit;
- height:auto
-}
-textarea:not(:disabled):active,textarea:not(:disabled):hover,textarea:not(:disabled):focus {
- border-color:#dbdbdb !important;
- background-color:#fff !important
-}
-select {
- -webkit-appearance:none;
- -moz-appearance:none;
- appearance:none;
- background:url('../../../core/css/../img/actions/triangle-s.svg') no-repeat right 4px center;
- background-color:inherit;
- outline:0;
- padding-right:24px !important
-}
-button img,.button img {
- cursor:pointer
-}
-input[type='checkbox'].radio,input[type='radio'].radio,input[type='checkbox'].checkbox,input[type='radio'].checkbox {
- position:absolute;
- left:-10000px;
- top:auto;
- width:1px;
- height:1px;
- overflow:hidden
-}
-input[type='checkbox'].radio + label,input[type='radio'].radio + label,input[type='checkbox'].checkbox + label,input[type='radio'].checkbox + label {
- user-select:none
-}
-input[type='checkbox'].radio:disabled + label,input[type='radio'].radio:disabled + label,input[type='checkbox'].checkbox:disabled + label,input[type='radio'].checkbox:disabled + label,input[type='checkbox'].radio:disabled + label:before,input[type='radio'].radio:disabled + label:before,input[type='checkbox'].checkbox:disabled + label:before,input[type='radio'].checkbox:disabled + label:before {
- cursor:default
-}
-input[type='checkbox'].radio + label:before,input[type='radio'].radio + label:before,input[type='checkbox'].checkbox + label:before,input[type='radio'].checkbox + label:before {
- content:'';
- display:inline-block;
- height:12px;
- width:12px;
- vertical-align:middle;
- border-radius:50%;
- margin:3px;
- margin-top:1px;
- border:1px solid #878787
-}
-input[type='checkbox'].radio:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].radio:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].checkbox:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].checkbox:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].radio:focus + label:before,input[type='radio'].radio:focus + label:before,input[type='checkbox'].checkbox:focus + label:before,input[type='radio'].checkbox:focus + label:before {
- border-color:#0082c9
-}
-input[type='checkbox'].radio:checked + label:before,input[type='radio'].radio:checked + label:before,input[type='checkbox'].checkbox:checked + label:before,input[type='radio'].checkbox:checked + label:before,input[type='checkbox'].radio.checkbox:indeterminate + label:before,input[type='radio'].radio.checkbox:indeterminate + label:before,input[type='checkbox'].checkbox.checkbox:indeterminate + label:before,input[type='radio'].checkbox.checkbox:indeterminate + label:before {
- box-shadow:inset 0px 0px 0px 2px #fff;
- background-color:#0082c9;
- border-color:#0082c9
-}
-input[type='checkbox'].radio:disabled + label:before,input[type='radio'].radio:disabled + label:before,input[type='checkbox'].checkbox:disabled + label:before,input[type='radio'].checkbox:disabled + label:before {
- border:1px solid #878787;
- background-color:#bababa !important;
-}
-input[type='checkbox'].radio:checked:disabled + label:before,input[type='radio'].radio:checked:disabled + label:before,input[type='checkbox'].checkbox:checked:disabled + label:before,input[type='radio'].checkbox:checked:disabled + label:before {
- background-color:#bababa
-}
-input[type='checkbox'].checkbox + label:before,input[type='radio'].checkbox + label:before {
- border-radius:1px;
- height:10px;
- width:10px;
- box-shadow:none !important;
- background-position:center
-}
-input[type='checkbox'].checkbox:checked + label:before,input[type='radio'].checkbox:checked + label:before {
- background-image:url('../../../core/css/../img/actions/checkbox-mark.svg')
-}
-input[type='checkbox'].checkbox:indeterminate + label:before,input[type='radio'].checkbox:indeterminate + label:before {
- background-image:url('../../../core/css/../img/actions/checkbox-mixed.svg')
-}
-input[type='checkbox'].radio--white + label:before,input[type='radio'].radio--white + label:before,input[type='checkbox'].checkbox--white + label:before,input[type='radio'].checkbox--white + label:before {
- border-color:#dbdbdb
-}
-input[type='checkbox'].radio--white:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].radio--white:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].checkbox--white:not(:disabled):not(:checked) + label:hover:before,input[type='radio'].checkbox--white:not(:disabled):not(:checked) + label:hover:before,input[type='checkbox'].radio--white:focus + label:before,input[type='radio'].radio--white:focus + label:before,input[type='checkbox'].checkbox--white:focus + label:before,input[type='radio'].checkbox--white:focus + label:before {
- border-color:#fff
-}
-input[type='checkbox'].radio--white:checked + label:before,input[type='radio'].radio--white:checked + label:before,input[type='checkbox'].checkbox--white:checked + label:before,input[type='radio'].checkbox--white:checked + label:before {
- box-shadow:inset 0px 0px 0px 2px #000;
- background-color:#ebebeb;
- border-color:#ebebeb
-}
-input[type='checkbox'].radio--white:disabled + label:before,input[type='radio'].radio--white:disabled + label:before,input[type='checkbox'].checkbox--white:disabled + label:before,input[type='radio'].checkbox--white:disabled + label:before {
- background-color:#545454 !important;
- border-color:rgba(0, 0, 0, 0.4) !important;
-}
-input[type='checkbox'].radio--white:checked:disabled + label:before,input[type='radio'].radio--white:checked:disabled + label:before,input[type='checkbox'].checkbox--white:checked:disabled + label:before,input[type='radio'].checkbox--white:checked:disabled + label:before {
- box-shadow:inset 0px 0px 0px 2px #000;
- border-color:#545454;
- background-color:#545454
-}
-input[type='checkbox'].checkbox--white:checked + label:before,input[type='radio'].checkbox--white:checked + label:before,input[type='checkbox'].checkbox--white:indeterminate + label:before,input[type='radio'].checkbox--white:indeterminate + label:before {
- background-color:transparent !important;
- border-color:#fff !important;
- background-image:url('../../../core/css/../img/actions/checkbox-mark-white.svg')
-}
-input[type='checkbox'].checkbox--white:indeterminate + label:before,input[type='radio'].checkbox--white:indeterminate + label:before {
- background-image:url('../../../core/css/../img/actions/checkbox-mixed-white.svg')
-}
-input[type='checkbox'].checkbox--white:checked:disabled + label:after,input[type='radio'].checkbox--white:checked:disabled + label:after {
- border-color:#bababa
-}
-input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after,input[type='radio'].checkbox--white:indeterminate:disabled + label:after {
- background-color:#bababa
-}
-#header,#navigation,#expanddiv {
- -webkit-user-select:none;
- -moz-user-select:none;
- -ms-user-select:none
-}
-#body-user #header,#body-settings #header,#body-public #header {
- display:inline-flex;
- position:fixed;
- top:0;
- left:0;
- right:0;
- z-index:5000;
- height:45px;
- background-color:#0082c9;
- box-sizing:border-box;
- justify-content:space-between
-}
-
-#notification-container {
- position:absolute;
- top:0;
- width:100%;
- text-align:center
-}
-#notification {
- margin:0 auto;
- max-width:60%;
- z-index:8000;
- background-color:#fff;
- border:0;
- padding:1px 8px;
- display:inline-block;
- position:relative;
- top:0;
- border-bottom-left-radius:3px;
- border-bottom-right-radius:3px;
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=90)';
- opacity:0.9;
- overflow-x:hidden;
- overflow-y:auto;
- max-height:100px
-}
-#notification span {
- cursor:pointer;
- margin-left:1em
-}
-#notification .row {
- position:relative
-}
-#notification .row .close {
- display:inline-block;
- vertical-align:middle;
- position:absolute;
- right:0;
- top:0;
- margin-top:2px
-}
-#notification .row.closeable {
- padding-right:20px
-}
-
-#nextcloudpi {
- padding:5px;
- padding-bottom:0;
- height:45px;
- box-sizing:border-box;
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
- opacity:1
-}
-#nextcloudpi:focus {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
- opacity:0.75
-}
-#nextcloudpi:hover,#nextcloudpi:active {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
- opacity:1
-}
-#header {
- color: white;
-}
-
-#header .logo {
- background-image:url("logo.svg");
- background-repeat:no-repeat;
- background-size:175px;
- background-position:center;
- width:252px;
- height:120px;
- margin:0 auto
-}
-#header .logo img {
- opacity:0;
- max-width:100%;
- max-height:200px
-}
-#header .logo-icon {
- display:inline-block;
- background-image:url('img/ncp-logo.svg');
- background-repeat:no-repeat;
- background-position:center center;
- background-size:contain;
- width:62px;
- height:34px
-}
-#header .header-appname-container {
- display:none;
- padding-top:22px;
- padding-right:10px;
- flex-shrink:0
-}
-#header .icon-caret {
- display:inline-block;
- width:12px;
- height:12px;
- margin:0;
- margin-top:-21px;
- padding:0;
- vertical-align:middle
-}
-#header #header-left,#header #header-right {
- display:inline-flex;
- align-items:center
-}
-#header #header-left {
- flex:0 0;
- flex-grow:1
-}
-#header #header-right {
- justify-content:flex-end
-}
-.header-appname-container .header-appname {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
- opacity:0.75
-}
-.menutoggle .icon-caret {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
- opacity:0.75
-}
-.menutoggle:hover .header-appname,.menutoggle:hover .icon-caret {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
- opacity:1
-}
-.menutoggle:focus .header-appname,.menutoggle:focus .icon-caret {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
- opacity:1
-}
-.menutoggle.active .header-appname,.menutoggle.active .icon-caret {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
- opacity:1
-}
-.header-appname {
- display:inline-block;
- position:relative;
- color:#fff;
- font-size:16px;
- font-weight:300;
- margin:0;
- margin-top:-26px;
- padding:7px 0 7px 5px;
- vertical-align:middle
-}
-#body-public #header .icon-caret {
- display:none
-}
-nav {
- display:inline-block;
- width:44px;
- height:44px;
- margin-left:-54px
-}
-[class^='icon-'],[class*=' icon-'] {
- background-repeat:no-repeat;
- background-position:center;
- min-width:16px;
- min-height:16px
-}
-@keyframes rotate {
- from {
-  transform:rotate(0deg)
- }
- to {
-  transform:rotate(360deg)
- }
-}
-@media (-webkit-max-device-pixel-ratio:1.3),(max-resolution:124.8dpi) {
- @font-face {
-  font-family:'Open Sans';
-  font-style:normal;
-  font-weight:normal;
-  src:local('Open Sans'), local('OpenSans'), url('../../../core/css/../fonts/OpenSans-Regular.woff') format('woff');
- }
-}
-@font-face {
- font-family:'Open Sans';
- font-style:normal;
- font-weight:300;
- src:local('Open Sans Light'), local('OpenSans-Light'), url('../../../core/css/../fonts/OpenSans-Light.woff') format('woff');
-}
-@font-face {
- font-family:'Open Sans';
- font-style:normal;
- font-weight:600;
- src:local('Open Sans Semibold'), local('OpenSans-Semibold'), url('../../../core/css/../fonts/OpenSans-Semibold.woff') format('woff');
-}
-h2 {
- font-size:20px;
- font-weight:300;
- margin-bottom:12px;
- line-height:140%
-}
-h3 {
- font-size:15px;
- font-weight:300;
- margin:12px 0
-}
-em {
- font-style:normal;
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
- opacity:0.5
-}
-dl {
- padding:12px 0
-}
-dt,dd {
- display:inline-block;
- padding:12px;
- padding-left:0
-}
-dt {
- width:130px;
- white-space:nowrap;
- text-align:right
-}
-kbd {
- padding:4px 10px;
- border:1px solid #ccc;
- box-shadow:0 1px 0 rgba(0, 0, 0, .2);
- border-radius:3px;
- display:inline-block;
- white-space:nowrap
-}
-#app {
- height:100%;
- width:100%
-}
-#app * {
- box-sizing:border-box
-}
-#app-navigation {
- width:250px;
- height:100%;
- float:left;
- box-sizing:border-box;
- background-color:#fff;
- padding-bottom:44px;
- -webkit-user-select:none;
- -moz-user-select:none;
- -ms-user-select:none;
- user-select:none;
- border-right:1px solid #ebebeb;
- display:flex;
- flex-direction:column;
- z-index: 3000;
-}
-#app-navigation > ul {
- position:relative;
- height:100%;
- width:inherit;
- overflow:auto;
- box-sizing:border-box
-}
-#app-navigation > ul > li:focus,#app-navigation > ul > li:hover,#app-navigation > ul > li.active,#app-navigation > ul > li a.selected,#app-navigation > ul > li:focus > a,#app-navigation > ul > li:hover > a,#app-navigation > ul > li.active > a,#app-navigation > ul > li a.selected > a {
- opacity:1;
- box-shadow:inset 2px 0 #0082c9
-}
-#app-navigation li {
- position:relative;
- width:100%;
- box-sizing:border-box
-}
-#app-navigation.hidden {
- display:none
-}
-#app-navigation.without-app-settings {
- padding-bottom:0
-}
-#app-navigation .active.with-menu > a,#app-navigation .with-counter > a {
- padding-right:50px
-}
-#app-navigation .active.with-menu.with-counter > a {
- padding-right:90px
-}
-#app-navigation .with-icon a,#app-navigation .app-navigation-entry-loading a {
- padding-left:44px;
- background-size:16px 16px;
- background-position:14px center;
- background-repeat:no-repeat
-}
-#app-navigation li > a {
- display:block;
- width:90%;
- line-height:44px;
- min-height:44px;
- padding:0 12px;
- overflow:hidden;
- box-sizing:border-box;
- white-space:nowrap;
- text-overflow:ellipsis;
- color:#000;
- opacity:0.57
-}
-#app-navigation li > a:first-child img {
- margin-bottom:-3px;
- margin-right:11px;
- width:16px;
- margin-left:2px
-}
-#app-navigation .collapse {
- display:none;
-}
-#app-navigation .collapsible > .collapse {
- position:absolute;
- height:44px;
- width:44px;
- margin:0;
- padding:0;
- background:none;
- background-image:url('../../../core/css/../img/actions/triangle-s.svg?v=1');
- background-size:16px;
- background-repeat:no-repeat;
- background-position:center;
- border:none;
- border-radius:0;
- outline:none !important;
- box-shadow:none
-}
-#app-navigation .collapsible:hover > a,#app-navigation .collapsible:focus > a {
- background-image:none
-}
-#app-navigation .collapsible:hover > .collapse,#app-navigation .collapsible:focus > .collapse {
- display:block
-}
-#app-navigation .collapsible .collapse {
- -webkit-transform:rotate(-90deg);
- -ms-transform:rotate(-90deg);
- transform:rotate(-90deg)
-}
-#app-navigation .collapsible.open {
- background-image:linear-gradient(top, #ebebeb 0%, #f7f7f7 100%);
- background-image:-webkit-linear-gradient(top, #ebebeb 0%, #f7f7f7 100%);
- background-image:-ms-linear-gradient(top, #ebebeb 0%, #f7f7f7 100%)
-}
-#app-navigation .collapsible.open .collapse {
- -webkit-transform:rotate(0);
- -ms-transform:rotate(0);
- transform:rotate(0)
-}
-#app-navigation > {
-}
-#app-navigation > ul ul {
- display:none
-}
-#app-navigation > ul ul li > a {
- padding-left:32px
-}
-#app-navigation > .with-icon ul li > a,#app-navigation > .with-icon ul li.app-navigation-entry-loading > a {
- padding-left:68px;
- background-position:44px center
-}
-#app-navigation > ul .collapsible.open:hover,#app-navigation > ul .collapsible.open:focus {
- box-shadow:inset 0 0 3px rgba(51, 51, 51, 0.75)
-}
-#app-navigation > ul .collapsible.open ul {
- display:block
-}
-#app-navigation .app-navigation-entry-deleted {
- display:inline-block;
- height:44px;
- width:100%
-}
-#app-navigation .app-navigation-entry-deleted-description {
- padding-left:12px;
- position:relative;
- white-space:nowrap;
- text-overflow:ellipsis;
- overflow:hidden;
- display:inline-block;
- width:calc(100% - 49px);
- line-height:44px;
- float:left
-}
-#app-navigation .app-navigation-entry-deleted-button {
- margin:0;
- height:44px;
- width:44px;
- line-height:44px;
- border:0;
- display:inline-block;
- background-color:transparent;
- opacity:0.5
-}
-#app-navigation .app-navigation-entry-deleted-button:hover,#app-navigation .app-navigation-entry-deleted-button:focus {
- opacity:1
-}
-#app-navigation .utils {
- position:absolute;
- padding:7px 7px 0 0;
- right:0;
- top:0;
- bottom:0;
- font-size:12px
-}
-#app-navigation .utils button,#app-navigation .utils .counter {
- width:44px;
- height:44px;
- padding-top:12px
-}
-#app-navigation .drag-and-drop {
- -webkit-transition:padding-bottom 500ms ease 0s;
- transition:padding-bottom 500ms ease 0s;
- padding-bottom:40px
-}
-#app-navigation .error {
- color:#e9322d
-}
-#app-navigation .app-navigation-separator {
- border-bottom:1px solid #dbdbdb
-}
-#app-navigation .app-navigation-entry-utils {
- position:absolute;
- top:0;
- right:0;
- z-index:105
-}
-#app-navigation .app-navigation-entry-utils ul {
- display:flex !important;
- align-items:center;
- justify-content:flex-end
-}
-#app-navigation .app-navigation-entry-utils li {
- width:44px !important;
- height:44px
-}
-#app-navigation .active > .app-navigation-entry-utils li {
- display:inline-block
-}
-#app-navigation .app-navigation-entry-utils button {
- height:100%;
- width:100%;
- margin:0;
- box-shadow:none
-}
-#app-navigation .app-navigation-entry-utils-menu-button button {
- border:0;
- opacity:0.5;
- background-color:transparent;
- background-repeat:no-repeat;
- background-position:center;
- background-image:url('../../../core/css/../img/actions/more.svg?v=1')
-}
-#app-navigation .app-navigation-entry-utils-menu-button:hover button,#app-navigation .app-navigation-entry-utils-menu-button:focus button {
- background-color:transparent;
- opacity:1
-}
-#app-navigation .app-navigation-entry-utils-counter {
- overflow:hidden;
- text-overflow:hidden;
- text-align:right;
- font-size:9pt;
- width:38px;
- line-height:44px;
- padding:0 10px
-}
-#app-navigation .app-navigation-entry-utils ul,#app-navigation .app-navigation-entry-menu ul {
- list-style-type:none
-}
-#app-navigation .app-navigation-entry-edit {
- padding-left:5px;
- padding-right:5px;
- display:inline-block;
- height:39px;
- width:100%
-}
-#app-navigation .app-navigation-entry-edit input {
- border-bottom-right-radius:0;
- border-top-right-radius:0;
- width:calc(100% - 36px);
- padding:5px;
- margin-right:0;
- height:38px;
- float:left;
- border:1px solid rgba(186, 186, 186, 0.9)
-}
-#app-navigation .app-navigation-entry-edit button,#app-navigation .app-navigation-entry-edit input[type='submit'] {
- width:36px;
- height:38px;
- float:left
-}
-#app-navigation .app-navigation-entry-edit .icon-checkmark {
- border-bottom-left-radius:0;
- border-top-left-radius:0;
- border-left:0;
- margin-right:0
-}
-#app-content {
- position:relative;
- height:100%;
- overflow-y:auto;
-}
-#app-content > .section:first-child {
- border-top:none
-}
-#app-content.with-app-sidebar {
- margin-right:27%
-}
-#app-content-wrapper {
- min-width:100%;
- min-height:100%
-}
-.pull-left {
- float:left
-}
-.pull-right {
- float:right
-}
-.clear-left {
- clear:left
-}
-.clear-right {
- clear:right
-}
-.clear-both {
- clear:both
-}
-.bold {
- font-weight:600
-}
-.center {
- text-align:center
-}
-.inlineblock {
- display:inline-block
-}
-::-moz-focus-inner {
- border:0
-}
-select {
- height:32px
-}
-.ie #show,.ie #show + label {
- display:none;
- visibility:hidden
-}
-@media only screen and (max-width:768px) {
- #app-content {
-  position:absolute !important;
-  top:0;
-  left:0;
-  right:0;
-  bottom:0;
-  padding: 0px 24px;
-  background-color:#fff;
-  overflow-x:hidden !important;
-  z-index:1000
- }
- #app-navigation {
-  width:0px;
- }
- #body-settings #app-content {
-  overflow-x:auto !important
- }
- #app-navigation-toggle {
-  position:fixed;
-  display:inline-block !important;
-  top:45px;
-  left:0;
-  width:44px;
-  height:44px;
-  z-index:149;
-  background-color:rgba(255, 255, 255, .7);
-  cursor:pointer;
-  opacity:0.6
- }
- #app-navigation-toggle:hover,#app-navigation-toggle:focus {
-  opacity:1
- }
- #controls {
-  min-width:initial !important;
-  left:0 !important;
-  padding-left:0
- }
- #app-navigation + #app-content #controls {
-  padding-left:44px
- }
- #body-user .app-files.viewer-mode #controls {
-  padding-left:0 !important
- }
- .app-files.viewer-mode #app-navigation-toggle {
-  display:none !important
- }
-}
-.tooltip {
- position:absolute;
- display:block;
- font-family:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
- font-style:normal;
- font-weight:400;
- letter-spacing:normal;
- line-break:auto;
- line-height:1.6;
- text-align:left;
- text-align:start;
- text-decoration:none;
- text-shadow:none;
- text-transform:none;
- white-space:normal;
- word-break:normal;
- word-spacing:normal;
- word-wrap:normal;
- font-size:12px;
- opacity:0;
- z-index:100000;
- filter:alpha(opacity=0);
-}
-.tooltip.in {
- opacity:1;
- filter:alpha(opacity=100)
-}
-.tooltip.top {
- margin-top:-3px;
- padding:10px 0
-}
-.tooltip.bottom {
- margin-top:3px;
- padding:10px 0
-}
-.tooltip.right {
- margin-left:3px;
- padding:0 10px
-}
-.tooltip.right .tooltip-arrow {
- top:50%;
- left:0;
- margin-top:-10px;
- border-width:10px 10px 10px 0;
- border-right-color:#fff
-}
-.tooltip.left {
- margin-left:-3px;
- padding:0 5px
-}
-.tooltip.left .tooltip-arrow {
- top:50%;
- right:0;
- margin-top:-10px;
- border-width:10px 0 10px 10px;
- border-left-color:#fff
-}
-.tooltip.top .tooltip-arrow,.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow {
- bottom:0;
- border-width:10px 10px 0;
- border-top-color:#fff
-}
-.tooltip.top .tooltip-arrow {
- left:50%;
- margin-left:-10px
-}
-.tooltip.top-left .tooltip-arrow {
- right:10px;
- margin-bottom:-10px
-}
-.tooltip.top-right .tooltip-arrow {
- left:10px;
- margin-bottom:-10px
-}
-.tooltip.bottom .tooltip-arrow,.tooltip.bottom-left .tooltip-arrow,.tooltip.bottom-right .tooltip-arrow {
- top:0;
- border-width:0 10px 10px;
- border-bottom-color:#fff
-}
-.tooltip.bottom .tooltip-arrow {
- left:50%;
- margin-left:-10px
-}
-.tooltip.bottom-left .tooltip-arrow {
- right:10px;
- margin-top:-10px
-}
-.tooltip.bottom-right .tooltip-arrow {
- left:10px;
- margin-top:-10px
-}
-.tooltip-inner {
- max-width:350px;
- padding:5px 8px;
- background-color:#fff;
- color:#000;
- box-shadow:0 1px 10px rgba(150, 150, 150, .75);
- text-align:center;
- border-radius:3px
-}
-.tooltip-arrow {
- position:absolute;
- width:0;
- height:0;
- border-color:transparent;
- border-style:solid
-}
-
-.table-wrapper {
-  width: 80%;
-  max-width: 450px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table-wrapper table {
-  width: 100%;
-  max-width: 450px;
-  margin: 0 auto;
-}
-
-.table-wrapper input[type='text'] {
-  width: 100%;
-}
-
-.outputbox {
-  width: 100%;
-}
-
-#loading-gif {
-  display: none;
-}
-
-#loading-info-gif {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: 96px;
-}
-
-.text-title {
-  text-align: center;
-}
-
-#config-box-info-txt {
-  white-space: pre-wrap;
-  text-align: center;
-}
-
-#config-button-wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.icon-close {
- background-image:url('img/close.svg')
-}
-
-.icon-menu {
-  background-image: url('img/menu.svg');
-}
-
-#power {
-  display: inline-block;
-  color: rgba(255, 255, 255, 0.7);
-  cursor: pointer;
-  flex: 0 0 auto;
-}
-
-#expand {
-  position: relative;
-  display: flex;
-  align-items: center;
-  padding: 7px 20px 6px 10px;
-  cursor: pointer;
-}
-
-#expand * {
-  cursor: pointer;
-}
-
-#expand:hover img,#expand:focus img,#expand:active img,#expand:hover #expandDisplayName,#expand:focus #expandDisplayName,#expand:active #expandDisplayName {
- -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
- opacity:1
-}
-
-.icon-power-white {
-  background-image: url('img/poweroff.svg');
-}
-.icon-nc-white {
-  background-image: url('img/nc-button.svg');
-}
-.icon-nc-info {
-  background-image: url('img/info-white.svg');
-}
-.icon-config {
-  background-image: url('img/settings-white.svg');
-}
-.icon-reboot-white {
-  background-image: url('img/reboot.svg');
-}
-.icon-dashboard {
-  background-image: url('img/dashboard.svg');
-}
-
-.icon-wizard-white {
-  background-image: url('img/wizard.svg');
-}
-.icon-red-circle {
-  background-image: url('img/red-circle.svg');
-  padding: 8px;
-  display: none;
-}
-
-.icon-green-circle {
-  background-image: url('img/green-circle.svg');
-  padding: 8px;
-}
-
-.icon-info {
-  background-image: url('img/info.svg');
-  padding: 8px;
-  float: right;
-  display: none;
-}
-
-#expand #expandDisplayName {
-  padding: 8px;
-  opacity: 0.6;
-}
-
-a#versionlink{
- border:0;
- color:white;
- text-decoration:none;
- cursor:pointer
-}
-
-a#versionlink:hover {
-  opacity: 0.8;
-}
-
-#update-notification {
-  cursor: pointer;
-}
-
-/* lower version link */
-#header #header-left {
-  align-items:baseline
-}
-
-#first-run-wizard {
-  position:fixed;
-  top:0;
-  bottom:0;
-  height:100%;
-  width:100%;
-  background-color:rgba(0, 0, 0, 0.5);
-  z-index:9000;
-  text-align:center;
-  cursor:pointer;
-}
-
-#first-run-wizard img {
-  width: 70%;
-  max-width: 210px;
-}
-
-.dialog {
-  display:block;
-  background: white;
-  position:relative;
-  width:50%;
-  max-width: 400px;
-  top:25%;
-  margin:0px auto;
-}
-
-.big-button {
-  display:block;
-  background: #0082c9;
-  width:100%;
-  margin:0px auto;
-  color: white;
-  cursor: pointer;
-  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
-  opacity:1
-}
-.big-button:hover {
-  border-color: white !important;
-  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
-  opacity:0.75
-}
-
-#close-wizard {
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  display: block;
-  background: none;
-  background-image:url('img/view-close.svg');
-  width: 38px;
-  height: 19px;
-  text-indent: -9999px;
-  border: none;
-}
-
-#wizard-btn {
-  cursor: pointer;
-}
-
-#poweroff-dialog {
-  flex-direction: column;
-  flex-wrap: nowrap;
-  justify-content: space-around;
-  align-items: center;
-  width: 200px;
-  background-color: white;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  text-align: center;
-  z-index: 10000;
-  line-height: 60px;
-  border-radius: 3px;
-}
-
-#poweroff-dialog button {
-   font-size: 2em;
-}
-
-#overlay {
-  display: block;
-  background-color: rgba(0, 0, 0, 0.2);
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 2500;
-}
-
-.ok-field{
-  color: green;
-}
-
-.error-field{
-  color: red;
-}
-
-.val-field{
-  color: gray;
-}
-
-.dashtable tr {
-  height: 25px;
-  border-bottom: 1px solid #ebebeb;
-}
-
-.dashtable td {
-  border-bottom: 1px solid #ebebeb;
-}
-
-#dashboard-suggestions {
-  margin-bottom: 1em;
-}
-
-.hidden {
- display:none
-}
-
-.hidden-visually {
- position:absolute;
- left:-10000px;
- top:auto;
- width:1px;
- height:1px;
- overflow:hidden
-}
-
-#details-box {
-  background-color: #fbfbfb;
-  border: solid 1px lightgray;
-  color: #565656;
-  overflow: auto;
-}
-
-#language-selection {
-  border: none;
-  color: white;
-}
diff --git a/ncp-web/ncp.js b/ncp-web/ncp.js
deleted file mode 100644
index fa53b714..00000000
--- a/ncp-web/ncp.js
+++ /dev/null
@@ -1,422 +0,0 @@
-///
-// 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!
-//
-// More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-///
-
-var MINI = require('minified');
-var $ = MINI.$, $$ = MINI.$$, EE = MINI.EE;
-var selectedID = null;
-var lock       = false;
-
-function errorMsg()
-{ 
-  $('#config-box').fill( "Something went wrong. Try refreshing the page" ); 
-}
-
-function switch_to_section( name )
-{
-  $( '#config-wrapper'    ).hide();
-  $( '#dashboard-wrapper' ).hide();
-  $( '#nc-config-wrapper' ).hide();
-  $( '#' + name + '-wrapper' ).show();
-  $( '#' + selectedID ).set('-active');
-  selectedID = null;
-}
-
-// slide menu
-var slide_menu_enabled = false;
-
-function open_menu()
-{
-  if ( !slide_menu_enabled ) return;
-  if ( $('#app-navigation').get('$width') != '250px' )
-  {
-    $('#overlay').show();
-    $('#overlay').on('|click', close_menu );
-    $('#app-navigation').animate( {$width: '250px'}, 150 );
-  }
-}
-
-function close_menu()
-{
-  if ( !slide_menu_enabled ) return;
-  if ( $('#app-navigation').get('$width') == '250px' )
-  {
-    $('#app-navigation').animate( {$width: '0px'}, 150 );
-    $('#overlay').hide();
-    $.off( close_menu );
-  }
-}
-
-function hide_overlay(e) { $('#overlay').hide() }
-
-function close_menu_on_click_out(e) { close_menu(); }
-
-function enable_slide_menu()
-{
-  if ( slide_menu_enabled ) return;
-  $( '#app-navigation' ).set( { $width: '0px' } );
-  $( '#app-navigation' ).set( { $position: 'absolute' } );
-  $( '#app-navigation-toggle' ).on('click', open_menu );
-  $( '#app-content' ).on('|click', close_menu_on_click_out );
-  slide_menu_enabled = true;
-}
-
-function disable_slide_menu()
-{
-  if ( !slide_menu_enabled ) return;
-  $.off( open_menu );
-  $.off( close_menu );
-  $.off( close_menu_on_click_out );
-  $( '#app-navigation' ).set( { $width: '250px' } );
-  $( '#app-navigation' ).set( { $position: 'unset' } );
-  $('#overlay').hide();
-  slide_menu_enabled = false;
-}
-
-function set_sidebar_click_handlers()
-{
-  // Show selected option configuration box
-  $( 'li' , '#app-navigation' ).on('click', function(e)
-  {
-    if ( selectedID == this.get( '.id' ) ) // already selected
-      return;
-
-    if ( lock ) return;
-    lock = true;
-
-    if ( window.innerWidth <= 768 )
-      close_menu();
-
-    $( '#' + selectedID ).set('-active');
-    var that = this;
-    $.request('post', 'ncp-launcher.php', { action:'cfgreq', 
-                                            ref:this.get('.id') ,
-                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( 
-      function success( result ) 
-      {
-        cfgreqReceive( result, that );
-        lock = false;
-      }).error( errorMsg );
-  });
-}
-
-function print_dashboard()
-{
-  $.request('post', 'ncp-launcher.php', { action: 'info',
-                                          csrf_token: $( '#csrf-token-ui' ).get( '.value' ) }).then(
-
-    function success( result )
-    {
-      var ret = $.parseJSON( result );
-      if ( ret.token )
-        $('#csrf-token-ui').set( { value: ret.token } );
-      $('#loading-info-gif').hide();
-      $('#dashboard-table').ht( ret.table );
-      $('#dashboard-suggestions').ht( ret.suggestions );
-      reload_sidebar();
-    } ).error( errorMsg );
-}
-
-function reload_sidebar()
-{
-  // request
-  $.request('post', 'ncp-launcher.php', { action:'sidebar', 
-    csrf_token: $( '#csrf-token-ui' ).get( '.value' ) }).then( 
-      function success( result ) 
-      {
-        var ret = $.parseJSON( result );
-        if ( ret.token )
-          $('#csrf-token-ui').set( { value: ret.token } );
-        if ( ret.ret && ret.ret == '0' ) {
-          $('#ncp-options').ht( ret.output );
-          set_sidebar_click_handlers();
-        }
-      }).error( errorMsg );
-}
-
-function cfgreqReceive( result, item )
-{
-  var ret = $.parseJSON( result );
-  if ( ret.token )
-    $('#csrf-token').set( { value: ret.token } );
-
-  switch_to_section( 'config' );
-  selectedID = item.get('.id');
-  item.set( '+active' );
-
-  $('#details-box'     ).hide();
-  $('#circle-retstatus').hide();
-  $('#config-box').ht( ret.output );
-  $('#config-box-title'    ).fill( $( '#' + selectedID + '-desc' ).get( '.value' ) ); 
-  $('#config-box-info-txt' ).fill( $( '#' + selectedID + '-info' ).get( '.value' ) ); 
-  $('#config-box-wrapper').show();
-  $('#config-extra-info').set( { $display: 'inline-block' } );
-  $('#config-extra-info').up().set( '@href', 'https://github.com/nextcloud/nextcloudpi/wiki/Configuration-Reference#' + selectedID );
-}
-
-$(function() 
-{
-  // Event source to receive process output in real time
-  if (!!window.EventSource)
-    var source = new EventSource('ncp-output.php');
-  else
-    $('#config-box-title').fill( "Browser not supported" );
-
-  $('#poweroff-dialog').hide();
-  $('#overlay').hide();
-
-  source.addEventListener('message', function(e) 
-    {
-      if ( e.origin != 'https://' + window.location.hostname + ':4443') 
-      {
-        $('#details-box').fill( "Invalid origin" ); 
-        return;
-      }
-
-      var box = $$('#details-box');
-      $('#details-box').ht( box.innerHTML + e.data + '<br>' );
-      box.scrollTop = box.scrollHeight;
-    }, false);
-
-  set_sidebar_click_handlers();
-
-  // Launch selected script
-  $( '#config-button' ).on('click', function(e)
-  {
-    lock = true;
-    $('#details-box').hide( '' );
-    $('#config-button').set('@disabled',true);
-    $('#loading-gif').set( { $display: 'inline' } );
-
-    // create configuration object
-    var cfg = {};
-    $( 'input' , '#config-box' ).each( function(item){
-      if( item.getAttribute('type') == 'checkbox' )
-        item.value = item.checked ? 'yes' : 'no';
-
-      cfg[item.name] = item.value;
-    } );
-
-    $( 'select', '#config-box' ).each( function(item) {
-      var select = {
-        'id': item.name,
-        'value': []
-      };
-      $("#" + item.id + '>option').each(function(option) {
-        select.value.push(option.selected ? "_" + option.value + "_" : "" + option.value);
-      });
-      cfg[select.id] = select.value;
-    });
-
-
-    // reset box
-    $('#details-box').fill();
-    $('#details-box').show();
-    $('#details-box').set( {$height: '0vh'} );
-    $('#details-box').animate( {$height: '50vh'}, 150 );
-    $('#circle-retstatus').hide();
-
-    $( 'input' , '#config-box-wrapper' ).set('@disabled',true);
-
-    // request
-    $.request('post', 'ncp-launcher.php', { action:'launch', 
-                                            ref   : selectedID,
-                                            config: $.toJSON(cfg),
-                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( 
-      function success( result ) 
-      {
-        var ret = $.parseJSON( result );
-        if ( ret.token )
-          $('#csrf-token').set( { value: ret.token } );
-        if ( ret.ret )                           // means that the process was launched
-        {
-          if ( ret.ret == '0' ) 
-          {
-            if( ret.ref && ret.ref == 'nc-update' )
-              window.location.reload( true );
-            reload_sidebar();
-            $('#circle-retstatus').set( '+icon-green-circle' );
-          }
-          else 
-            $('#circle-retstatus').set( '-icon-green-circle' );
-          $('#circle-retstatus').show();
-        }
-        else                                     // print error from server instead
-          $('#details-box').fill(ret.output);
-        $( 'input' , '#config-box-wrapper' ).set('@disabled', null);
-        $('#config-button').set('@disabled',null);
-        $('#loading-gif').hide();
-        lock = false;
-      }).error( errorMsg );
-  });
-
-  // Update notification
-  $( '#notification' ).on('click', function(e)
-  {
-    if ( lock ) return;
-    lock = true;
-    
-    $( '#' + selectedID ).set('-active');
-
-    // request
-    $.request('post', 'ncp-launcher.php', { action:'cfgreq', 
-                                            ref:'nc-update' ,
-                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( 
-      function success( result ) 
-      {
-        cfgreqReceive( result, $( '#nc-update' ) );
-        lock = false;
-      }
-      ).error( errorMsg );
-
-    //clear details box
-    $('#details-box').hide( '' );
-  } );
-
-  // slide menu
-  if ( window.innerWidth <= 768 ) 
-    enable_slide_menu();
-
-  window.addEventListener('resize', function(){ 
-    if ( window.innerWidth <= 768 ) 
-      enable_slide_menu();
-    else
-      disable_slide_menu();
-  } );
-
-  // Power-off button
-  function hide_poweroff_dialog(ev)
-  {
-    $('#poweroff-dialog').hide();
-    $('#overlay').hide();
-    $('#overlay').off('click');
-  }
-  function poweroff_event_handler(e)
-  {
-    $('#overlay').show();
-    $('#poweroff-dialog').show();
-    $('#overlay').on('click', hide_poweroff_dialog );
-  }
-  $( '#poweroff' ).on('click', poweroff_event_handler );
-
-  $( '#poweroff-option_shutdown' ).on('click', function(e)
-  {
-    $('#poweroff-dialog').hide();
-    $('#overlay').hide();
-
-    // request
-    $.request('post', 'ncp-launcher.php', { action:'poweroff', 
-                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( 
-      function success( result ) 
-      {
-        $('#config-box-wrapper').hide();
-        $.off( poweroff_event_handler );
-        $('#config-box-title').fill( "Shutting down..." ); 
-      }).error( errorMsg );
-  } );
-
-  $( '#poweroff-option_reboot' ).on('click', function(e)
-  {
-    $('#poweroff-dialog').hide();
-    $('#overlay').hide();
-    // request
-    $.request('post', 'ncp-launcher.php', { action:'reboot', 
-                                            csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( 
-      function success( result ) 
-      {
-        $('#config-box-wrapper').hide();
-        $.off( poweroff_event_handler );
-        $('#config-box-title').fill( "Rebooting..." ); 
-      }).error( errorMsg );
-  } );
-
-  // close notification icon
-  $( '.icon-close' ).on('click', function(e)
-  {
-    $( '#notification' ).hide();
-  } );
- 
-  // close first run box
-  $( '.first-run-close' ).on('click', function(e)
-  {
-    $( '#first-run-wizard' ).hide();
-  } );
-  $( '#first-run-wizard' ).on('|click', function(e)
-  {
-    if( e.target.id == 'first-run-wizard' )
-      $( '#first-run-wizard' ).hide();
-  } );
-
-  // click to nextcloud button
-  $('#nextcloud-btn').set( '@href', window.location.protocol + '//' + window.location.hostname );
-
-  // dashboard button
-  $( '#dashboard-btn' ).on('click', function(e)
-  {
-    if ( lock ) return;
-    close_menu();
-    switch_to_section( 'dashboard' );
-  } );
-
-  // config button
-  $( '#config-btn' ).on('click', function(e)
-  {
-    if ( lock ) return;
-    close_menu();
-    switch_to_section( 'nc-config' );
-  } );
-
-  // language selection
-  var langold = $( '#language-selection' ).get( '.value' );
-  $( '#language-selection' ).on( 'change', function(e)
-    {
-      if( '[new]' == this.get( '.value' ) )
-      {
-        this.set( '.value', langold );
-        var url = 'https://github.com/nextcloud/nextcloudpi/wiki/Add-a-new-language-to-ncp-web';
-        if ( !window.open( url, '_blank' ) ) // try to open in a new tab first
-          window.location.href = url;
-        return;
-      }
-      // request
-      $.request('post', 'ncp-launcher.php', { action:'cfg-ui',
-                                              value: this.get( '.value' ),
-                                              csrf_token: $( '#csrf-token-cfg' ).get( '.value' ) }).then(
-        function success( result )
-        {
-          var ret = $.parseJSON( result );
-          if ( ret.token )
-            $('#csrf-token-cfg').set( { value: ret.token } );
-          if ( ret.ret && ret.ret == '0' )                        // means that the process was launched
-            window.location.reload( true );
-          else
-            this.set( '.value', langold );
-        }
-    ).error( errorMsg )
-  } );
-
-  // load dashboard info
-  print_dashboard();
-} );
-
-// 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/ncp-web/sidebar.php b/ncp-web/sidebar.php
deleted file mode 100644
index c90a509c..00000000
--- a/ncp-web/sidebar.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-///
-// 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!
-//
-// More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
-///
-
-// fill options with contents from directory
-
-function print_sidebar( $l /* translations l10n object */, $ticks /* wether to calculate ticks(slow) */ )
-{
-  $modules_path = '/usr/local/etc/ncp-config.d/';
-  $files = array_diff(scandir($modules_path), array('.', '..', 'nc-wifi.sh', 'nc-info.sh', 'l10n'));
-  $ret   = "";
-
-  foreach ($files as $file) {
-    $script = pathinfo($file, PATHINFO_FILENAME);
-    $txt = file_get_contents($modules_path . $file);
-
-    $active = "";
-    if ( $ticks ) {
-      $etc = '/usr/local/etc';
-      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))
-        $active = " ✓";
-
-    $ret .= "<li id=\"$script\" class=\"nav-recent\">";
-    $ret .= "<a href=\"#\"> {$l->__($script, $script)}$active </a>";
-
-    if (preg_match('/^DESCRIPTION="(.*)"$/m', $txt, $matches))
-      $ret .= "<input id=\"$script-desc\" type=\"hidden\" value=\"{$l->__($matches[1], $script)}\" />";
-
-    if (preg_match('/^INFO="(.*)"/msU', $txt, $matches))
-      $ret .= "<input id=\"$script-info\" type=\"hidden\" value=\"{$l->__($matches[1], $script)}\" />";
-
-    if (preg_match('/^INFOTITLE="(.*)"/msU', $txt, $matches))
-      $ret .= "<input id=\"$script-infotitle\" type=\"hidden\" value=\"{$l->__($matches[1], $script)}\" />";
-
-    $ret .= "</li>";
-  }
-  return $ret;
-}
-// 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/ncp.sh b/ncp.sh
index 900d5e6a..c2e86a9f 100644
--- a/ncp.sh
+++ b/ncp.sh
@@ -12,6 +12,7 @@ WEBADMIN=ncp
 WEBPASSWD=ownyourbits
 BRANCH=master
 
+BINDIR=/usr/local/bin/ncp
 CONFDIR=/usr/local/etc/ncp-config.d/
 APTINSTALL="apt-get install -y --no-install-recommends"
 export DEBIAN_FRONTEND=noninteractive
@@ -21,8 +22,8 @@ install()
 {
   # NCP-CONFIG
   apt-get update
-  $APTINSTALL git dialog whiptail
-  mkdir -p $CONFDIR
+  $APTINSTALL git dialog whiptail jq
+  mkdir -p "$CONFDIR" "$BINDIR"
 
   # include option in raspi-config (only Raspbian)
   test -f /usr/bin/raspi-config && {
@@ -129,12 +130,8 @@ EOF
 
   cat > /home/www/ncp-launcher.sh <<'EOF'
 #!/bin/bash
-DIR=/usr/local/etc/ncp-config.d
-[[ -f $DIR/$1  ]] || { echo "File not found"; exit 1; }
-[[ "$1" =~ ../ ]] && { echo "Forbidden path"; exit 2; }
 source /usr/local/etc/library.sh
-cd $DIR
-launch_script $1
+run_app $1
 EOF
   chmod 700 /home/www/ncp-launcher.sh
   echo "www-data ALL = NOPASSWD: /home/www/ncp-launcher.sh , /sbin/halt, /sbin/reboot" >> /etc/sudoers
@@ -169,7 +166,6 @@ cd /var/www/nextcloud
 sudo -u www-data php occ config:system:set trusted_domains 1 --value=$IP
 EOF
 
-  # make sure this is called on last re-boot
   [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nextcloud-domain 
 
   # NEXTCLOUDPI UPDATES
diff --git a/post-inst.sh b/post-inst.sh
index 8be379a7..986a6661 100644
--- a/post-inst.sh
+++ b/post-inst.sh
@@ -8,7 +8,7 @@
 # More at nextcloudpi.com
 #
 
-install()   
+configure()
 { 
   # stop mysqld and redis
   mysqladmin -u root shutdown
@@ -18,10 +18,8 @@ install()
 
   # cleanup all NCP extras
   source /usr/local/etc/library.sh
-  cd /usr/local/etc/ncp-config.d/
-  for script in *.sh; do
-    cleanup_script $script
-  done
+  find /usr/local/bin/ncp -name '*.sh' | \
+    while read script; do cleanup_script $script; done
 
   # clean packages and installation logs
   apt-get autoremove -y
diff --git a/update.sh b/update.sh
index 2ee811c1..31226e51 100755
--- a/update.sh
+++ b/update.sh
@@ -12,29 +12,29 @@ CONFDIR=/usr/local/etc/ncp-config.d/
 
 # don't make sense in a docker container
 EXCL_DOCKER="
-nc-automount.sh
-nc-format-USB.sh
-nc-datadir.sh
-nc-database.sh
-nc-ramlogs.sh
-nc-swapfile.sh
-nc-static-IP.sh
-nc-wifi.sh
-nc-nextcloud.sh
-nc-init.sh
-UFW.sh
-nc-snapshot.sh
-nc-snapshot-auto.sh
-nc-audit.sh
-nc-hdd-monitor.sh
-SSH.sh
-fail2ban.sh
-NFS.sh
+nc-automount
+nc-format-USB
+nc-datadir
+nc-database
+nc-ramlogs
+nc-swapfile
+nc-static-IP
+nc-wifi
+nc-nextcloud
+nc-init
+UFW
+nc-snapshot
+nc-snapshot-auto
+nc-audit
+nc-hdd-monitor
+SSH
+fail2ban
+NFS
 "
 
 # better use a designated container
 EXCL_DOCKER+="
-samba.sh
+samba
 "
 
 # check running apt
@@ -46,38 +46,28 @@ source /usr/local/etc/library.sh
 
 mkdir -p "$CONFDIR"
 
-# prevent installing some apt packages in the docker version
+# prevent installing some ncp-apps in the docker version
 [[ -f /.docker-image ]] && {
-  for opt in $EXCL_DOCKER; do 
-    touch $CONFDIR/$opt
-done
+  for opt in $EXCL_DOCKER; do
+    touch $CONFDIR/$opt.cfg
+  done
 }
 
 # copy all files in bin and etc
-for file in bin/* etc/*; do
-  [ -f "$file" ] || continue;
-  cp "$file" /usr/local/"$file"
-done
+cp -r bin/* /usr/local/bin/
+find etc -maxdepth 1 -type f -exec echo cp '{}' /usr/local/ \;
 
 # 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
+    install_app "$(basename "$file" .cfg)"
 
     # configure if active by default
-    grep -q '^ACTIVE_=yes$' "$file" && activate_script "$file" 
-  }
-
-  # save current configuration to (possibly) updated script
-  [ -f /usr/local/"$file" ] && {
-    VARS=( $( grep "^[[:alpha:]]\+_=" /usr/local/"$file" | cut -d= -f1 ) )
-    VALS=( $( grep "^[[:alpha:]]\+_=" /usr/local/"$file" | cut -d= -f2 ) )
-    for i in $( seq 0 1 ${#VARS[@]} ); do
-      sed -i "s|^${VARS[$i]}=.*|${VARS[$i]}=${VALS[$i]}|" "$file"
-    done
+    [[ "$(jq -r ".params[0].id"    "$file")" == "active" ]] && \
+    [[ "$(jq -r ".params[0].value" "$file")" == "yes"    ]] && \
+      run_app_unsafe "$file"
   }
-
   cp "$file" /usr/local/"$file"
 done
 
@@ -95,8 +85,11 @@ chown -R www-data:www-data /var/www/ncp-web
 chmod 770                  /var/www/ncp-web
 
 [[ -f /.docker-image ]] && {
-  # remove unwanted packages for the docker version
-  for opt in $EXCL_DOCKER; do rm $CONFDIR/$opt; done
+  # remove unwanted ncp-apps for the docker version
+  for opt in $EXCL_DOCKER; do
+    rm $CONFDIR/$opt.cfg
+    find /usr/local/bin/ncp -name "$opt.sh" -exec rm '{}' \;
+  done
 
   # update services
   cp docker-common/{lamp/010lamp,nextcloud/020nextcloud,nextcloudpi/000ncp} /etc/services-enabled.d
@@ -110,24 +103,7 @@ chmod 770                  /var/www/ncp-web
 
   # docker images only
   [[ -f /.docker-image ]] && {
-     cat > /etc/services-available.d/000ncp <<EOF
-#!/bin/bash
-
-source /usr/local/etc/library.sh
-
-# INIT NCP CONFIG (first run)
-persistent_cfg /usr/local/etc/ncp-config.d /data/ncp
-persistent_cfg /usr/local/bin /data/bin
-persistent_cfg /etc/services-enabled.d
-persistent_cfg /etc/letsencrypt                   # persist SSL certificates
-persistent_cfg /etc/shadow                        # persist ncp-web password
-persistent_cfg /etc/cron.d
-persistent_cfg /etc/cron.daily
-persistent_cfg /etc/cron.hourly
-persistent_cfg /etc/cron.weekly
-
-exit 0
-EOF
+    :
   }
 
   # for non docker images
@@ -142,24 +118,11 @@ EOF
   }
 
   # update nc-restore
-  cd "$CONFDIR" &>/dev/null
-  install_script nc-backup.sh
-  install_script nc-restore.sh
-  cd -          &>/dev/null
-
-  # Update btrfs-sync
-  wget -q https://raw.githubusercontent.com/nachoparker/btrfs-sync/master/btrfs-sync -O /usr/local/bin/btrfs-sync
-
-  # Update php imagick
-  apt-get install -y --no-install-recommends imagemagick php7.2-imagick php7.2-exif
+  install_app nc-backup
+  install_app nc-restore
 
   # update to NC14.0.4
-  F="$CONFDIR"/nc-autoupdate-nc.sh
-  grep -q '^ACTIVE_=yes$' "$F" && {
-    cd "$CONFDIR" &>/dev/null
-    activate_script nc-autoupdate-nc.sh
-    cd -          &>/dev/null
-  }
+  is_active_app nc-autoupdate-nc && run_app nc-autoupdate-nc
 
   # remove redundant opcache configuration. Leave until update bug is fixed -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815968
   # Bug #416 reappeared after we moved to php7.2 and debian buster packages. (keep last)
@@ -169,6 +132,12 @@ EOF
   # in NC14.0.4 the referrer policy is included in .htaccess
   grep -q Referrer-Policy /var/www/nextcloud/.htaccess && sed -i /Referrer-Policy/d /etc/apache2/apache2.conf
 
+  # install new dependencies
+  type jq &>/dev/null || {
+    apt-get update
+    apt-get install -y --no-install-recommends jq
+  }
+
 } # end - only live updates
 
 exit 0
-- 
cgit v1.2.3