From 28accd2364ea3d5d2e7e65b29750f85dbd60a88d Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Fri, 24 Mar 2017 18:47:22 +0100
Subject: add HTTPS only setting to nextcloudpi-config

---
 install-nextcloud.sh |  2 +-
 nc-httpsonly.sh      | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 nextcloud.sh         |  4 ++--
 nextcloudpi-config   |  2 +-
 4 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100755 nc-httpsonly.sh

diff --git a/install-nextcloud.sh b/install-nextcloud.sh
index 3ee182ee..0281938f 100755
--- a/install-nextcloud.sh
+++ b/install-nextcloud.sh
@@ -37,7 +37,7 @@ config $INSTALL_SCRIPT || exit 1
 launch_install_qemu "$IMGFILE" $IP || exit 1
 
 CONFDIR=/usr/local/etc/nextcloudpi-config.d/
-copy_to_image "$IMGOUT" $CONFDIR nc-limits.sh nc-datadir.sh
+copy_to_image "$IMGOUT" $CONFDIR nc-limits.sh nc-datadir.sh nc-httpsonly.sh
 copy_to_image "$IMGOUT" $CONFDIR/library library.sh
 copy_to_image "$IMGOUT" /usr/local/bin/ nextcloudpi-config
 
diff --git a/nc-httpsonly.sh b/nc-httpsonly.sh
new file mode 100755
index 00000000..1ee9e7f0
--- /dev/null
+++ b/nc-httpsonly.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# HTTPS rewrite configuration script for NextCloudPi
+# Tested with 2017-03-02-raspbian-jessie-lite.img
+#
+# 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!
+#
+# Usage:
+# 
+#   ./installer.sh nc-httpsonly.sh <IP> (<img>)
+#
+# See installer.sh instructions for details
+#
+# 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
+  service apache2 reload
+}
+
+install() { :; }
+cleanup() { :; }
+
+# 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/nextcloud.sh b/nextcloud.sh
index d395552b..196d3e6b 100755
--- a/nextcloud.sh
+++ b/nextcloud.sh
@@ -230,8 +230,8 @@ EOF
   # NEXTCLOUDPI-CONFIG
   $APTINSTALL dialog
   mkdir -p $CONFDIR
-  sed -i '/Change User Password/i"0 NextCloudPi Configuration" "Configuration of NextCloudPi" \\'  /usr/bin/raspi-config
-  sed -i '/1\\ \*) do_change_pass ;;/i0\\ *) nextcloudpi-config ;;'                                /usr/bin/raspi-config
+  sed -i '/Change User Password/i"0 NextCloudPi Configuration" "Configuration of NextCloudPi" \\\\'  /usr/bin/raspi-config
+  sed -i '/1\\\\ \*) do_change_pass ;;/i0\\\\ *) nextcloudpi-config ;;'                                /usr/bin/raspi-config
 fi
 }
 
diff --git a/nextcloudpi-config b/nextcloudpi-config
index a075c72a..da387ad9 100755
--- a/nextcloudpi-config
+++ b/nextcloudpi-config
@@ -32,7 +32,7 @@ function nextcloud-config()
                      "${LIST[@]}" \
             3>&1 1>&2 2>&3 )
 
-  [[ $? -ne $DIALOG_OK ]] || [[ "$script" == "" ]] && return 1
+  [[ $? -ne $DIALOG_OK ]] || [[ "$script" == "" ]] && return 0
 
   (
     cd $CONFDIR
-- 
cgit v1.2.3