Init script, installation instructions

Testing the last parts requires LDAP+IMAP, which I don't have... Have fun and please report any success with these ebuilds!

svn path=/overlay/; revision=370

5 files changed, 54 insertions, 14 deletions

diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 61e0c89..67d1d03 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,3 +1,4 @@
 AUX sogo-foundation_include.patch 296 RMD160 c12185f556ccb3e3c922a9ffe7f1c4f72337aea6 SHA1 3eaabf94cbce392e81a81b74f55b2256712ce168 SHA256 5d230c040c5919acf29c4ddc45306dc38344048eae0fce0580140880a6c6537f
+AUX sogo.initd 472 RMD160 eb2ff469c8ad9795c2ff7f7b53f95d3c7e5a1303 SHA1 67e9a508b08cb2205ddff4044b35f378dc4c8e07 SHA256 eaa3a6c0e2729291ecf6fd1492fc7d33a0494bd920e63a78e1e1997c9314e31f
 DIST SOGo-1.0rc6.1.tar.gz 1304442 RMD160 07cbec5672670ff6355687565470bb4265ba7d36 SHA1 81954756dc641c1d9fee23be312f150dea7a5661 SHA256 80477c1949965fbc30a3d01f72b6aa701d7e1b9e8739d529f39c80edcb56a4e6
-EBUILD sogo-1.0_rc6.ebuild 2059 RMD160 791712c5c75ea76dd928ef11740cf9c1bf8c10f1 SHA1 a6c8ab78c055ce8506299bcf454ee8b9f2218794 SHA256 bc2822e9d8d63b98943a8d3ca6552e310e7f7c86e914e0149ea51f449195856c
+EBUILD sogo-1.0_rc6.ebuild 2660 RMD160 5fac7e6161a472f2d579b45c8739e0a89c7618d0 SHA1 b1fa4e69827951e7d22b8e3ff4a8707bf7d53b80 SHA256 c255c6eae522c2f826322e4094e8648f3925a4e61e323b45e5ebe518382889c1
diff --git a/gnustep-apps/sogo/files/sogo.initd b/gnustep-apps/sogo/files/sogo.initd
new file mode 100644
index 0000000..17dddf1
--- /dev/null
+++ b/gnustep-apps/sogo/files/sogo.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+	after postgresql
+}
+
+start() {
+	ebegin "Starting SOGo service"
+	start-stop-daemon --start --exec /usr/GNUstep/System/Tools/Admin/sogod-0.9 \
+		--chuid sogo -m -b --pidfile /var/run/sope.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping SOGo service"
+	start-stop-daemon --stop \
+		--pidfile /var/run/sope.pid
+	eend $?
+}
diff --git a/gnustep-apps/sogo/sogo-1.0_rc6.ebuild b/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
index bc8789f..8beb987 100644
--- a/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
+++ b/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
@@ -2,10 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-#TODO:
-# * create user, fill defaults
-# * complete DEPEND
-
 inherit depend.apache gnustep-base
 
 MY_PN="SOGo"
@@ -20,7 +16,8 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="gnustep-libs/sope"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-db/postgresql"
 need_apache2
 
 S=${WORKDIR}/${MY_PN}
@@ -42,6 +39,8 @@ src_compile() {
 
 src_install() {
 	gnustep-base_src_install
+
+	# Apache configuration file
 	dodir "${APACHE_MODULES_CONFDIR}"
 	cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_sogo.conf
 <IfDefine SOPE>
@@ -58,7 +57,7 @@ AliasMatch      /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
 <LocationMatch "^/SOGo*">
         AddDefaultCharset UTF-8
         SetHandler ngobjweb-adaptor
-        SetAppPort 18888
+        SetAppPort 20000
 </LocationMatch>
 
 <LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
@@ -80,4 +79,23 @@ AliasMatch      /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
 </IfDefine>
 EOF
 
+	# Init script
+	newinitd "${FILESDIR}"/sogo.initd sogo \
+		|| die "Init script installation failed"
+}
+
+pkg_preinst() {
+	enewuser sogo -1 /bin/bash /var/lib/sogo
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+
+	elog "Do not forget to enable the sope module in /etc/apache2/httpd.conf"
+	elog "Now follow the steps from the SOGo documentation:"
+	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
+	elog "The default port configured for sogo is 20000 (from 47_sogo.conf)"
+	elog "The sogo user home directory is /var/lib/sogo"
+	elog ""
+	elog "Then you can start/stop sogo with /etc/init.d/sogo"
 }
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index 7c02f24..6e0728d 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -4,4 +4,4 @@ AUX sope-nsexception.patch 1139 RMD160 08268926bb3a54408f493637afe196be3788429b
 AUX sope-patchset-r1621.diff 72909 RMD160 82fc9162f5892aa907355e860d59f7a4b6ffec91 SHA1 70bf987c82fe3943b2b53522d099e8157326969d SHA256 eb86e3ca689beb188d832021bcd854cbcbdee2d36618ee060ec08db9e75920e2
 AUX sope-use_system_root.patch 548 RMD160 add8b03f06b20ae96676b4efe17af08e024eae4c SHA1 86d50d562f5a94d3ffbd408fd59cbec288c17eb6 SHA256 6ac0f18cd2b39ae40b490f0e61952f6c7eccdc7939a4c7f844d2a3967abf2e64
 DIST sope-trunk-r1621-200805211100.tar.gz 4223699 RMD160 9b09c70577e32fb94daced41853a1c30c1d3ed8c SHA1 1d152ff065146cb10e4cfd80523ddb21bddc52d2 SHA256 fc6516599e3c292b2c08989bb274d6ccadb036b8bd1fe550f33774f3b7ed9ada
-EBUILD sope-4.7_pre20080521.ebuild 1519 RMD160 dfaf4d79195975ca3dabd0ce760fe1bc54d901bb SHA1 a69a887231beb9b1a316bf05b6a1d8fcb360872b SHA256 965ec22f261a6ad0ab38f869fbcd668a5026c5c17b9b264e4325a86dec3cd610
+EBUILD sope-4.7_pre20080521.ebuild 1520 RMD160 b21911631c0e27e4560eb8a94b8985db75f87c53 SHA1 c0824ed57678cbdd2ddfe0703031754a4d0d24fc SHA256 1b66b1e26421495f1b993f9f5b031d39db34c9ee41a3b1d51f6d91f13c243048
diff --git a/gnustep-libs/sope/sope-4.7_pre20080521.ebuild b/gnustep-libs/sope/sope-4.7_pre20080521.ebuild
index 2950aae..6b7235c 100644
--- a/gnustep-libs/sope/sope-4.7_pre20080521.ebuild
+++ b/gnustep-libs/sope/sope-4.7_pre20080521.ebuild
@@ -2,10 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-#TODO:
-# * add use flags and deps for mysql,postrgesql, sqlite
-# * complete DEPEND
-
 inherit gnustep-base apache-module
 
 MY_PV="1621-200805211100"
@@ -17,11 +13,13 @@ SRC_URI="http://download.opengroupware.org/nightly/sources/trunk/${PN}-trunk-r${
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="postgres sqlite"
 
 DEPEND="gnustep-base/gnustep-base
 	dev-libs/libxml2
-	net-nds/openldap"
+	net-nds/openldap
+	postgres? ( virtual/postgresql-base )
+	sqlite? ( >=dev-db/sqlite-3 )"
 RDEPEND="${DEPEND}"
 
 APACHE2_MOD_DEFINE="SOPE"