[gentoo-commits] gentoo-x86 commit in net-misc/memcached/files: memcached.confd memcached.init

[Lars Wendler (polynomial-c)]

polynomial-c    13/12/24 09:18:43

  Modified:             memcached.confd memcached.init
  Log:
  Fixed line ending of new init.d and conf.d files (bug #495192)
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.2                  net-misc/memcached/files/memcached.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/memcached/files/memcached.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/memcached/files/memcached.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/memcached/files/memcached.confd?r1=1.1&r2=1.2

Index: memcached.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/memcached/files/memcached.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memcached.confd	23 Dec 2013 00:56:17 -0000	1.1
+++ memcached.confd	24 Dec 2013 09:18:42 -0000	1.2
@@ -1,40 +1,40 @@
-# memcached config file
-
-MEMCACHED_BINARY="/usr/bin/memcached"
-
-# Specify memory usage in megabytes (do not use letters)
-# 64MB is default
-MEMUSAGE="64"
-
-# User to run as
-MEMCACHED_RUNAS="memcached"
-
-# Specify maximum number of concurrent connections
-# 1024 is default
-MAXCONN="1024"
-
-# Listen for connections on what address?
-# If this is empty, memcached will listen on 0.0.0.0
-# be sure you have a firewall in place!
-LISTENON=""
-
-# Listen for connections on what port?
-PORT="11211"
-
-# Listen for UDP connecitons on what port? 0 means turn off UDP
-UDPPORT="${PORT}"
-
-# PID file location
-# '-${PORT}.${CONF}.pid' will be appended to this!
-# You do not normally need to change this.
-PIDBASE="/var/run/memcached/memcached"
-
-# Socket to listen on
-#SOCKET="/var/run/memcached/memcached.sock"
-
-# Socket mask
-# 0700 is default
-#SOCKET_MASK="0700"
-
-# Other Options
-MISC_OPTS=""
+# memcached config file
+
+MEMCACHED_BINARY="/usr/bin/memcached"
+
+# Specify memory usage in megabytes (do not use letters)
+# 64MB is default
+MEMUSAGE="64"
+
+# User to run as
+MEMCACHED_RUNAS="memcached"
+
+# Specify maximum number of concurrent connections
+# 1024 is default
+MAXCONN="1024"
+
+# Listen for connections on what address?
+# If this is empty, memcached will listen on 0.0.0.0
+# be sure you have a firewall in place!
+LISTENON=""
+
+# Listen for connections on what port?
+PORT="11211"
+
+# Listen for UDP connecitons on what port? 0 means turn off UDP
+UDPPORT="${PORT}"
+
+# PID file location
+# '-${PORT}.${CONF}.pid' will be appended to this!
+# You do not normally need to change this.
+PIDBASE="/var/run/memcached/memcached"
+
+# Socket to listen on
+#SOCKET="/var/run/memcached/memcached.sock"
+
+# Socket mask
+# 0700 is default
+#SOCKET_MASK="0700"
+
+# Other Options
+MISC_OPTS=""



1.2                  net-misc/memcached/files/memcached.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/memcached/files/memcached.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/memcached/files/memcached.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/memcached/files/memcached.init?r1=1.1&r2=1.2

Index: memcached.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/memcached/files/memcached.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memcached.init	23 Dec 2013 00:56:17 -0000	1.1
+++ memcached.init	24 Dec 2013 09:18:43 -0000	1.2
@@ -1,93 +1,93 @@
-#!/sbin/runscript
-
-CONF="${SVCNAME#*.}"
-CONFBASE="/etc/conf.d/memcached"
-
-[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached"
-[ "${CONF}" == "memcached" ] && CONF=''
-
-if [ -n "${CONF}" ]; then
-    PIDFILE="${PIDBASE}.${CONF}.pid"
-    CONFSRC="${CONFBASE}.${CONF}"
-    if [ -f "${CONFSRC}" ]; then
-        source "${CONFSRC}"
-    else
-        eerror "The configuration file $CONFSRC was not found!"
-    fi
-else
-    PIDFILE="${PIDBASE}.pid"
-    CONFSRC="${CONFBASE}"
-fi
-
-depend() {
-    if [ -z "${SOCKET}" ]; then
-        need net
-    fi
-    # per bug #269022, accurate time is important for memcached!
-    # We include the full list of ways it might be set on boot.
-    after ntp-client ntpd rdate openrdate adjtimex hwclock
-}
-
-checkconfig() {
-    if [ -z "${LISTENON}" ] && [ -z "${SOCKET}" ]; then
-        ewarn "You should edit $CONFSRC and specify an address or socket to listen on."
-        ewarn "Listening on any address (check your firewall!)"
-    fi
-}
-
-start() {
-    if [ -n "${CONF}" ]; then
-        ebegin "Starting memcached (${CONF})"
-    else
-        ebegin "Starting memcached"
-    fi
-    checkconfig
-    local dir="$(dirname ${PIDFILE})"
-    if [ ! -d "${dir}" ]; then
-        einfo " Creating ${dir}"
-        mkdir -p "${dir}"
-    fi
-
-    chown ${MEMCACHED_RUNAS} "${dir}"
-    if [ -f "${PIDFILE}" ]; then
-        einfo "  Removing stale pidfile ${PIDFILE}"
-        rm -f "${PIDFILE}" 1>/dev/null
-    fi
-
-        
-    if [ -n "${SOCKET}" ]; then
-        CONNECTION="-s ${SOCKET}"
-
-        if [ -n "${SOCKET_MASK}" ]; then
-            CONNECTION="${CONNECTION} -a ${SOCKET_MASK}"
-        fi
-    else
-        CONNECTION="-p ${PORT} -U ${UDPPORT}"
-
-        if [ -n "${LISTENON}" ]; then
-            CONNECTION="${CONNECTION} -l ${LISTENON}"
-        fi
-    fi
-
-    /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
-        --exec "${MEMCACHED_BINARY}" -- \
-        -d ${CONNECTION} -m ${MEMUSAGE}  \
-        -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
-        ${MISC_OPTS}
-
-    eend $?
-}
-
-stop() {
-    if [ -n "${CONF}" ]; then
-        ebegin "Stopping memcached (${CONF})"
-    else
-        ebegin "Stopping memcached"
-    fi
-
-    start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-
-    rm -f "${PIDFILE}"
-
-    eend $?
-}
+#!/sbin/runscript
+
+CONF="${SVCNAME#*.}"
+CONFBASE="/etc/conf.d/memcached"
+
+[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached"
+[ "${CONF}" == "memcached" ] && CONF=''
+
+if [ -n "${CONF}" ]; then
+    PIDFILE="${PIDBASE}.${CONF}.pid"
+    CONFSRC="${CONFBASE}.${CONF}"
+    if [ -f "${CONFSRC}" ]; then
+        source "${CONFSRC}"
+    else
+        eerror "The configuration file $CONFSRC was not found!"
+    fi
+else
+    PIDFILE="${PIDBASE}.pid"
+    CONFSRC="${CONFBASE}"
+fi
+
+depend() {
+    if [ -z "${SOCKET}" ]; then
+        need net
+    fi
+    # per bug #269022, accurate time is important for memcached!
+    # We include the full list of ways it might be set on boot.
+    after ntp-client ntpd rdate openrdate adjtimex hwclock
+}
+
+checkconfig() {
+    if [ -z "${LISTENON}" ] && [ -z "${SOCKET}" ]; then
+        ewarn "You should edit $CONFSRC and specify an address or socket to listen on."
+        ewarn "Listening on any address (check your firewall!)"
+    fi
+}
+
+start() {
+    if [ -n "${CONF}" ]; then
+        ebegin "Starting memcached (${CONF})"
+    else
+        ebegin "Starting memcached"
+    fi
+    checkconfig
+    local dir="$(dirname ${PIDFILE})"
+    if [ ! -d "${dir}" ]; then
+        einfo " Creating ${dir}"
+        mkdir -p "${dir}"
+    fi
+
+    chown ${MEMCACHED_RUNAS} "${dir}"
+    if [ -f "${PIDFILE}" ]; then
+        einfo "  Removing stale pidfile ${PIDFILE}"
+        rm -f "${PIDFILE}" 1>/dev/null
+    fi
+
+        
+    if [ -n "${SOCKET}" ]; then
+        CONNECTION="-s ${SOCKET}"
+
+        if [ -n "${SOCKET_MASK}" ]; then
+            CONNECTION="${CONNECTION} -a ${SOCKET_MASK}"
+        fi
+    else
+        CONNECTION="-p ${PORT} -U ${UDPPORT}"
+
+        if [ -n "${LISTENON}" ]; then
+            CONNECTION="${CONNECTION} -l ${LISTENON}"
+        fi
+    fi
+
+    /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
+        --exec "${MEMCACHED_BINARY}" -- \
+        -d ${CONNECTION} -m ${MEMUSAGE}  \
+        -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
+        ${MISC_OPTS}
+
+    eend $?
+}
+
+stop() {
+    if [ -n "${CONF}" ]; then
+        ebegin "Stopping memcached (${CONF})"
+    else
+        ebegin "Stopping memcached"
+    fi
+
+    start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+
+    rm -f "${PIDFILE}"
+
+    eend $?
+}