summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Garthe (the_mgt) <themgt@uncensored.citadel.org>2012-02-20 00:26:23 +0000
committerStefan Garthe (the_mgt) <themgt@uncensored.citadel.org>2012-02-20 00:26:23 +0000
commit16d52e5df9c431694b2716022554521e01d742f3 (patch)
tree773e40082d6313025a2af1c0f9f65271a5e4dc73 /www-servers
parentmail-mta/citadel: Version bump to 8.04 and EAPI=4 cleanups. Initscript improv... (diff)
downloadsunrise-16d52e5df9c431694b2716022554521e01d742f3.tar.gz
sunrise-16d52e5df9c431694b2716022554521e01d742f3.tar.bz2
sunrise-16d52e5df9c431694b2716022554521e01d742f3.zip
www-servers/webcit: Version bump to 8.04 and EAPI=4 cleanups. Initscript enhanced to support multiple running instances. Fixed locale path. Thanks to floppym, hasufell and everyone else who was most helpful.
svn path=/sunrise/; revision=12766
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/webcit/ChangeLog10
-rw-r--r--www-servers/webcit/Manifest10
-rw-r--r--www-servers/webcit/files/webcit.conf.d13
-rw-r--r--www-servers/webcit/files/webcit.init.d26
-rw-r--r--www-servers/webcit/webcit-8.04.ebuild (renamed from www-servers/webcit/webcit-7.86.ebuild)39
5 files changed, 60 insertions, 38 deletions
diff --git a/www-servers/webcit/ChangeLog b/www-servers/webcit/ChangeLog
index 2dadac43f..24b8bd9d7 100644
--- a/www-servers/webcit/ChangeLog
+++ b/www-servers/webcit/ChangeLog
@@ -1,7 +1,15 @@
# ChangeLog for www-servers/webcit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*webcit-8.04 (20 Feb 2012)
+
+ 20 Feb 2012; the_mgt themgt@uncensored.citadel.org -webcit-7.86.ebuild,
+ +webcit-8.04.ebuild, files/webcit.conf.d, files/webcit.init.d:
+ Version bump to 8.04 and EAPI=4 cleanups. Initscript enhanced to support
+ multiple running instances. Fixed locale path. Thanks to floppym, hasufell
+ and everyone else who was most helpful.
+
21 Apr 2011; the_mgt themgt@mail.ru -webcit-7.85.ebuild,
+webcit-7.86.ebuild:
Version bump to complete Citadel suite update
diff --git a/www-servers/webcit/Manifest b/www-servers/webcit/Manifest
index 0d2f7afd5..0570761ca 100644
--- a/www-servers/webcit/Manifest
+++ b/www-servers/webcit/Manifest
@@ -1,6 +1,6 @@
-AUX webcit.conf.d 1059 RMD160 986d5edf54dc29d4e20beb8832b64cabb506c188 SHA1 962e9235a79f3ed8ac1ea5aaaf6854f7b4cdfa5a SHA256 6df86e62242574dbeb5a6795c978523d4cb32a370cca747944d09938d64dee80
-AUX webcit.init.d 581 RMD160 2c0b8a9c64b2611e2cb8439402096a6527f2593f SHA1 424699afca02cc49bc0ead43b517ac5448fa00fe SHA256 65715da03657486265986e238205483eaf7e7ec2ecc057499d6b5b7e499d29a9
-DIST webcit-7.86.tar.gz 1390693 RMD160 49ed38a476c0ea07566ab017cbdccebc19e77ed2 SHA1 9c0913fbd1b6a20e758f6d9f5fc8f4a574f9fbb5 SHA256 67882858ad48b1212f5dc6abca3f752945de5a25c4628c65c25037ac4c265659
-EBUILD webcit-7.86.ebuild 1679 RMD160 9e560573d0aa81d0e3f0853285668e5e49865310 SHA1 689c954f425ebfd744ee1910044ad17df9c0ad82 SHA256 f80daf6ce2933efa7d835e4257629bce037d058fe6df755103d2d52b6bb131b2
-MISC ChangeLog 1751 RMD160 31eef10032c624dd70d2f46edf94bfe9d38f64ef SHA1 625b9db9cdcd3f2e1aff3512ab1cb99744ad0dc2 SHA256 e0d7187cc07c32d5c515b883e0177563e1e46628598cd42cfb975fe18f773b6a
+AUX webcit.conf.d 1380 RMD160 6f3184774711ce38bc2343d6c4d8f528346d7e85 SHA1 77dea14d42718804e79ba994f54fea6d58444983 SHA256 60a6d2b811d77ed049c127dcf65e07b56442195f4815cfad923d0fff4a4e4db2
+AUX webcit.init.d 826 RMD160 5871f0fa16f2f4692bbd1228b57219e19b24ce7f SHA1 4308145e08f6056f632ed3985c364b28f9a25b65 SHA256 c6e8715fbb0b27c265b0702ccbf3ee6ef9e68ff9a50653d6fa769d75333e859f
+DIST webcit-8.04.tar.gz 1913372 RMD160 4824caeeb00488496fb58bba3c9fc6079ac7e67b SHA1 cc485a724390d1643a22409fcc6e773506becdbc SHA256 d14caba8a06c761c3cdf76b9db3149e413abcbbf810e0233d3d058b8b5908ced
+EBUILD webcit-8.04.ebuild 1640 RMD160 05d56a22b06a1b762e7bbfe24cfa153bf25eb78c SHA1 d1959bcb79bc59753d35808c611e05f5cb60b244 SHA256 14d71d9982383c51a9b7c82ffac9f0b6f826674b85b90b215f6efd3206f0253a
+MISC ChangeLog 2113 RMD160 e0794b4680fbd9a3e746d30355b9f3463a994fed SHA1 35024e57a2ad305abfeabc1b453370960b3e596a SHA256 da899eefe819b913aee964fd6f25f0aec5c09aae661c3d08ef6d864579b90953
MISC metadata.xml 736 RMD160 138a4b8baa0a5f03949bc61429343318e45a9775 SHA1 9816ba91de355a746609fd0e19002d49f9a8c8cb SHA256 964458fe29fb0d24a1544b647f9ac6dec0746a3bf35d49241416402f730b1918
diff --git a/www-servers/webcit/files/webcit.conf.d b/www-servers/webcit/files/webcit.conf.d
index 1a0b2e869..c9b10aefc 100644
--- a/www-servers/webcit/files/webcit.conf.d
+++ b/www-servers/webcit/files/webcit.conf.d
@@ -1,6 +1,10 @@
# Config file for /etc/init.d/webcit
+# It is possible to run multiple instances of webcit on the same system,
+# if you use different ports. It works the same way openvpn does:
+# # ln -s /etc/init.d/webcit /etc/init.d/webcit.servername
+# # cp /etc/conf.d/webcit /etc/conf.d/webcit.servername
+#
#See /usr/share/docs/webcit/readme for details.
-WEBCIT_OPTS=""
##[-i ip_addr] The IP address you wish to bind.
##Leave this out and WebCit will listen on all network interfaces.
@@ -11,7 +15,7 @@ WEBCIT_OPTS=""
#WEBCIT_OPTS="${WEBCIT_OPTS} -p 2000"
##[-u username] Lets Webcit drop root privileges and run as a useraccount.
-#WEBCIT_OPTS="${WEBCIT_OPTS} -u webcit"
+WEBCIT_OPTS="${WEBCIT_OPTS} -u webcit"
##[-t tracefile] Where you want WebCit to log information.
WEBCIT_OPTS="${WEBCIT_OPTS} -t /var/log/webcit"
@@ -28,4 +32,7 @@ WEBCIT_OPTS="${WEBCIT_OPTS} -t /var/log/webcit"
##[remotehost [remoteport]] IP address and port of your Citadel server.
##Defaults to localhost 504
-#WEBCIT_OPTS="${WEBCIT_OPTS} 127.0.0.1"
+WEBCIT_OPTS="${WEBCIT_OPTS} 127.0.0.1"
+
+## Template debug option, only used when you debug the layout
+#WEBCIT_OPTS="-T1"
diff --git a/www-servers/webcit/files/webcit.init.d b/www-servers/webcit/files/webcit.init.d
index 942dd9bab..d523c3420 100644
--- a/www-servers/webcit/files/webcit.init.d
+++ b/www-servers/webcit/files/webcit.init.d
@@ -1,28 +1,36 @@
#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+CITSERVER=${SVCNAME#*.}
+if [ -n "${CITSERVER}" ] && [ ${SVCNAME} != "webcit" ]; then
+ WCPID="/var/run/webcit.${CITSERVER}.pid"
+else
+ WCPID="/var/run/webcit.pid"
+fi
+
depend() {
need net
}
start() {
- ebegin "Starting WebCit"
- start-stop-daemon --start --quiet --background \
- --exec /usr/sbin/webcit -- $WEBCIT_OPTS
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --background \
+ --exec /usr/sbin/webcit --make-pidfile \
+ --pidfile "${WCPID}" -- $WEBCIT_OPTS
eend $? "Failed to start WebCit"
}
stop() {
- ebegin "Stopping WebCit"
- start-stop-daemon --stop --quiet \
- --exec /usr/sbin/webcit
- eend $? "Failed to stop WebCit"
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop \
+ --exec /usr/sbin/webcit --pidfile "${WCPID}"
+ eend $? "Failed to stop ${SVCNAME}"
}
restart() {
- ebegin "Restarting WebCit"
+ ebegin "Restarting ${SVCNAME}"
svc_stop && sleep 3 && svc_start
eend $? "Failed to restart WebCit"
}
diff --git a/www-servers/webcit/webcit-7.86.ebuild b/www-servers/webcit/webcit-8.04.ebuild
index 54d3d844e..145e9ca5e 100644
--- a/www-servers/webcit/webcit-7.86.ebuild
+++ b/www-servers/webcit/webcit-8.04.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
-inherit eutils
+EAPI=4
+inherit user
-DESCRIPTION="Modern AJAX-style web interface for Citadel"
+DESCRIPTION="Groupdav compliant AJAX'ed Blog/Forum/Wiki/Webserver for Citadel groupware"
HOMEPAGE="http://www.citadel.org/"
SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz"
@@ -16,7 +16,8 @@ IUSE="ssl"
DEPEND=">=dev-libs/libical-0.43
>=dev-libs/libcitadel-${PV}
- ssl? ( >=dev-libs/openssl-0.9.6 )"
+ ssl? ( dev-libs/openssl )
+ sys-libs/zlib"
RDEPEND="${DEPEND}"
WWWDIR="/usr/share/citadel-webcit"
@@ -31,33 +32,31 @@ pkg_setup() {
src_configure() {
econf \
$(use_with ssl) \
- --with-libical \
- --without-newt \
--prefix=/usr/sbin/ \
- --with-wwwdir="${WWWDIR}" \
- --with-localedir=/usr/share/ \
+ --with-datadir=/var/run/citadel \
--with-editordir=/usr/share/citadel-webcit/tiny_mce/ \
+ --with-localedir=/usr/share/ \
--with-rundir=/var/run/citadel \
--with-ssldir=/etc/ssl/webcit/ \
- --with-datadir=/var/run/citadel
+ --with-wwwdir="${WWWDIR}"
}
src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- newinitd "${FILESDIR}"/webcit.init.d webcit || die "Installing initscript failed"
- newconfd "${FILESDIR}"/webcit.conf.d webcit || die "Installing conf for initscript failed"
+ emake DESTDIR="${D}" install
+ newinitd "${FILESDIR}"/webcit.init.d webcit
+ newconfd "${FILESDIR}"/webcit.conf.d webcit
##House cleaning...
- #We don't use Webcit's setup program
- #Settings are in /etc/conf.d/webcit
+ #We don't use the setup program, settings are in /etc/conf.d/webcit
rm "${D}"/usr/sbin/setup || "Removing upstreams setup bin failed"
- dodoc *.txt || die "dodoc failed"
+ dodoc *.txt
}
pkg_postinst() {
- einfo "Make sure to configure webcit under /etc/conf.d/webcit."
- einfo "Then start the server with /etc/init.d/webcit start"
- einfo
- einfo "Webcit will listen on port 2000 by default"
+ elog "You can now connect more than one Citadel server with different configs:"
+ elog "Make sure to configure webcit under /etc/conf.d/webcit(.yourinstance)."
+ elog "Then start the server with /etc/init.d/webcit(.yourinstance) start"
+ elog
+ elog "Webcit will listen on port 2000 by default"
}