Changes - j0ke.net Open Build Service

Changes of Revision 17

[-] [+]	Changed	mysql-proxy.spec
@@ -7,6 +7,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig +Source3: %{name}.cnf PreReq: /usr/sbin/useradd /usr/sbin/groupadd %{?insserv_prereq:%insserv_prereq} %{?fillup_prereq:%fillup_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -33,7 +34,8 @@ %package devel Group: Applications/Databases -Summary: mysql-proxy devel package +Summary: Development package for mysql-proxy +Requires: glib2-devel libevent-devel lua-devel glibc-devel mysql-proxy = %{version} %description devel MySQL Proxy devel libs @@ -55,7 +57,8 @@ ln -sv ../../etc/init.d/%{name} %{buildroot}/%{_sbindir}/rc%{name} install -D -m 0644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.mysql-proxy sed -i s@"%LIB%"@"%{_lib}"@g %{buildroot}/var/adm/fillup-templates/sysconfig.mysql-proxy -rm -fv %{buildroot}%{_datadir}/.lua +install -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/%{name}.cnf +cp lib/.lua %{buildroot}%{_libdir}/mysql-proxy/lua/ rm -fv examples/Makefile* rm -fv examples/CMakeLists.txt rm -f %{buildroot}%{_libdir}/mysql-proxy/lua/.la @@ -86,6 +89,7 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING README NEWS %doc examples/ +%config(noreplace) %{_sysconfdir}/%{name}.cnf %{_sbindir}/rc%{name} /etc/init.d/%{name} %{_bindir}/%{name} @@ -100,6 +104,19 @@ %dir %{_libdir}/mysql-proxy/lua/proxy %dir %{_libdir}/mysql-proxy/plugins %{_libdir}/mysql-proxy/lua/admin.lua +%{_libdir}/mysql-proxy/lua/active-queries.lua +%{_libdir}/mysql-proxy/lua/active-transactions.lua +%{_libdir}/mysql-proxy/lua/admin.lua +%{_libdir}/mysql-proxy/lua/admin-sql.lua +%{_libdir}/mysql-proxy/lua/analyze-query.lua +%{_libdir}/mysql-proxy/lua/auditing.lua +%{_libdir}/mysql-proxy/lua/commit-obfuscator.lua +%{_libdir}/mysql-proxy/lua/histogram.lua +%{_libdir}/mysql-proxy/lua/load-multi.lua +%{_libdir}/mysql-proxy/lua/ro-balance.lua +%{_libdir}/mysql-proxy/lua/ro-pooling.lua +%{_libdir}/mysql-proxy/lua/rw-splitting.lua +%{_libdir}/mysql-proxy/lua/xtab.lua %{_libdir}/mysql-proxy/lua/chassis.so %{_libdir}/mysql-proxy/lua/glib2.so %{_libdir}/mysql-proxy/lua/lfs.so x 1 @@ -7,6 +7,7 @@ 2 Source0: %{name}-%{version}.tar.bz2 3 Source1: %{name}.init 4 Source2: %{name}.sysconfig 5 +Source3: %{name}.cnf 6 PreReq: /usr/sbin/useradd /usr/sbin/groupadd %{?insserv_prereq:%insserv_prereq} %{?fillup_prereq:%fillup_prereq} 7 BuildRoot: %{_tmppath}/%{name}-%{version}-root 8 9 @@ -33,7 +34,8 @@ 10 11 %package devel 12 Group: Applications/Databases 13 -Summary: mysql-proxy devel package 14 +Summary: Development package for mysql-proxy 15 +Requires: glib2-devel libevent-devel lua-devel glibc-devel mysql-proxy = %{version} 16 17 %description devel 18 MySQL Proxy devel libs 19 @@ -55,7 +57,8 @@ 20 ln -sv ../../etc/init.d/%{name} %{buildroot}/%{_sbindir}/rc%{name} 21 install -D -m 0644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.mysql-proxy 22 sed -i s@"%LIB%"@"%{_lib}"@g %{buildroot}/var/adm/fillup-templates/sysconfig.mysql-proxy 23 -rm -fv %{buildroot}%{_datadir}/.lua 24 +install -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/%{name}.cnf 25 +cp lib/.lua %{buildroot}%{_libdir}/mysql-proxy/lua/ 26 rm -fv examples/Makefile 27 rm -fv examples/CMakeLists.txt 28 rm -f %{buildroot}%{_libdir}/mysql-proxy/lua/*.la 29 @@ -86,6 +89,7 @@ 30 %defattr(-,root,root,-) 31 %doc AUTHORS COPYING README NEWS 32 %doc examples/ 33 +%config(noreplace) %{_sysconfdir}/%{name}.cnf 34 %{_sbindir}/rc%{name} 35 /etc/init.d/%{name} 36 %{_bindir}/%{name} 37 @@ -100,6 +104,19 @@ 38 %dir %{_libdir}/mysql-proxy/lua/proxy 39 %dir %{_libdir}/mysql-proxy/plugins 40 %{_libdir}/mysql-proxy/lua/admin.lua 41 +%{_libdir}/mysql-proxy/lua/active-queries.lua 42 +%{_libdir}/mysql-proxy/lua/active-transactions.lua 43 +%{_libdir}/mysql-proxy/lua/admin.lua 44 +%{_libdir}/mysql-proxy/lua/admin-sql.lua 45 +%{_libdir}/mysql-proxy/lua/analyze-query.lua 46 +%{_libdir}/mysql-proxy/lua/auditing.lua 47 +%{_libdir}/mysql-proxy/lua/commit-obfuscator.lua 48 +%{_libdir}/mysql-proxy/lua/histogram.lua 49 +%{_libdir}/mysql-proxy/lua/load-multi.lua 50 +%{_libdir}/mysql-proxy/lua/ro-balance.lua 51 +%{_libdir}/mysql-proxy/lua/ro-pooling.lua 52 +%{_libdir}/mysql-proxy/lua/rw-splitting.lua 53 +%{_libdir}/mysql-proxy/lua/xtab.lua 54 %{_libdir}/mysql-proxy/lua/chassis.so 55 %{_libdir}/mysql-proxy/lua/glib2.so 56 %{_libdir}/mysql-proxy/lua/lfs.so 57
[-] [+]	Added	mysql-proxy.cnf ^
@@ -0,0 +1,14 @@ +[mysql-proxy] +proxy-skip-profiling +proxy-fix-bug-25371 + +admin-address = localhost:4041 +admin-username = root +admin-password = pr0xYp455 + +proxy-address = localhost:3310 +proxy-backend-addresses = localhost:3306 +proxy-read-only-backend-addresses = localhost:3307,localhost:3308 + +log-file=/var/log/mysql/mysql-proxy.log +log-level = message
[-] [+]	Changed	mysql-proxy.sysconfig ^
@@ -8,7 +8,7 @@ # Command line arguments to hand over to mysql-proxy # Normally: --daemon (run as background daemon) # -MYSQL_PROXY_ARGS="--plugin-dir=/usr/%LIB%/mysql-proxy/plugins --proxy-lua-script /usr/share/doc/packages/mysql-proxy/examples/tutorial-basic.lua" +MYSQL_PROXY_ARGS="--defaults-file=/etc/mysql-proxy.cnf --plugin-dir=/usr/%LIB%/mysql-proxy/plugins --proxy-lua-script /usr/share/doc/packages/mysql-proxy/examples/tutorial-basic.lua" ## Type: string ## Default: "/var/run/mysql-proxy.pid"