From 1c3a2e4d542215058eae4d804f863143c43d5ff7 Mon Sep 17 00:00:00 2001 From: randomdan Date: Wed, 27 Oct 2010 08:57:18 +0000 Subject: Write logs to syslog by default --- dev-db/slony1/Manifest | 8 ++--- dev-db/slony1/files/slony1.conf | 3 +- dev-db/slony1/files/slony1.init | 2 +- dev-db/slony1/files/slony1.logrotate | 8 +++++ dev-db/slony1/files/slony1_remove_jave.patch | 50 ---------------------------- dev-db/slony1/slony1-2.0.5-r1.ebuild | 46 +++++++++++++++++++++++++ dev-db/slony1/slony1-2.0.5.ebuild | 44 ------------------------ 7 files changed, 60 insertions(+), 101 deletions(-) create mode 100644 dev-db/slony1/files/slony1.logrotate delete mode 100644 dev-db/slony1/files/slony1_remove_jave.patch create mode 100644 dev-db/slony1/slony1-2.0.5-r1.ebuild delete mode 100644 dev-db/slony1/slony1-2.0.5.ebuild diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest index acffded..0ca6024 100644 --- a/dev-db/slony1/Manifest +++ b/dev-db/slony1/Manifest @@ -1,7 +1,7 @@ -AUX slony1.conf 355 RMD160 179bcde2acbe09e96118058444087f8fc1dad0dd SHA1 9490aabdc897568e5898a6fd0dffaa602a4a38ac SHA256 f722568539e1dbb3a86aa65a2c44582780841823dbc6957ff9861a48ec38a0e3 -AUX slony1.init 720 RMD160 c906625e844bafe8e5bdd87d7348f56cdb03181d SHA1 0eb3b399da339b6cb2301f6de7db956c310aa15d SHA256 e25c1e302d6e578c56ae88a7c24cdb1042f7dc986f00565b5e7d933d8224e08a -AUX slony1_remove_jave.patch 1431 RMD160 8533996992fe6ab806b5f06dce013362187eafd0 SHA1 e1d2e5a21352f83397fc9563f83ffef11d2c42a5 SHA256 11db488c15e155893c784520f2ec0bf23c56d2af84b230848d6890b951d15976 +AUX slony1.conf 311 RMD160 73c129473392ab5e0daaae0d80475b6dcd4e3727 SHA1 75d5a97a1207a1755cee717518f1f9bf33250b48 SHA256 18ecdf98733d5074f840e63dc00eae7a7cf9a909185b3a2d9f97aecd4a502677 +AUX slony1.init 727 RMD160 bb42edd46c021da2c06ab87e956dd7fd45b074d7 SHA1 b7d34bae0094d72861b6bf2dfdb3e610476acf07 SHA256 54e8c7dcc75beac01791c45f480452a3b3abebc20f50849b82a4714bffa310f5 +AUX slony1.logrotate 143 RMD160 69be266c37aee891112dfe0cc7d7231f0db41101 SHA1 d231d63b69319269a3b5cc9839e741bffb5d89d6 SHA256 05d08a06816c65d300ddfdd461052e106aa8a37a14f32fb89a2b8a53ca5878c1 DIST slony1-2.0.5.tar.bz2 965640 RMD160 7235658277ab8a7ed0ee722d52f33e766534f18b SHA1 cc285c8d5659d2389caef281829f6110fe74a392 SHA256 4f382447a399966caf0dec94da208d6435fdc4d6341784f0e32468efa5f4a369 -EBUILD slony1-2.0.5.ebuild 1236 RMD160 9eef0b1863b2a86ff9c66ad6b5c8ca7111f48590 SHA1 692ddd43572923d3e120c7e726a436e344dc4fad SHA256 3bb97184ddc64ce19b2393206c825dd08e6c145cd78e125f82b11c1fa6344a8a +EBUILD slony1-2.0.5-r1.ebuild 1336 RMD160 fce4f9760edf29d4f492005d516bbaf084334deb SHA1 3da045eb172fdcc9202d371bff5f901c1fcca77d SHA256 6985f9088f95b7369c47c3dfef306416096bbb3c3ef21e0ed9cf96fb527db959 MISC ChangeLog 3229 RMD160 d8e9fb27fa544f23f6ca63dccf7cbf761a0e285e SHA1 d70f1d5d013bb75671ade34ae2ed8b37c63d22ea SHA256 a6e91a7f952e8b85c80dfebe8fc11bc6b1d5f900ea8322e0ab1859b4a822e18e MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b diff --git a/dev-db/slony1/files/slony1.conf b/dev-db/slony1/files/slony1.conf index 0782232..a143488 100644 --- a/dev-db/slony1/files/slony1.conf +++ b/dev-db/slony1/files/slony1.conf @@ -8,5 +8,4 @@ CLUSTER=your_cluster_name DBUSER=postgres DBNAME=your_database_name DBHOST=localhost -LOGFILE=/var/lib/postgresql/data/slony1.log -LOGLEVEL=1 # 1(minimum)..4(maximum) +LOGLEVEL=0 # 1(minimum)..4(maximum) diff --git a/dev-db/slony1/files/slony1.init b/dev-db/slony1/files/slony1.init index 4f1469d..110caa6 100755 --- a/dev-db/slony1/files/slony1.init +++ b/dev-db/slony1/files/slony1.init @@ -9,7 +9,7 @@ depend() { start() { ebegin "Starting slony1" - /usr/bin/slon -p /var/run/slony1.pid -d $LOGLEVEL $CLUSTER "dbname=$DBNAME user=$DBUSER host=$DBHOST" >> $LOGFILE 2>&1 & + /usr/bin/slon -p /var/run/slony1.pid -d $LOGLEVEL $CLUSTER "dbname=$DBNAME user=$DBUSER host=$DBHOST" 2>&1 | logger -t slony1 & while : do diff --git a/dev-db/slony1/files/slony1.logrotate b/dev-db/slony1/files/slony1.logrotate new file mode 100644 index 0000000..e0e9d6b --- /dev/null +++ b/dev-db/slony1/files/slony1.logrotate @@ -0,0 +1,8 @@ + +# slony1 +/var/log/slony1.log { + sharedscripts + postrotate + /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true + endscript +} diff --git a/dev-db/slony1/files/slony1_remove_jave.patch b/dev-db/slony1/files/slony1_remove_jave.patch deleted file mode 100644 index a335682..0000000 --- a/dev-db/slony1/files/slony1_remove_jave.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naru slony1-1.1.0.beta4.org/configure slony1-1.1.0.beta4/configure ---- slony1-1.1.0.beta4.org/configure 2005-04-06 20:00:54.000000000 +0100 -+++ slony1-1.1.0.beta4/configure 2005-05-11 20:44:49.000000000 +0100 -@@ -9563,46 +9563,6 @@ - test -n "$NSGMLS" && break - done - --for ac_prog in openjade jade --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_JADE+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$JADE"; then -- ac_cv_prog_JADE="$JADE" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_JADE="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --JADE=$ac_cv_prog_JADE --if test -n "$JADE"; then -- echo "$as_me:$LINENO: result: $JADE" >&5 --echo "${ECHO_T}$JADE" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- test -n "$JADE" && break --done -- - - echo "$as_me:$LINENO: checking for DocBook V4.2" >&5 - echo $ECHO_N "checking for DocBook V4.2... $ECHO_C" >&6 diff --git a/dev-db/slony1/slony1-2.0.5-r1.ebuild b/dev-db/slony1/slony1-2.0.5-r1.ebuild new file mode 100644 index 0000000..13da46f --- /dev/null +++ b/dev-db/slony1/slony1-2.0.5-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.2.17.ebuild,v 1.2 2010/06/17 19:15:30 patrick Exp $ + +inherit eutils + +IUSE="perl" + +DESCRIPTION="A replication system for the PostgreSQL Database Management System" +HOMEPAGE="http://slony.info/" +SRC_URI="http://main.slony.info/downloads/2.0/source/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND="dev-db/postgresql-server + perl? ( dev-perl/DBD-Pg )" + +src_compile() { + local myconf="" + + myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql" + myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server" + myconf="${myconf} $(use_with perl perltools)" + + econf ${myconf} || die "econf failed!" + emake || die "emake failed!" + + if use perl ; then + cd "${S}"/tools + emake || die "emake tools failed!" + fi +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed!" + + dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt + dohtml doc/howto/*.html + + newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!" + newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!" + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/slony1.logrotate slony1 || die "logrotate failed!" +} diff --git a/dev-db/slony1/slony1-2.0.5.ebuild b/dev-db/slony1/slony1-2.0.5.ebuild deleted file mode 100644 index 6a78656..0000000 --- a/dev-db/slony1/slony1-2.0.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.2.17.ebuild,v 1.2 2010/06/17 19:15:30 patrick Exp $ - -inherit eutils - -IUSE="perl" - -DESCRIPTION="A replication system for the PostgreSQL Database Management System" -HOMEPAGE="http://slony.info/" -SRC_URI="http://main.slony.info/downloads/2.0/source/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPEND="dev-db/postgresql-server - perl? ( dev-perl/DBD-Pg )" - -src_compile() { - local myconf="" - - myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql" - myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server" - myconf="${myconf} $(use_with perl perltools)" - - econf ${myconf} || die "econf failed!" - emake || die "emake failed!" - - if use perl ; then - cd "${S}"/tools - emake || die "emake tools failed!" - fi -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed!" - - dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt - dohtml doc/howto/*.html - - newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!" - newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!" -} -- cgit v1.2.3