Fix redis init.d scripts

config/index.html

@@ -23,7 +23,7 @@ font-family:"Microsoft YaHei",sans-serif;
 <br>
 <div align="center"><h2>Congratulations, OneinStack installed successfully!</h2></div>
 <h3><a href="https://oneinstack.com" target="_blank" class="links">OneinStack </a><a href="http://www.linuxeye.com/" target="_blank">Linux</a>+Nginx/Tengine+MySQL/MariaDB/Percona</br>+PHP+Pureftpd+phpMyAdmin+redis+memcached+jemalloc.</h3>
-<p><b>Check environment:&nbsp;&nbsp;</b><a href="/proberv.php" target="_blank" class="links">Proberv</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/ocp.php" target="_blank" class="links">Opcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a></p>
+<p><b>Check environment:&nbsp;&nbsp;</b><a href="/prober.php" target="_blank" class="links">Proberv</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/ocp.php" target="_blank" class="links">Opcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a></p>
 <p><b>Create Web virtual running script:</b>&nbsp;&nbsp;<font color="#008000">./vhost.sh</font></p>
 <p><b>Create FTP virtual running script:</b>&nbsp;&nbsp;<font color="#008000">./pureftpd_vhost.sh</font></p>
 <p><b>For feedback, questions, and to follow the progress of the project:&nbsp;&nbsp;</b> <a target="_blank" class="links" href="https://oneinstack.com">https://oneinstack.com</a></p>

include/demo.sh

@@ -19,8 +19,7 @@ DEMO() {
       unzip -q tz.zip -d ${wwwroot_dir}/default
     else
       src_url=http://mirrors.linuxeye.com/oneinstack/src/tz_e.zip && Download_src
-      unzip -q tz_e.zip -d ${wwwroot_dir}/default;/bin/mv ${wwwroot_dir}/default/{tz_e.php,proberv.php}
-      sed -i 's@https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js@http://lib.sinaapp.com/js/jquery/1.7/jquery.min.js@' ${wwwroot_dir}/default/proberv.php
+      unzip -q tz_e.zip -d ${wwwroot_dir}/default;/bin/mv ${wwwroot_dir}/default/{tz_e.php,prober.php}
     fi
 
     echo "<?php phpinfo() ?>" > ${wwwroot_dir}/default/phpinfo.php

include/redis.sh

@@ -22,7 +22,7 @@ Install_redis-server() {
     /bin/cp src/{redis-benchmark,redis-check-aof,redis-check-rdb,redis-cli,redis-sentinel,redis-server} ${redis_install_dir}/bin/
     /bin/cp redis.conf ${redis_install_dir}/etc/
     ln -s ${redis_install_dir}/bin/* /usr/local/bin/
-    sed -i 's@pidfile.*@pidfile /var/run/redis.pid@' ${redis_install_dir}/etc/redis.conf
+    sed -i 's@pidfile.*@pidfile /var/run/redis/redis.pid@' ${redis_install_dir}/etc/redis.conf
     sed -i "s@logfile.*@logfile ${redis_install_dir}/var/redis.log@" ${redis_install_dir}/etc/redis.conf
     sed -i "s@^dir.*@dir ${redis_install_dir}/var@" ${redis_install_dir}/etc/redis.conf
     sed -i 's@daemonize no@daemonize yes@' ${redis_install_dir}/etc/redis.conf

init.d/Memcached-init-CentOS

@@ -14,6 +14,8 @@ MAXCONN=1024
 CACHESIZE=256
 OPTIONS="-l 127.0.0.1"
 DAEMON=/usr/local/memcached/bin/memcached
+PIDFILE=/var/run/memcached/memcached.pid
+PIDDIR=`dirname $PIDFILE`
 
 if [ "$NETWORKING" = "no" ]
 then
@@ -25,12 +27,11 @@ prog="memcached"
 
 start () {
   echo -n $"Starting $prog: "
-  # insure that /var/run/memcached has proper permissions
-  mkdir -p /var/run/memcached
-  if [ "$(stat -c %U /var/run/memcached)" != "$USER" ]; then
-    chown $USER /var/run/memcached
+  # Make sure the default pidfile directory exists
+  if [ ! -d $PIDDIR ]; then
+    install -d -m 0755 -o $USER -g $USER $PIDDIR
   fi
-  daemon $DAEMON -d -p $PORT -u $USER  -m $CACHESIZE -c $MAXCONN -P /var/run/memcached/memcached.pid $OPTIONS
+  daemon $DAEMON -d -p $PORT -u $USER  -m $CACHESIZE -c $MAXCONN -P $PIDFILE $OPTIONS
   RETVAL=$?
   echo
   [ $RETVAL -eq 0 ] && touch /var/lock/subsys/memcached
@@ -42,7 +43,7 @@ stop () {
   echo
   if [ $RETVAL -eq 0 ] ; then
     rm -f /var/lock/subsys/memcached
-    rm -f /var/run/memcached/memcached.pid
+    rm -f $PIDFILE 
   fi
 }
 

init.d/Redis-server-init

@@ -16,7 +16,8 @@ DAEMON=/usr/local/redis/bin/redis-server
 DAEMON_ARGS=/usr/local/redis/etc/redis.conf
 NAME=redis-server
 DESC=redis-server
-PIDFILE=/var/run/redis.pid
+PIDFILE=/var/run/redis/redis.pid
+PIDDIR=`dirname $PIDFILE`
 
 test -x $DAEMON || exit 0
 test -x $DAEMONBOOTSTRAP || exit 0
@@ -26,8 +27,10 @@ set -e
 case "$1" in
   start)
     echo -n "Starting $DESC: "
-    touch $PIDFILE
-    chown redis:redis $PIDFILE
+    # Make sure the default pidfile directory exists
+    if [ ! -d $PIDDIR ]; then
+      install -d -m 0755 -o redis -g redis $PIDDIR
+    fi
     if start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid redis:redis --exec $DAEMON -- $DAEMON_ARGS
     then
       echo "[OK]"
@@ -43,7 +46,6 @@ case "$1" in
     else
       echo "failed"
     fi
-    rm -f $PIDFILE
     ;;
   status)
     if [ ! -r $PIDFILE ] ; then

versions.txt

@@ -26,7 +26,7 @@ mariadb101_version=10.1.29
 mariadb100_version=10.0.33
 mariadb55_version=5.5.58
 
-percona57_version=5.7.19-17
+percona57_version=5.7.20-18
 percona56_version=5.6.38-83.0
 percona55_version=5.5.58-38.10