packages: mysql-proxy/mysql-proxy.init, mysql-proxy/mysql-proxy.sysconfig -...

[glen]

Author: glen                         Date: Mon May 17 17:09:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move shell file config to mysql-proxy.conf keep only essental

---- Files affected:
packages/mysql-proxy:
   mysql-proxy.init (1.13 -> 1.14) , mysql-proxy.sysconfig (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/mysql-proxy/mysql-proxy.init
diff -u packages/mysql-proxy/mysql-proxy.init:1.13 packages/mysql-proxy/mysql-proxy.init:1.14
--- packages/mysql-proxy/mysql-proxy.init:1.13	Mon May 17 18:14:37 2010
+++ packages/mysql-proxy/mysql-proxy.init	Mon May 17 19:09:30 2010
@@ -15,9 +15,8 @@
 . /etc/sysconfig/network
 
 PROXY_USER="mysqlproxy"
-PROXY_LOG_OPTIONS="--log-level=info --log-use-syslog"
 PROXY_PID="/var/run/mysql-proxy.pid"
-PROXY_DEFAULTS_FILE=/etc/mysql-proxy/mysql-proxy.conf
+PROXY_DEFAULTS_FILE="/etc/mysql-proxy/mysql-proxy.conf"
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/mysql-proxy ] && . /etc/sysconfig/mysql-proxy
@@ -40,26 +39,7 @@
 	fi
 
 	msg_starting "MySQL Proxy"
-	local args="--daemon --user $PROXY_USER --pid-file $PROXY_PID $PROXY_LOG_OPTIONS"
-	args="$args --defaults-file $PROXY_DEFAULTS_FILE"
-
-	if [ "$LUA_SCRIPT" ]; then
-		args="$args --proxy-lua-script=$LUA_SCRIPT"
-	fi
-	for addr in $PROXY_READ_ONLY_BACKEND_ADDRESSES; do
-		args="$args --proxy-read-only-backend-addresses=$addr"
-	done
-	for addr in $PROXY_BACKEND_ADDRESSES; do
-		args="$args --proxy-backend-addresses=$addr"
-	done
-	if [ "$PROXY_ADDRESS" ]; then
-		args="$args --proxy-address=$PROXY_ADDRESS"
-	fi
-	if [ "$ADMIN_ADDRESS" ]; then
-		args="$args --admin-address=$ADMIN_ADDRESS"
-	fi
-
-	daemon /usr/sbin/mysql-proxy $args
+	daemon /usr/sbin/mysql-proxy --daemon --user $PROXY_USER --pid-file $PROXY_PID --defaults-file $PROXY_DEFAULTS_FILE $PROXY_OPTIONS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-proxy
 }

================================================================
Index: packages/mysql-proxy/mysql-proxy.sysconfig
diff -u packages/mysql-proxy/mysql-proxy.sysconfig:1.7 packages/mysql-proxy/mysql-proxy.sysconfig:1.8
--- packages/mysql-proxy/mysql-proxy.sysconfig:1.7	Mon May 17 18:14:37 2010
+++ packages/mysql-proxy/mysql-proxy.sysconfig	Mon May 17 19:09:30 2010
@@ -1,27 +1,11 @@
 # MySQL Proxy configuration
-
-# Filename of the LUA script.
-# default: not set
-#LUA_SCRIPT="/usr/share/mysql-proxy/active-queries.lua"
-
-# Backend addresses to use in form of IP:PORT.
-# default: 127.0.0.1:3306
-#PROXY_BACKEND_ADDRESSES="10.134.121.181:3306 10.134.121.156:3306"
-
-# Slave-server address
-#PROXY_READ_ONLY_BACKEND_ADDRESSES="10.134.121.181:3306 10.134.121.156:3306"
-
-# Listening address (default: :4040)
-#PROXY_ADDRESS="0.0.0.0:4040"
-
-# Config for defaults, i.e --defaults-file parameter
-#PROXY_DEFAULTS_FILE=/etc/mysql-proxy/mysql-proxy.conf
+# More configuration can be tuned in defaults file.
 
 # System user to switch
 #PROXY_USER="mysqlproxy"
 
-# Log options
-#PROXY_LOG_OPTIONS="--log-level=info --log-use-syslog"
+# Config for defaults, i.e --defaults-file parameter
+#PROXY_DEFAULTS_FILE=/etc/mysql-proxy/mysql-proxy.conf
 
-# Listening address for internal admin-server (default: :4041)
-#ADMIN_ADDRESS="10.1.1.1:4041"
+# Additional options passed to daemon regardless of defaults file values.
+#PROXY_OPTIONS=""
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-proxy/mysql-proxy.init?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-proxy/mysql-proxy.sysconfig?r1=1.7&r2=1.8&f=u