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

[glen]

Author: glen                         Date: Mon May 17 16:14:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add defaults file

---- Files affected:
packages/mysql-proxy:
   mysql-proxy.init (1.12 -> 1.13) , mysql-proxy.spec (1.22 -> 1.23) , mysql-proxy.sysconfig (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/mysql-proxy/mysql-proxy.init
diff -u packages/mysql-proxy/mysql-proxy.init:1.12 packages/mysql-proxy/mysql-proxy.init:1.13
--- packages/mysql-proxy/mysql-proxy.init:1.12	Mon May 17 15:56:44 2010
+++ packages/mysql-proxy/mysql-proxy.init	Mon May 17 18:14:37 2010
@@ -17,6 +17,7 @@
 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
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/mysql-proxy ] && . /etc/sysconfig/mysql-proxy
@@ -40,6 +41,8 @@
 
 	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

================================================================
Index: packages/mysql-proxy/mysql-proxy.spec
diff -u packages/mysql-proxy/mysql-proxy.spec:1.22 packages/mysql-proxy/mysql-proxy.spec:1.23
--- packages/mysql-proxy/mysql-proxy.spec:1.22	Mon May 17 16:07:27 2010
+++ packages/mysql-proxy/mysql-proxy.spec	Mon May 17 18:14:37 2010
@@ -17,13 +17,14 @@
 Summary(pl.UTF-8):	Proxy MySQL
 Name:		mysql-proxy
 Version:	0.8.0
-Release:	0.4
+Release:	0.7
 License:	GPL
 Group:		Applications/Networking
 Source0:	http://launchpad.net/mysql-proxy/0.8/%{version}/+download/%{name}-%{version}.tar.gz
 # Source0-md5:	b6a9748d72e8db7fe3789fbdd60ff451
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source3:	%{name}.conf
 URL:		http://forge.mysql.com/wiki/MySQL_Proxy
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -97,9 +98,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_sysconfdir}/%{name}}
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 
 # daemon in sbindir
 install -d $RPM_BUILD_ROOT%{_sbindir}
@@ -141,6 +143,8 @@
 %doc AUTHORS NEWS README* ChangeLog
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%dir %attr(750,root,root) %{_sysconfdir}/%{name}
+%config(noreplace) %attr(640,root,root) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
 %attr(755,root,root) %{_sbindir}/mysql-proxy
 # ??? tools?
 %attr(755,root,root) %{_bindir}/mysql-binlog-dump
@@ -193,6 +197,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/05/17 16:14:37  glen
+- add defaults file
+
 Revision 1.22  2010/05/17 14:07:27  glen
 - no need for own run dir as daemonizing done by daemon itself
 

================================================================
Index: packages/mysql-proxy/mysql-proxy.sysconfig
diff -u packages/mysql-proxy/mysql-proxy.sysconfig:1.6 packages/mysql-proxy/mysql-proxy.sysconfig:1.7
--- packages/mysql-proxy/mysql-proxy.sysconfig:1.6	Mon May 17 15:56:26 2010
+++ packages/mysql-proxy/mysql-proxy.sysconfig	Mon May 17 18:14:37 2010
@@ -14,6 +14,9 @@
 # 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
+
 # System user to switch
 #PROXY_USER="mysqlproxy"
 
================================================================

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