From owner-svn-ports-head@FreeBSD.ORG Sun Nov 24 20:09:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48C7D378; Sun, 24 Nov 2013 20:09:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28E3E2332; Sun, 24 Nov 2013 20:09:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOK98rm094634; Sun, 24 Nov 2013 20:09:08 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOK97xe094630; Sun, 24 Nov 2013 20:09:07 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201311242009.rAOK97xe094630@svn.freebsd.org> From: Olli Hauer Date: Sun, 24 Nov 2013 20:09:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334786 - in head/www/apache24: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2013 20:09:08 -0000 Author: ohauer Date: Sun Nov 24 20:09:07 2013 New Revision: 334786 URL: http://svnweb.freebsd.org/changeset/ports/334786 Log: - add new directory for modules (APACHEETCDIR/modules.d) New modules can be registered here with a simple file that contains the LoadModule directives. Additonal Maintaines can write instructions to the conf file and keep pkg-message short. As bonus the config file can be installed like every other config file with a .sample extention so modules are not disabled during pkg upgrades. Module config files should begin with three digits followed by '_' e.g. 100_php5.conf. The load order can be controlled via the three digits. Please wait some time before adopting the new directory so users have time to update and adjust axisting configs - no revision bump, devel/apr was updated and we will see apache 2.2.7 in the next days (I only want to have the modules.d directory adopted) Added: head/www/apache24/files/README_modules.d (contents, props changed) Modified: head/www/apache24/Makefile head/www/apache24/files/patch-docs__conf__httpd.conf.in head/www/apache24/pkg-plist Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Sun Nov 24 20:08:15 2013 (r334785) +++ head/www/apache24/Makefile Sun Nov 24 20:09:07 2013 (r334786) @@ -64,7 +64,7 @@ SSL_USE= OPENSSL=yes .include -ETC_SUBDIRS= Includes envvars.d extra +ETC_SUBDIRS= Includes envvars.d extra modules.d .if ! ${PORT_OPTIONS:MDOCS} MAKE_ENV+= NOPORTDOCS=yes @@ -148,7 +148,8 @@ post-configure: post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} - @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ + ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ + ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${ETCDIR}/modules.d/ .if ${PORT_OPTIONS:MLOG_FORENSIC} @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin Added: head/www/apache24/files/README_modules.d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apache24/files/README_modules.d Sun Nov 24 20:09:07 2013 (r334786) @@ -0,0 +1,14 @@ +# =================================================== +# Directory for third party module config files. +# +# Modules can be disabled by adding a '#' in front +# of the "LoadModule" line e.g. "#LoadModule" +# +# Files are automatically included if the name +# begins with a three digit number followed by '_' +# and ending in '.conf' e.g. '080_mod_php.conf' +# +# Maintainers can also include instructions how to +# use the module (instead pkg-message). +# + Modified: head/www/apache24/files/patch-docs__conf__httpd.conf.in ============================================================================== --- head/www/apache24/files/patch-docs__conf__httpd.conf.in Sun Nov 24 20:08:15 2013 (r334785) +++ head/www/apache24/files/patch-docs__conf__httpd.conf.in Sun Nov 24 20:09:07 2013 (r334786) @@ -1,6 +1,16 @@ --- ./docs/conf/httpd.conf.in.orig 2012-11-08 04:05:38.000000000 +0100 +++ ./docs/conf/httpd.conf.in 2013-10-26 19:29:20.000000000 +0200 -@@ -74,8 +74,8 @@ +@@ -65,6 +65,9 @@ + # + @@LoadModule@@ + ++# Third party modules ++IncludeOptional @rel_sysconfdir@/modules.d/[0-9[0-9][0-9]_*.conf ++ + + # + # If you wish httpd to run as a different user or group, you must run +@@ -74,8 +77,8 @@ # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. # @@ -11,7 +21,7 @@ -@@ -181,7 +181,7 @@ +@@ -181,7 +184,7 @@ # logged here. If you *do* define an error logfile for a # container, that host's errors will be logged there and not here. # @@ -20,7 +30,7 @@ # # LogLevel: Control the number of messages logged to the error_log. -@@ -210,13 +210,13 @@ +@@ -210,13 +213,13 @@ # define per- access logfiles, transactions will be # logged therein and *not* in this file. # @@ -36,7 +46,7 @@ -@@ -418,3 +418,5 @@ +@@ -418,3 +421,5 @@ #RequestHeader unset DNT env=bad_DNT # Modified: head/www/apache24/pkg-plist ============================================================================== --- head/www/apache24/pkg-plist Sun Nov 24 20:08:15 2013 (r334785) +++ head/www/apache24/pkg-plist Sun Nov 24 20:09:07 2013 (r334786) @@ -10,6 +10,7 @@ bin/htpasswd bin/httxt2dbm bin/logresolve %%ETCDIR%%/Includes/no-accf.conf +%%ETCDIR%%/modules.d/README_modules.d include/apache24/ap_compat.h include/apache24/ap_config.h include/apache24/ap_config_auto.h @@ -558,6 +559,7 @@ sbin/split-logfile @dirrmtry libexec/apache24 @dirrmtry include/apache24 @unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true +@dirrmtry %%ETCDIR%%/modules.d @dirrmtry %%ETCDIR%%/extra @dirrmtry %%ETCDIR%%/envvars.d @dirrmtry %%ETCDIR%%/Includes