Include a config file for easier usage of mysql-proxy. Upstream moved the binary as well, so update init.d to reflect new /usr/bin/ location.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 124 insertions, 3 deletions

diff --git a/dev-db/mysql-proxy/ChangeLog b/dev-db/mysql-proxy/ChangeLog
index b7f07101a3bb..5871311bf323 100644
--- a/dev-db/mysql-proxy/ChangeLog
+++ b/dev-db/mysql-proxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql-proxy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.6 2010/05/14 10:34:29 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.7 2010/05/29 20:45:04 robbat2 Exp $
+
+*mysql-proxy-0.8.0-r1 (29 May 2010)
+
+  29 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mysql-proxy.confd-0.8.0-r1, +mysql-proxy-0.8.0-r1.ebuild,
+  +files/mysql-proxy.cnf, files/mysql-proxy.initd:
+  Include a config file for easier usage of mysql-proxy. Upstream moved the
+  binary as well, so update init.d to reflect new /usr/bin/ location.
 
 *mysql-proxy-0.8.0 (14 May 2010)
 
diff --git a/dev-db/mysql-proxy/files/mysql-proxy.cnf b/dev-db/mysql-proxy/files/mysql-proxy.cnf
new file mode 100644
index 000000000000..785b58c69e29
--- /dev/null
+++ b/dev-db/mysql-proxy/files/mysql-proxy.cnf
@@ -0,0 +1,47 @@
+# MySQL Proxy's configuration file (mysql-proxy.cnf)
+# This file must be 0660 or more restrictive
+# otherwise mysql-proxy will refuse to load
+[mysql-proxy]
+#basedir = ...
+#daemon = true
+#defaults-file = ...
+#event-threads = ...
+keepalive = true
+log-backtrace-on-crash = true
+log-file = /var/log/mysql/mysql-proxy.log
+log-level = warning
+log-use-syslog = true
+#lua-cpath = ...
+#lua-path = ...
+#max-open-files = ...
+pid-file = /var/run/mysql-proxy.pid
+#plugin-dir = ...
+#plugins = admin,proxy,debug,replicant
+#plugins = admin,proxy
+plugins = proxy
+#user = ...
+
+# module: admin
+admin-address = 127.0.0.1:4041
+#admin-lua-script = ...
+#admin-password = ...
+#admin-username = ...
+
+# module: proxy
+#no-proxy = false
+proxy-address = 127.0.0.1:4040
+proxy-backend-addresses = 127.0.0.1:3306
+proxy-fix-bug-25371 = false
+#proxy-lua-script = ...
+#proxy-pool-no-change-user = ...
+#proxy-read-only-backend-addresses = ...
+proxy-skip-profiling = false
+
+# module: replicant
+#replicant-master-address = ...
+#replicant-username = ...
+#replicant-password = ...
+#replicant-read-binlogs = ...
+
+# module: debug
+debug-address = 127.0.0.1:4043
diff --git a/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1 b/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1
new file mode 100644
index 000000000000..8b86431a3d8f
--- /dev/null
+++ b/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1
@@ -0,0 +1,12 @@
+# /etc/conf.d/mysql-proxy: config file for /etc/init.d/mysql-proxy
+
+# location of pidfile
+PIDFILE="/var/run/mysql-proxy.pid"
+
+# general options for mysql-proxy
+# do NOT specify --daemon or --pid-file=... here!
+OPTS="--defaults-file=/etc/mysql/mysql-proxy.cnf"
+
+# if you want mysql-proxy to depend on mysql, enable this:
+#RC_NEED="mysql" # baselayout-1
+#rc_need="mysql" # baselayout-2/OpenRC
diff --git a/dev-db/mysql-proxy/files/mysql-proxy.initd b/dev-db/mysql-proxy/files/mysql-proxy.initd
index d9f37628ff23..ba4e2aedfbd0 100755
--- a/dev-db/mysql-proxy/files/mysql-proxy.initd
+++ b/dev-db/mysql-proxy/files/mysql-proxy.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/files/mysql-proxy.initd,v 1.1 2009/11/21 13:52:45 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/files/mysql-proxy.initd,v 1.2 2010/05/29 20:45:04 robbat2 Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting MySQL Proxy"
 	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/mysql-proxy \
+		--exec /usr/bin/mysql-proxy \
 		-- --daemon --pid-file="${PIDFILE}" ${OPTS}
 	eend $?
 }
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..365c7d6404bc
--- /dev/null
+++ b/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild,v 1.1 2010/05/29 20:45:04 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="A Proxy for the MySQL Client/Server protocol"
+HOMEPAGE="http://forge.mysql.com/wiki/MySQL_Proxy"
+SRC_URI="mirror://mysql/Downloads/MySQL-Proxy/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+RDEPEND=">=dev-libs/libevent-1.4
+	>=dev-libs/glib-2.16
+	>=dev-lang/lua-5.1"
+DEPEND="${RDEPEND}
+	>=virtual/mysql-5.0
+	dev-util/pkgconfig"
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		--includedir=/usr/include/${PN} \
+		--with-mysql \
+		--with-lua \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd-0.8.0-r1 ${PN} || die
+	dodoc ChangeLog NEWS README
+	if useq examples; then
+		docinto examples
+		dodoc examples/*.lua || die
+		dodoc lib/*.lua || die
+	fi
+	# mysql-proxy will refuse to start unless the config file is at most 0660.
+	insinto /etc/mysql
+	insopts -m0660
+	doins "${FILESDIR}"/${PN}.cnf || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You might want to have a look at"
+	einfo "http://dev.mysql.com/tech-resources/articles/proxy-gettingstarted.html"
+	einfo "on how to get started with MySQL Proxy."
+	einfo
+}