From 58d356437b69749f6c0ce50c9e040c2b36dcedf2 Mon Sep 17 00:00:00 2001
From: joglomedia <eslabs.id@gmail.com>
Date: Fri, 4 Oct 2019 14:21:38 +0700
Subject: [PATCH] fix memcached unintended issue

---
 etc/memcached/memcache.conf    |  4 ++--
 etc/memcached/www-data.conf    |  4 ++--
 etc/systemd/memcached@.service |  6 +++---
 scripts/install_memcached.sh   | 22 ++++++++++++++++------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/etc/memcached/memcache.conf b/etc/memcached/memcache.conf
index 68434d0..ae0999c 100644
--- a/etc/memcached/memcache.conf
+++ b/etc/memcached/memcache.conf
@@ -9,7 +9,7 @@
 -d
 
 # Log memcached's output to /var/log/memcached
-logfile /var/log/memcached/memcache.log
+logfile /var/log/memcached_memcache.log
 
 # Be verbose
 # -v
@@ -47,4 +47,4 @@ logfile /var/log/memcached/memcache.log
 # -r
 
 # Use a pidfile
--P /var/run/memcached/memcache.pid
+-P /var/run/memcached_memcache.pid
diff --git a/etc/memcached/www-data.conf b/etc/memcached/www-data.conf
index 1c69275..a0d98c1 100644
--- a/etc/memcached/www-data.conf
+++ b/etc/memcached/www-data.conf
@@ -9,7 +9,7 @@
 -d
 
 # Log memcached's output to /var/log/memcached
-logfile /var/log/memcached/www-data.log
+logfile /var/log/memcached_www-data.log
 
 # Be verbose
 # -v
@@ -47,4 +47,4 @@ logfile /var/log/memcached/www-data.log
 # -r
 
 # Use a pidfile
--P /var/run/memcached/wwww-data.pid
+-P /var/run/memcached_wwww-data.pid
diff --git a/etc/systemd/memcached@.service b/etc/systemd/memcached@.service
index c3b487f..9e43fb4 100644
--- a/etc/systemd/memcached@.service
+++ b/etc/systemd/memcached@.service
@@ -8,14 +8,14 @@
 #     [Service]
 #     Environment=OPTIONS="-l 127.0.0.1,::1"
 
-
 [Unit]
 Description=memcached daemon for %i
 After=network.target
 Documentation=man:memcached(1)
 
 [Service]
-ExecStart=/usr/share/memcached/scripts/systemd-memcached-wrapper /etc/memcached/%i.conf
+#ExecStart=/usr/share/memcached/scripts/systemd-memcached-wrapper /etc/memcached_%i.conf
+ExecStart=/usr/share/memcached/scripts/start-memcached /etc/memcached_%i.conf /var/run/memcached_%i.pid
 
 # Set up a new file system namespace and mounts private /tmp and /var/tmp
 # directories so this service cannot access the global directories and
@@ -75,7 +75,7 @@ RestrictRealtime=true
 # Takes away the ability to create or manage any kind of namespace
 RestrictNamespaces=true
 
-PIDFile=/var/run/memcached/%i.pid
+PIDFile=/var/run/memcached_%i.pid
 
 # try to restart if errors encountered
 Restart=always
diff --git a/scripts/install_memcached.sh b/scripts/install_memcached.sh
index e42d3fa..8ec6ec9 100755
--- a/scripts/install_memcached.sh
+++ b/scripts/install_memcached.sh
@@ -163,8 +163,8 @@ EOL
                 # Otherwise, set Memcached to max of 2048GiB.
                 local MEMCACHED_SIZE=2048
             fi
-            run sed -i "s/-m 64/-m ${MEMCACHED_SIZE}/g" /etc/memcached/memcache.conf
-            run sed -i "s/-m 64/-m ${MEMCACHED_SIZE}/g" /etc/memcached/www-data.conf
+            run sed -i "s/-m 64/-m ${MEMCACHED_SIZE}/g" /etc/memcached_memcache.conf
+            run sed -i "s/-m 64/-m ${MEMCACHED_SIZE}/g" /etc/memcached_www-data.conf
         fi
 
         # Install PHP memcached module.
@@ -196,12 +196,22 @@ EOL
             warning "Memcached server installed in dryrun mode."
         else
             if [[ $(pgrep -c memcached) -gt 0 ]]; then
-                run service memcached@memcache restart
-                run service memcached@www-data restart
+                #run service memcached@memcache restart
+                #run service memcached@www-data restart
+                run /usr/share/memcached/scripts/start-memcached \
+                    /etc/memcached_memcache.conf /var/run/memcached_memcache.pid
+                run /usr/share/memcached/scripts/start-memcached \
+                    /etc/memcached_www-data.conf /var/run/memcached_www-data.pid
+
                 status "Memcached server restarted successfully."
             elif [[ -n $(command -v memcached) ]]; then
-                run service memcached@memcache start
-                run service memcached@www-data start
+                #run service memcached@memcache start
+                #run service memcached@www-data start
+                run /usr/share/memcached/scripts/start-memcached \
+                    /etc/memcached_memcache.conf /var/run/memcached_memcache.pid
+                run /usr/share/memcached/scripts/start-memcached \
+                    /etc/memcached_www-data.conf /var/run/memcached_www-data.pid
+
                 sleep 1
 
                 if [[ $(pgrep -c memcached) -gt 0 ]]; then