From bec9cdb38a65642f4e1a44447da55dcd378b1360 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Mon, 24 Jul 2017 01:15:51 +0200
Subject: [PATCH] ncp-web HTTPS only

---
 etc/nextcloudpi-config.d/letsencrypt.sh |  2 +-
 nextcloudpi.sh                          | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh
index a80ada974..28115bbe8 100644
--- a/etc/nextcloudpi-config.d/letsencrypt.sh
+++ b/etc/nextcloudpi-config.d/letsencrypt.sh
@@ -45,7 +45,7 @@ configure()
     sed -i "s|ServerName .*|ServerName $DOMAIN_|" $VHOSTCFG_ || \
     sed -i "/DocumentRoot/aServerName $DOMAIN_" $VHOSTCFG_ 
 
-  /etc/letsencrypt/letsencrypt-auto -n --no-self-upgrade --apache --hsts --agree-tos -m $EMAIL_ -d $DOMAIN_
+  /etc/letsencrypt/letsencrypt-auto -n --no-self-upgrade --apache --hsts --agree-tos -m $EMAIL_ -d $DOMAIN_ || return 1
   echo "* 1 * * 1 root /etc/letsencrypt/certbot-auto renew --quiet" > /etc/cron.d/letsencrypt-ncp
 
   cd /var/www/nextcloud
diff --git a/nextcloudpi.sh b/nextcloudpi.sh
index 1037fafa1..bd9586e68 100644
--- a/nextcloudpi.sh
+++ b/nextcloudpi.sh
@@ -34,17 +34,6 @@ install()
   # NEXTCLOUDPI-CONFIG WEB
   ##########################################
   cat > /etc/apache2/sites-available/ncp.conf <<'EOF'
-Listen 8089
-<VirtualHost _default_:8089>
-  DocumentRoot /var/www/ncp-web
-</VirtualHost>
-<Directory /var/www/ncp-web/>
-  Require host localhost
-  Require ip 127.0.0.1
-  Require ip 192.168
-  Require ip 10
-</Directory>
-
 Listen 4443
 <VirtualHost _default_:4443>
   DocumentRoot /var/www/ncp-web