Attachment #64041 for bug #24247




     SetAppPort 20000
 </LocationMatch>

 Alias /OpenGroupware11.woa/WebServerResources/ \
   /usr/local/share/opengroupware.org-1.1/www/

<Directory /usr/local/share/opengroupware.org-1.1/www>
 Order allow,deny
 Allow from all
</Directory>

SetAppPort 21000
</LocationMatch>

Alias /zidestore/so/images/ /usr/local/share/opengroupware.org-1.1/www

</IfDefine>

Lines 11-20 Link Here

(-)opengroupware.orig/files/opengroupware.conf.d (-2 / +2 lines)
11	OGOARGS="-OGoMinimumActiveSessionCount 0 -WOWatchDogEnabled YES"	11	OGOARGS="-OGoMinimumActiveSessionCount 0 -WOWatchDogEnabled YES"
12		12
13	# OGo Executable:	13	# OGo Executable:
14	OGOBINARY="/usr/local/sbin/ogo-webui-1.0a"	14	OGOBINARY="/usr/local/sbin/ogo-webui-1.1"
15		15
16	# ZideStore Logfile path:	16	# ZideStore Logfile path:
17	ZSLOG=/var/log/opengroupware/zidestore.log	17	ZSLOG=/var/log/opengroupware/zidestore.log
18		18
19	# Zidestore Executable:	19	# Zidestore Executable:
20	ZSBINARY="/usr/local/sbin/ogo-zidestore-1.3"	20	ZSBINARY="/usr/local/sbin/ogo-zidestore-1.5"

Lines 1-7 Link Here

(-)opengroupware.orig/Manifest (-3 / +3 lines)
1	MD5 049da15e15db5c20262c1b00d6696f30 opengroupware-1.0.ebuild 7303	1	MD5 9d4fedafc6762dd5d3468bc8a94511cb opengroupware-1.0.ebuild 7301
2	MD5 ad8038bbe1050c53fe3c1dbbdf03403d ChangeLog 1468	2	MD5 ad8038bbe1050c53fe3c1dbbdf03403d ChangeLog 1468
3	MD5 74ca5a2c4972b74f3710df04a8d0b723 metadata.xml 257	3	MD5 74ca5a2c4972b74f3710df04a8d0b723 metadata.xml 257
4	MD5 af6c6f7790df3e2b68d9820af58781a3 files/50_opengroupware.conf 595	4	MD5 c280073f5128150b24a380d468ca37e3 files/50_opengroupware.conf 591
5	MD5 db17841662957910cf460211e1637c7b files/opengroupware.startscript 864	5	MD5 db17841662957910cf460211e1637c7b files/opengroupware.startscript 864
6	MD5 f6c3438b5357aeefe875fb767773b5d8 files/opengroupware.conf.d 461	6	MD5 32919dbca28c06bd594ab542d7ba8965 files/opengroupware.conf.d 461
7	MD5 020f6b825d80a9769c36a39877f13f44 files/digest-opengroupware-1.0 71	7	MD5 020f6b825d80a9769c36a39877f13f44 files/digest-opengroupware-1.0 71

Lines 128-139 Link Here

(-)opengroupware.orig/opengroupware-1.0.ebuild (-6 / +9 lines)
128	src_install() {	128	src_install() {
129	cp ${OGOGNUSTEP}/Library/Makefiles/GNUstep.sh.backup ${OGOGNUSTEP}/Library/Makefiles/GNUstep.sh	129	cp ${OGOGNUSTEP}/Library/Makefiles/GNUstep.sh.backup ${OGOGNUSTEP}/Library/Makefiles/GNUstep.sh
130	cp ${OGOGNUSTEP}/Library/Makefiles/common.make.backup ${OGOGNUSTEP}/Library/Makefiles/common.make	130	cp ${OGOGNUSTEP}/Library/Makefiles/common.make.backup ${OGOGNUSTEP}/Library/Makefiles/common.make
131	#### Changes 12/22/04 ####	131	#### Changes 07/22/05 ####
132	rm ${S}${INSTALLPATH}/share/opengroupware.org-1.0a/translations	132	rm ${S}${INSTALLPATH}/share/opengroupware.org-1.1/translations
133	rm ${S}${INSTALLPATH}/share/opengroupware.org-1.0a/templates	133	rm ${S}${INSTALLPATH}/share/opengroupware.org-1.1/templates
134	cp -a ${S}/OpenGroupware.org/WebUI/Resources ${S}${INSTALLPATH}/share/opengroupware.org-1.0a/translations	134	cp -a ${S}/OpenGroupware.org/WebUI/Resources
135	cp -a ${S}/OpenGroupware.org/WebUI/Templates ${S}${INSTALLPATH}/share/opengroupware.org-1.0a/templates	135	${S}${INSTALLPATH}/share/opengroupware.org-1.1/translations
136	cp -a ${S}/OpenGroupware.org/Themes/WebServerResources ${S}${INSTALLPATH}/share/opengroupware.org-1.0a/www	136	cp -a ${S}/OpenGroupware.org/WebUI/Templates
		137	${S}${INSTALLPATH}/share/opengroupware.org-1.1/templates
		138	cp -a ${S}/OpenGroupware.org/Themes/WebServerResources
		139	${S}${INSTALLPATH}/share/opengroupware.org-1.1/www
137	#### End Changes 12/22/04 ####	140	#### End Changes 12/22/04 ####
138	mkdir -p ${S}${OGOHOMEDIR}/OGo-DatabaseSetup	141	mkdir -p ${S}${OGOHOMEDIR}/OGo-DatabaseSetup
139	cp ${S}/OpenGroupware.org/Database/PostgreSQL/pg-build-schema.psql ${S}${OGOHOMEDIR}/OGo-DatabaseSetup/	142	cp ${S}/OpenGroupware.org/Database/PostgreSQL/pg-build-schema.psql ${S}${OGOHOMEDIR}/OGo-DatabaseSetup/

Return to bug 24247

Lines 6-15 Link Here

(-)opengroupware.orig/files/50_opengroupware.conf (-4 / +4 lines)
6	SetAppPort 20000	6	SetAppPort 20000
7	</LocationMatch>	7	</LocationMatch>
8		8
9	Alias /OpenGroupware10a.woa/WebServerResources/ \	9	Alias /OpenGroupware11.woa/WebServerResources/ \
10	/usr/local/share/opengroupware.org-1.0a/www/	10	/usr/local/share/opengroupware.org-1.1/www/
11		11
12	<Directory /usr/local/share/opengroupware.org-1.0a/www>	12	<Directory /usr/local/share/opengroupware.org-1.1/www>
13	Order allow,deny	13	Order allow,deny
14	Allow from all	14	Allow from all
15	</Directory>	15	</Directory>
Lines 19-24 Link Here
19	SetAppPort 21000	19	SetAppPort 21000
20	</LocationMatch>	20	</LocationMatch>
21		21
22	Alias /zidestore/so/images/ /usr/local/share/opengroupware.org-1.0a/www	22	Alias /zidestore/so/images/ /usr/local/share/opengroupware.org-1.1/www
23		23
24	</IfDefine>	24	</IfDefine>