Attachment #57424 for bug #86659

View | Details | Raw Unified | Return to bug 86659
Collapse All | Expand All

Lines 33-39 Link Here

(-)Makefile (-10 / +18 lines)
33	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall	33	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
34	.if defined(WITH_POSTCONFIG)	34	.if defined(WITH_POSTCONFIG)
35	POSTCONFIG= true	35	POSTCONFIG= true
36	PKGNAMESUFFIX= -withconfig	36	PKGNAMESUFFIX= -withconfig
		37	.endif
		38
		39	.if defined(WITH_DT)
		40	DT= true
		41	RUN_DEPENDS+= ${LOCALBASE}/bin/supervise:${PORTSDIR}/sysutils/daemontools
37	.endif	42	.endif
38		43
39	SUB_FILES= pkg-install pkg-message pkg-deinstall post-config	44	SUB_FILES= pkg-install pkg-message pkg-deinstall post-config
Lines 41-47 Link Here
41	OPENACSBASE=${OPENACSBASE} OPENACS_GROUP=${OPENACS_GROUP} \	46	OPENACSBASE=${OPENACSBASE} OPENACS_GROUP=${OPENACS_GROUP} \
42	OPENACS_USER=${OPENACS_USER} DB=${DB} PGDATA=${PGDATA} \	47	OPENACS_USER=${OPENACS_USER} DB=${DB} PGDATA=${PGDATA} \
43	PG_USER=${PG_USER} PGBASE=${PGBASE} \	48	PG_USER=${PG_USER} PGBASE=${PGBASE} \
44	DTSERVICEBASE=${DTSERVICEBASE} \	49	DTSERVICEBASE=${DTSERVICEBASE} DT=${DT} \
45	AOLSERVERBASE=${AOLSERVERBASE} VIRTUALBASE=${VIRTUALBASE}	50	AOLSERVERBASE=${AOLSERVERBASE} VIRTUALBASE=${VIRTUALBASE}
46		51
47	RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \	52	RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
Lines 60-67 Link Here
60	.endif	65	.endif
61		66
62	RUN_DEPENDS+= ${LOCALBASE}/lib/tdom0.8.0/libtdom0.8.0.so:${PORTSDIR}/www/tdom \	67	RUN_DEPENDS+= ${LOCALBASE}/lib/tdom0.8.0/libtdom0.8.0.so:${PORTSDIR}/www/tdom \
63	${LOCALBASE}/tclwebtest-1.0/tclwebtest:${PORTSDIR}/www/tclwebtest \	68	${LOCALBASE}/tclwebtest-1.0/tclwebtest:${PORTSDIR}/www/tclwebtest
64	${LOCALBASE}/bin/supervise:${PORTSDIR}/sysutils/daemontools	69
65	USE_LINUX= YES	70	USE_LINUX= YES
66		71
67	NO_BUILD= YES	72	NO_BUILD= YES
Lines 83-96 Link Here
83	@${MKDIR} ${EXAMPLESDIR}	88	@${MKDIR} ${EXAMPLESDIR}
84	@${MKDIR} ${OPENACSBASE}	89	@${MKDIR} ${OPENACSBASE}
85	@${MKDIR} ${VIRTUALBASE}	90	@${MKDIR} ${VIRTUALBASE}
86	@${MKDIR} ${DTSERVICEBASE}
87		91
88	@${ECHO_CMD} "Installing files"	92	@${ECHO_CMD} "Installing files"
89	@${CP} -R ${WRKSRC} ${OPENACSBASE}/${OPENACS_USER}	93	@${CP} -R ${WRKSRC} ${OPENACSBASE}/${OPENACS_USER}
90		94
91	@${TEST} -e ${VIRTUALBASE}/aolserver \|\| ${LN} -s ${OPENACSBASE} ${VIRTUALBASE}/aolserver	95	@${TEST} -e ${VIRTUALBASE}/aolserver \|\| ${LN} -s ${OPENACSBASE} ${VIRTUALBASE}/aolserver
92	@${TEST} -L ${VIRTUALBASE}/aolserver \|\| ${ECHO_MSG} "${VIRTUALBASE}/aolserver is no symbolic link"	96	@${TEST} -L ${VIRTUALBASE}/aolserver \|\| ${ECHO_MSG} "${VIRTUALBASE}/aolserver is no symbolic link"
93	@${TEST} -L ${DTSERVICEBASE}/${OPENACS_USER} \|\| ${LN} -s ${OPENACSBASE}/${OPENACS_USER}/etc/daemontools ${DTSERVICEBASE}/${OPENACS_USER}
94		97
95	@${INSTALL_SCRIPT} ${OPENACSBASE}/${OPENACS_USER}/packages/acs-core-docs/www/files/nsd-postgres.txt ${EXAMPLESDIR}/nsd-postgres	98	@${INSTALL_SCRIPT} ${OPENACSBASE}/${OPENACS_USER}/packages/acs-core-docs/www/files/nsd-postgres.txt ${EXAMPLESDIR}/nsd-postgres
96	@${INSTALL_SCRIPT} ${OPENACSBASE}/${OPENACS_USER}/packages/acs-core-docs/www/files/nsd-oracle.txt ${EXAMPLESDIR}/nsd-oracle	99	@${INSTALL_SCRIPT} ${OPENACSBASE}/${OPENACS_USER}/packages/acs-core-docs/www/files/nsd-oracle.txt ${EXAMPLESDIR}/nsd-oracle
Lines 116-122 Link Here
116	" ${OPENACSBASE}/${OPENACS_USER}/etc/daemontools/run	119	" ${OPENACSBASE}/${OPENACS_USER}/etc/daemontools/run
117		120
118	@${ECHO_CMD} "@unexec rm -f ${DATADIR}/log/${OPENACS_USER}* 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}	121	@${ECHO_CMD} "@unexec rm -f ${DATADIR}/log/${OPENACS_USER}* 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}
119	@${ECHO_CMD} "@unexec rm -f ${DATADIR}/log/error.log 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}	122	@${ECHO_CMD} "@unexec rm -f ${DATADIR}/log/error.log* 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}
120	@${ECHO_CMD} "@unexec rm -Rf ${DATADIR}/apm-workspace 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}	123	@${ECHO_CMD} "@unexec rm -Rf ${DATADIR}/apm-workspace 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}
121	@${ECHO_CMD} "@unexec rm -Rf ${DATADIR}/etc/daemontools/supervise 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}	124	@${ECHO_CMD} "@unexec rm -Rf ${DATADIR}/etc/daemontools/supervise 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}
122	@${FIND} -s ${WRKSRC} -not -type d \	125	@${FIND} -s ${WRKSRC} -not -type d \
Lines 124-132 Link Here
124	@${FIND} -s -d ${WRKSRC} -type d \	127	@${FIND} -s -d ${WRKSRC} -type d \
125	\| ${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}	128	\| ${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
126	@${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}	129	@${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
127	@${ECHO_CMD} "@cd ${DTSERVICEBASE}" >> ${TMPPLIST}	130
128	@${ECHO_CMD} "${OPENACS_USER}" >> ${TMPPLIST}	131	if [ ${DT} ] ; then \
129	@${ECHO_CMD} "@unexec rmdir ${DTSERVICEBASE} 2>&1 > /dev/null \|\| true" >> ${TMPPLIST}	132	@${MKDIR} ${DTSERVICEBASE} ; \
		133	@${TEST} -L ${DTSERVICEBASE}/${OPENACS_USER} \|\| ${LN} -s ${OPENACSBASE}/${OPENACS_USER}/etc/daemontools ${DTSERVICEBASE}/${OPENACS_USER} ; \
		134	@${ECHO_CMD} "@cd ${DTSERVICEBASE}" >> ${TMPPLIST} ; \
		135	@${ECHO_CMD} "${OPENACS_USER}" >> ${TMPPLIST} ; \
		136	@${ECHO_CMD} "@unexec rmdir ${DTSERVICEBASE} 2>&1 > /dev/null \|\| true" >> ${TMPPLIST} ; \
		137	fi
130		138
131	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	139	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
132	@${CAT} ${PKGMESSAGE}	140	@${CAT} ${PKGMESSAGE}

Lines 8-13 Link Here

(-)files/pkg-install.in (-3 / +12 lines)
8	OPENACS_GROUP=%%OPENACS_GROUP%%	8	OPENACS_GROUP=%%OPENACS_GROUP%%
9	OPENACS_USER=%%OPENACS_USER%%	9	OPENACS_USER=%%OPENACS_USER%%
10	DB=%%DB%%	10	DB=%%DB%%
		11	DT=%%DT%%
11	PGDATA=%%PGDATA%%	12	PGDATA=%%PGDATA%%
12	PG_USER=%%PG_USER%%	13	PG_USER=%%PG_USER%%
13	PGBASE=%%PGBASE%%	14	PGBASE=%%PGBASE%%
Lines 82-87 Link Here
82	echo "${RCCONF}: adding entries" && \	83	echo "${RCCONF}: adding entries" && \
83	echo "# OPENACS-entries in rc.conf:" >> ${RCCONF} && \	84	echo "# OPENACS-entries in rc.conf:" >> ${RCCONF} && \
84	echo "ldconfig_paths=\"/usr/lib/compat /usr/X11R6/lib ${LOCALBASE}/lib ${PGBASE}/lib ${AOLSERVERBASE}/lib\" " >> ${RCCONF} && \	85	echo "ldconfig_paths=\"/usr/lib/compat /usr/X11R6/lib ${LOCALBASE}/lib ${PGBASE}/lib ${AOLSERVERBASE}/lib\" " >> ${RCCONF} && \
		86	echo "postgresql_enable=\"YES\"" >> ${RCCONF} && \
		87	echo "postgresql_data=\"${PGDATA}\"" >> ${RCCONF} && \
		88	echo "postgresql_flags=\" -l ${PGDATA}/server.log\"" >> ${RCCONF} && \
		89	echo "aolserver_enable=\"YES\"" >> ${RCCONF} && \
		90	echo "aolserver_conf=\"${OPENACSBASE}/${OPENACS_USER}/etc/config.tcl\"" >> ${RCCONF} && \
		91	echo "aolserver_flags=\"-u ${OPENACS_USER} -g ${OPENACS_GROUP} -b 0.0.0.0:8000\"" >> ${RCCONF} && \
		92	echo "aolserver_prog=\"${EXAMPLESDIR}/nsd-postgres\"" >> ${RCCONF} && \
85	echo "# end of OPENACS-entries." >> ${RCCONF}	93	echo "# end of OPENACS-entries." >> ${RCCONF}
86	fi	94	fi
87		95
Lines 107-115 Link Here
107	echo "Set permissions of files"	115	echo "Set permissions of files"
108	chmod -R 770 ${OPENACSBASE}/${OPENACS_USER}	116	chmod -R 770 ${OPENACSBASE}/${OPENACS_USER}
109	chmod -R 770 ${EXAMPLESDIR}	117	chmod -R 770 ${EXAMPLESDIR}
110	chmod -R 755 ${DTSERVICEBASE}/${OPENACS_USER}	118	if [ ${DT} ] ; then \
111	chmod 1755 ${DTSERVICEBASE}	119	chmod -R 755 ${DTSERVICEBASE}/${OPENACS_USER} ; \
112		120	chmod 1755 ${DTSERVICEBASE} ; \
		121	fi
113	chown -R ${OPENACS_USER}:${OPENACS_GROUP} ${OPENACSBASE}/${OPENACS_USER}	122	chown -R ${OPENACS_USER}:${OPENACS_GROUP} ${OPENACSBASE}/${OPENACS_USER}
114	chown root:${OPENACS_GROUP} ${EXAMPLESDIR}/nsd-postgres ${EXAMPLESDIR}/nsd-oracle	123	chown root:${OPENACS_GROUP} ${EXAMPLESDIR}/nsd-postgres ${EXAMPLESDIR}/nsd-oracle
115		124

Lines 34-40 Link Here

(-)files/pkg-message.in (-1 / +1 lines)
34	should work just fine.	34	should work just fine.
35		35
36	To view your pages at port 80 you will have to change:	36	To view your pages at port 80 you will have to change:
37	daemontools/run and config.tcl in	37	%%RCCONF%%, daemontools/run and config.tcl in
38	%%VIRTUALBASE%%/aolserver/%%OPENACS_USER%%/etc.	38	%%VIRTUALBASE%%/aolserver/%%OPENACS_USER%%/etc.
39		39
40	If you install .LRN as well as openACS the IP address in config.tcl	40	If you install .LRN as well as openACS the IP address in config.tcl

Return to bug 86659