Now sets default instance if it wasnt set before (on instance creation).

5 files changed, 80 insertions, 6 deletions

diff --git a/app-admin/zope-config/ChangeLog b/app-admin/zope-config/ChangeLog
index 50f9749cd548..932757938541 100644
--- a/app-admin/zope-config/ChangeLog
+++ b/app-admin/zope-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/zope-config
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/ChangeLog,v 1.28 2004/10/05 02:58:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/ChangeLog,v 1.29 2004/10/07 21:03:07 radek Exp $
+
+*zope-config-0.5 (07 Oct 2004)
+
+  07 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/0.5/zope-config-0.5.patch, +zope-config-0.5.ebuild:
+  Now sets default instance if it wasnt set before (on instance creation).
+  Released as a patch to 0.4 release !!!
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   zope-config-0.1-r1.ebuild, zope-config-0.4-r3.ebuild:
diff --git a/app-admin/zope-config/Manifest b/app-admin/zope-config/Manifest
index cd3afa83bdfd..c7a19c15fd6f 100644
--- a/app-admin/zope-config/Manifest
+++ b/app-admin/zope-config/Manifest
@@ -1,14 +1,16 @@
-MD5 4ce7df800c8ce7e6d154d5086f508f53 ChangeLog 4447
-MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 44904edff233363438dd8037dacf9c4a zope-config-0.1-r1.ebuild 539
+MD5 ca0dc280795eae4989394c65f42ff9ed zope-config-0.4-r2.ebuild 964
 MD5 fb37e913fece40227de866c18b12c380 zope-config-0.3.ebuild 954
+MD5 44904edff233363438dd8037dacf9c4a zope-config-0.1-r1.ebuild 539
+MD5 71dedc0db410e40a7b0fa29bbfc816db zope-config-0.5.ebuild 1020
 MD5 cbd41a7510c75bff07613a2250e54d48 zope-config-0.4-r1.ebuild 964
-MD5 ca0dc280795eae4989394c65f42ff9ed zope-config-0.4-r2.ebuild 964
 MD5 31a970d64304a0fbfb0fdfb4986a07c9 zope-config-0.4-r3.ebuild 966
 MD5 ce10dc2ab0139995d0a9f0a8bcdce9b1 zope-config-0.4.ebuild 955
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.1-r1 0
+MD5 f247392632c0bdfa0c6cd306898b81cd ChangeLog 4708
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.4-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.4-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.4-r3 0
@@ -17,3 +19,4 @@ MD5 ee33083be6a5df4425481f4212e94493 files/0.3/zope-config 7714
 MD5 091fc2dce258d3da117b7c1017bd5b9a files/0.3/zope-config.conf 1040
 MD5 da7fa62a10e32ecbf602577ed31f6138 files/0.4/zope-config 14204
 MD5 a896b537030a8353798897a448a152ca files/0.4/zope-config.conf 1079
+MD5 2464137afff1b2c05b37273c27462d99 files/0.5/zope-config-0.5.patch 894
diff --git a/app-admin/zope-config/files/0.5/zope-config-0.5.patch b/app-admin/zope-config/files/0.5/zope-config-0.5.patch
new file mode 100644
index 000000000000..a694ddc79991
--- /dev/null
+++ b/app-admin/zope-config/files/0.5/zope-config-0.5.patch
@@ -0,0 +1,26 @@
+--- files/0.4/zope-config	2004-10-07 22:50:21.213319592 +0200
++++ /usr/sbin/zope-config	2004-10-07 22:45:46.249120504 +0200
+@@ -95,12 +95,17 @@
+ 		else
+ 			${BIN}/mkzopeinstance.py --dir $2
+ 		fi
+-        # create the log directory
+-        mkdir ${EVENTLOGDIR}/${ZIRC_NAME}
+-        # remove log directory  in skeltarget
+-        rm -r $2/log
+-        # symlink log directory
+-        ln -s ${EVENTLOGDIR}/${ZIRC_NAME} $2/log
++		# sets default instance if just created is first one
++		if [ $(zinst_default_get >/dev/null)$? -ne 0 ] ; then
++			echo $(basename ${ZINST_DIR}) >${ZI_DIR}/.default
++			chown zope:root ${ZI_DIR}/.default
++		fi
++		# create the log directory
++		mkdir ${EVENTLOGDIR}/${ZIRC_NAME}
++		# remove log directory  in skeltarget
++		rm -r $2/log
++		# symlink log directory
++		ln -s ${EVENTLOGDIR}/${ZIRC_NAME} $2/log
+ 		RESULT=$?
+ 	else
+             if [ $NEWZOPE = 1 ] ; then
diff --git a/app-admin/zope-config/files/digest-zope-config-0.5 b/app-admin/zope-config/files/digest-zope-config-0.5
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-admin/zope-config/files/digest-zope-config-0.5
diff --git a/app-admin/zope-config/zope-config-0.5.ebuild b/app-admin/zope-config/zope-config-0.5.ebuild
new file mode 100644
index 000000000000..ccbf6457fae2
--- /dev/null
+++ b/app-admin/zope-config/zope-config-0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/zope-config-0.5.ebuild,v 1.1 2004/10/07 21:03:07 radek Exp $
+
+DESCRIPTION="A Gentoo Zope multi-Instance configure tool"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-util/dialog-0.7
+		sys-apps/grep
+		sys-apps/sed
+		sys-apps/shadow
+		dev-lang/python
+		sys-apps/coreutils"
+
+PDEPEND=">=net-zope/zope-2.7.2-r2"
+
+src_install() {
+	# the script
+	dosbin ${FILESDIR}/0.4/zope-config
+	patch ${D}/usr/sbin/zope-config ${FILESDIR}/${PV}/${P}.patch
+
+	# config file
+	insinto /etc
+	doins ${FILESDIR}/0.4/zope-config.conf
+	# ensure this directory exists
+	keepdir /var/log/zope
+}
+
+pkg_postinst() {
+	source ${FILESDIR}/0.4/zope-config.conf
+	einfo "Please note that new instances now log into ${EVENTLOGDIR}"
+	einfo "Please see the configuration file /etc/zope-config.conf"
+}