From: Daniel Pielmeier Date: Wed, 28 Apr 2010 18:42:42 +0000 (+0000) Subject: Add support for a local postgres backend to the init script to make the database... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bc5b905fd324ff93a5673069e5a88134fea5d8d;p=gentoo.git Add support for a local postgres backend to the init script to make the database available when quasselcore starts up. Fixes bug #316799, thanks to Aaron W. Swenson for reporting. Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog index b5e421dff650..fc6889ccc8c4 100644 --- a/net-irc/quassel/ChangeLog +++ b/net-irc/quassel/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/quassel # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.85 2010/04/18 11:44:34 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.86 2010/04/28 18:42:42 billie Exp $ + + 28 Apr 2010; Daniel Pielmeier + files/quasselcore-2.conf, files/quasselcore-2.init: + Add support for a local postgres backend to the init script to make the + database available when quasselcore starts up. Fixes bug #316799, thanks + to Aaron W. Swenson for reporting. *quassel-0.6.1 (18 Apr 2010) diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest index 43da79348cba..c29d02e43dee 100644 --- a/net-irc/quassel/Manifest +++ b/net-irc/quassel/Manifest @@ -1,10 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.5.2-fix_x11_detection.patch 854 RMD160 88585681941f9ed915edb4ec2f6a07d645ceb22e SHA1 80b6e5a9c75fb69d91f8ec86770369b20f412311 SHA256 1daa5834b1836756f74829e9d0861d9cfda7998a3a477c980fbdf5b2769c2500 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45 -AUX quasselcore-2.conf 548 RMD160 afc8ee2d5bc8449c51afd46699e7b9796ff77b1f SHA1 e9492c10864df233edda84411f7cf15e1f7f3573 SHA256 973bff9a4dac8e25b6a7b8dc8355f763c65e31f070b1fc5904f6325045ad3cb5 -AUX quasselcore-2.init 1627 RMD160 fc0885dc6a2295ad1dcb49aefc1adfd184388fb2 SHA1 2629a3019913b1c685406fc88ead655e10bed943 SHA256 318e85a896fc2672651fa270dd98bfb664c0cb20cc8ae34c18363dbef36d820b +AUX quasselcore-2.conf 756 RMD160 5f7ec7d1e46da202fdc18e2bd25827d307ec15fc SHA1 688039bd9616177eab803b7a4b12945e009cc806 SHA256 48079bebba2e723d582751b63b5d696ba506b364d20268c38f565f2c85257baa +AUX quasselcore-2.init 1693 RMD160 729dad48f3cb5afd35bb76c731349109becee392 SHA1 f1a83d63398b3df5e7700921db22d76595a3a96c SHA256 5632cfbb1921561924af1d50196e0e9d1bb80caa90f5d98e551af7c30174458a DIST quassel-0.5.1.tar.bz2 3339773 RMD160 411f70ed4b4162f8523bf5498cd22aca43171b5c SHA1 448c2712176d5c0328b439b60ee27e06645339ba SHA256 c2aa0694b775b33380cb5bb452512433fa9f0bf4820778e8ec98f621e5458f62 DIST quassel-0.5.2.tar.bz2 3307109 RMD160 bac05710c6126150c1546713325f319bef2640c8 SHA1 68abd45cd506303090b54e4aa21eb0273d3e4217 SHA256 9c98dcefa4b1655ae92b0204ef30594c9043701fb66350c5e69beafa86b88c8a DIST quassel-0.6.1.tar.bz2 2531035 RMD160 39e08319488062e02545055c91554ee1ea025912 SHA1 92017692712ed54d678211bb8d4dc4a992601d2d SHA256 e01b5a91359ca37b3db2849b3b1db32f768c865f698d0a4f3ef679f722edb5ec @@ -12,12 +9,5 @@ EBUILD quassel-0.5.1.ebuild 3218 RMD160 62aadb3a9c8f83d150e1eb14ff1e3b8a76d19807 EBUILD quassel-0.5.2.ebuild 3286 RMD160 63a5f30344de108115443bdfd15188d7ff20eb3d SHA1 3fde3cbc2ae6d5b2cf5b5380b64a371b1f51ea07 SHA256 50d32c4fbfca4529386903d60606706a8f35596f0b53609594689485b4d9cd4e EBUILD quassel-0.6.1.ebuild 2905 RMD160 971ddf35d5f705357b75c8396a5596f56744f0ed SHA1 8c0cdd02932b824bdfcace1081b382ccbb72ee4a SHA256 fd5a54e01578b6f048571b10266d707b1e43558b4348cc4050305e4fcd5b5d75 EBUILD quassel-9999.ebuild 2879 RMD160 7ad350aed4f132f1b9c9cb2b0fd683b09b3b215e SHA1 cc07cdf14a071371cf00a17592083488b5a13936 SHA256 2da14d68bdc7cf60d5bffecfc6d94e0893623db0443332a902ae32231c733a40 -MISC ChangeLog 15014 RMD160 1538e6233f00c4047769cc8470f06008f3d2aec0 SHA1 b0ac80b456bca8bda29592b0ba0f4574e655dda9 SHA256 3911e61e5aadcf04cb9170019a4d0603fbbe71bfc0e47ac4afdb430b21a70a97 +MISC ChangeLog 15304 RMD160 d6baaf6218cb119c3425e3704be19fb2be616dad SHA1 c088be79a356f17b828056848a5cf9adf6f2642d SHA256 b73c5b93bb8d1fdc90da92c455f15607c49d6bd38bf22222491b01bf1598f195 MISC metadata.xml 1903 RMD160 cc0c6f3ca1ade233d4640dfd913e83ee13cdbdc2 SHA1 ae3def4a7ce3f9bfc42e79d3ea851c65e0c00c21 SHA256 6188126527fca9af504832fb9a492111c35b78fa9ed422ae0fcf2bcb6478cd95 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkvK8LQACgkQHB6c3gNBRYc7gQCcD0LmSR5SU6N/BbT6GlBWV3+D -orIAoJ+zDO9ohoFoBqgmTo56hrACu+wu -=JA+4 ------END PGP SIGNATURE----- diff --git a/net-irc/quassel/files/quasselcore-2.conf b/net-irc/quassel/files/quasselcore-2.conf index a824606eb112..4b18a63c4b8c 100644 --- a/net-irc/quassel/files/quasselcore-2.conf +++ b/net-irc/quassel/files/quasselcore-2.conf @@ -16,3 +16,8 @@ PORT="4242" # Specify the directory holding configuration files, the SQlite database # and the SSL Cert. Default is ~/.config/quassel-irc.org CONFIGDIR="/home/${QUASSEL_USER}/.config/quassel-irc.org" + +# Uncomment the following line if quasselcore uses the PostgreSQL Server +# backend and they both run on the same machine. This ensures the database +# is available when quasselcore starts. +#LOCAL_PGSQL="yes" diff --git a/net-irc/quassel/files/quasselcore-2.init b/net-irc/quassel/files/quasselcore-2.init index a58197dfbb0b..04bbe24a5e84 100644 --- a/net-irc/quassel/files/quasselcore-2.init +++ b/net-irc/quassel/files/quasselcore-2.init @@ -1,14 +1,18 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore-2.init,v 1.1 2009/02/20 20:02:08 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore-2.init,v 1.2 2010/04/28 18:42:42 billie Exp $ depend() { - need net + if [ "${LOCAL_PGSQL}" == "yes" ]; then + need net postgresql + else + need net + fi } checkconfig() { - if [ -z "${QUASSEL_USER}" ] ; then + if [ -z "${QUASSEL_USER}" ]; then eerror "Did you read the elog messages? You need to define the" eerror "QUASSEL_USER variable in /etc/conf.d/quasselcore first." return 1 @@ -19,12 +23,12 @@ start() { checkconfig || return 1 ebegin "Starting Quassel Core" - local LOGFILE="/var/log/quassel.log" - if [ ! -e ${LOGFILE} ] ; then + local LOGFILE=/var/log/quassel.log + if [ ! -e "${LOGFILE}" ]; then touch ${LOGFILE} && chown ${QUASSEL_USER} ${LOGFILE} fi - if [[ -n "${RC_UNAME}" ]]; then + if [ -n "${RC_UNAME}" ]; then # running on baselayout-2/openrc start-stop-daemon --start --user ${QUASSEL_USER} --background --make-pidfile \ --pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- --logfile=${LOGFILE} \