From 1830d774d17ff25b3230ac3932fc779b857bfb86 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sun, 18 Mar 2018 21:12:23 +0100
Subject: nc-ramlogs: fix enabled by default upon installoation

---
 changelog.md                           | 6 ++++--
 etc/nextcloudpi-config.d/nc-ramlogs.sh | 1 +
 update.sh                              | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index b60d47ea..26a63e9c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
 
-[v0.53.3](https://github.com/nextcloud/nextcloudpi/commit/ad4686d) (2018-03-17) docker: fix development container script folder
+[v0.53.4](https://github.com/nextcloud/nextcloudpi/commit/2e5443e) (2018-03-18) nc-ramlogs: fix enabled by default upon installoation
 
-[v0.53.2 ](https://github.com/nextcloud/nextcloudpi/commit/96fa0f5) (2018-03-17) letsencrypt: remove .well-known dir after renewal
+[v0.53.3 ](https://github.com/nextcloud/nextcloudpi/commit/2f7aa40) (2018-03-17) docker: fix development container script folder
+
+[v0.53.2 ](https://github.com/nextcloud/nextcloudpi/commit/a72190a) (2018-03-17) letsencrypt: remove .well-known dir after renewal
 
 [v0.53.1 ](https://github.com/nextcloud/nextcloudpi/commit/d8ad80c) (2018-03-17) fix web update to NC13.0.1 with .well-known existence
 
diff --git a/etc/nextcloudpi-config.d/nc-ramlogs.sh b/etc/nextcloudpi-config.d/nc-ramlogs.sh
index 3cf2a285..18a68fd8 100644
--- a/etc/nextcloudpi-config.d/nc-ramlogs.sh
+++ b/etc/nextcloudpi-config.d/nc-ramlogs.sh
@@ -25,6 +25,7 @@ install()
   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 enable log2ram/d' install.sh
   chmod +x install.sh && sudo ./install.sh
   cd ..
   rm -r log2ram-master log2ram.tar.gz
diff --git a/update.sh b/update.sh
index 920918b9..c34d414f 100755
--- a/update.sh
+++ b/update.sh
@@ -265,6 +265,11 @@ EOF
     chmod +x /etc/cron.weekly/letsencrypt-ncp
   }
 
+    # disable ramlogs if accidentally enabled
+    grep -q '^ACTIVE_=yes$' "$CONFDIR"/nc-ramlogs.sh || {
+      systemctl disable log2ram
+      systemctl stop    log2ram
+    }
 } # end - only live updates
 
 exit 0
-- 
cgit v1.2.3