From e1c46b51b4d01693de7455370dc9af42247d5d80 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Fri, 31 Mar 2017 17:44:49 +0200
Subject: [PATCH] added RAM logs

---
 README.md                              | 12 +++--
 etc/nextcloudpi-config.d/nc-ramlogs.sh | 63 ++++++++++++++++++++++++++
 nextcloud.sh                           |  2 +-
 3 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100755 etc/nextcloudpi-config.d/nc-ramlogs.sh

diff --git a/README.md b/README.md
index 411c3a44..89145054 100644
--- a/README.md
+++ b/README.md
@@ -11,20 +11,26 @@ Use QEMU to automatically generate Raspbian Images with Nextcloud
 * Apache 2.4.25, with HTTP2 enabled
 * PHP 7.0 (double the speed of PHP5!)
 * MariaDB 10
-* 4.9.13 Linux Kernel ( NEW 03-13-2017 ) 
-* nextcloudpi-config for easy setup
+* 4.9.13 Linux Kernel ( NEW 03-13-2017 )
+* nextcloudpi-config for easy setup ( RAM logs, USB drive and more )
 * Automatic redirection to HTTPS
 * ACPU PHP cache
 * PHP Zend OPcache enabled with file cache
 * HSTS
 * Cron jobs for Nextcloud
 * Sane configuration defaults
+* Secure
+
+## Extras
+
+* Wi-Fi ready ( NEW 03-31-2017 )
+* Automatic security updates, activated by default. ( NEW 03-21-2017 )
 * Let’s Ecrypt for trusted HTTPS certificates.(  NEW 03-16-2017 )
 * Fail2Ban protection against brute force attacks. ( NEW 02-24-2017 )
 * Dynamic DNS support for no-ip.org ( NEW 03-05-2017 )
 * dnsmasq DNS server with DNS cache ( NEW 03-09-2017 )
-* Automatic security updates, activated by default. ( NEW 03-21-2017 )
 * ModSecurity Web Application Firewall ( NEW 03-23-2017 )
+* Remote updates ( NEW 03-31-2017 )
 
 ## Usage
 
diff --git a/etc/nextcloudpi-config.d/nc-ramlogs.sh b/etc/nextcloudpi-config.d/nc-ramlogs.sh
new file mode 100755
index 00000000..e90531d6
--- /dev/null
+++ b/etc/nextcloudpi-config.d/nc-ramlogs.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# Data dir 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-ramlogs.sh <IP> (<img>)
+#
+# See installer.sh instructions for details
+#
+# More at https://ownyourbits.com/
+#
+
+ACTIVE_=no
+DESCRIPTION="mount logs in RAM to prevent SD card degradation (faster, consumes more RAM)"
+
+configure()
+{
+  [[ $ACTIVE_ != "yes" ]] && {
+    sed -i '/tmpfs \/var\/log.* in RAM$/d' /etc/fstab
+    sed -i '/tmpfs \/tmp.* in RAM$/d'      /etc/fstab
+    echo "Logs in SD. Reboot for changes to take effect"
+    return
+  }
+
+  grep -q "Logs in RAM" /etc/fstab || cat >> /etc/fstab <<EOF
+tmpfs /var/log tmpfs defaults,noatime,mode=1777 0 0 # Logs in RAM
+tmpfs /tmp     tmpfs defaults,noatime,mode=1777 0 0 # /tmp in RAM
+EOF
+
+  local HTTPUNIT=/etc/systemd/system/multi-user.target.wants/apache2.service
+  grep -q mkdir /etc/init.d/mysql   || sed -i "/\<start)/amkdir -p /var/log/mysql"   /etc/init.d/mysql
+  grep -q mkdir /etc/init.d/apache2 || sed -i "/\<start)/amkdir -p /var/log/apache2" /etc/init.d/apache2
+  grep -q mkdir $HTTPUNIT           || sed -i "ExecStartPre=/bin/mkdir -p /var/log/apache2" $HTTPUNIT
+
+  grep -q vm.swappiness /etc/sysctl.conf || echo "vm.swappiness = 10" >> /etc/sysctl.conf && sysctl --load
+  echo "Logs in RAM. Reboot for changes to take effect"
+}
+
+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 72137e38..117d06e0 100755
--- a/nextcloud.sh
+++ b/nextcloud.sh
@@ -20,7 +20,7 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-VER=11.0.1
+VER=11.0.2
 ADMINUSER_=admin
 DBADMIN_=ncadmin
 DBPASSWD_=ownyourbits