diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2005-01-11 13:45:05 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2005-01-11 13:45:05 +0000 |
| commit | 4e80ec5376deeec3778cd3347e3ae4b716488507 (patch) | |
| tree | e1220bd15d70999277d9caedcc9df15cf27aadd1 /www/apache2 | |
| parent | - Utilize MASTER_SITE_MYSQL instead of tons urls (diff) | |
o startup script:
- Use apache{2,21}flags variable in apache{2,21}_checkconfig().
It fixes restart when apache2ssl_enable is set to YES in rc.conf
and httpd.conf is "old" (i.e. non -DSSL safe) [1]
o Makefile
- split post-install target to add install-startup-script:
User can now upgrade startup script without reinstalling apache2.
NOTE: this is NOT package-safe and NOT supported, even if in most of
cases they're no risk.
Noticed by: many [1]
Notes
Notes:
svn path=/head/; revision=126134
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 19 | ||||
| -rw-r--r-- | www/apache2/files/apache.sh | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 9f5fe1850521..5c2185379271 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -219,13 +219,22 @@ post-configure: pre-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -post-install: - @${MKDIR} ${PREFIX}/etc/apache2/envvars.d - @${MKDIR} ${PREFIX}/etc/apache2/Includes +install-startup-script: +.if !exists(${WRKDIR}/apache2libs.sh) || !exists(${WRKDIR}/apache2.sh) + @${MKDIR} ${WRKDIR} + @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh + @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh +.endif @${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script." - @${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh + @${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh @${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script." - @${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh + @${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh + +post-install: install-startup-script + @${MKDIR} ${PREFIX}/etc/apache2/envvars.d + @${MKDIR} ${PREFIX}/etc/apache2/Includes @${ECHO_CMD} "" @${CAT} ${PKGMESSAGE} diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh index fc71c2890619..e3e6d6611af7 100644 --- a/www/apache2/files/apache.sh +++ b/www/apache2/files/apache.sh @@ -49,7 +49,7 @@ checkyesno apache2ssl_enable && \ apache2_checkconfig() { echo "Performing sanity check on apache2 configuration:" - ${command} -t + ${command} ${apache2_flags} -t } apache2_precmd() |