[arch-commits] Commit in apache/trunk (PKGBUILD apache.conf.d apachectl-confd.patch)

[Jan de Groot]

    Date: Saturday, March 6, 2010 @ 12:20:41
  Author: jgc
Revision: 71310

Add /etc/conf.d/apache support

Added:
  apache/trunk/apache.conf.d
  apache/trunk/apachectl-confd.patch
Modified:
  apache/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++++-
 apache.conf.d         |   15 +++++++++++++++
 apachectl-confd.patch |   15 +++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-06 17:17:42 UTC (rev 71309)
+++ PKGBUILD	2010-03-06 17:20:41 UTC (rev 71310)
@@ -10,7 +10,7 @@
 options=('!libtool')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
-backup=(etc/httpd/conf/httpd.conf
+backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
         etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
         etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
         etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
@@ -28,6 +28,8 @@
         ${_itkurl}/08-max-clients-per-vhost.patch
         ${_itkurl}/09-capabilities.patch
         ${_itkurl}/10-nice.patch
+        apachectl-confd.patch
+        apache.conf.d
         httpd.logrotate
         httpd
         arch.layout)
@@ -41,6 +43,8 @@
          '9f7a8935f9cabc7b46d0052906634cef'
          '1b28e3363e1b0d05b738a21e7ddd264f'
          'd9667fcd2ffecc63e446edd4d6666731'
+         '4ac64df6e019edbe137017cba1ff2f51'
+         '08b3c875f6260644f2f52b4056d656b0'
          'f4d627c64024c1b7b95efb5ffbaa625e'
          '9e001fbb082a08113e7f4bc431085c11'
          '3d659d41276ba3bfcb20c231eb254e0c')
@@ -48,6 +52,8 @@
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
 
+  patch -Np0 -i "${srcdir}/apachectl-confd.patch" || return 1
+
 	# set default user
 	sed -e 's#User daemon#User http#' \
 	    -e 's#Group daemon#Group http#' \
@@ -107,6 +113,7 @@
 
 	install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd" || return 1
 	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" || return 1
+  install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" || return 1
 
 	# symlinks for /etc/httpd
 	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"

Added: apache.conf.d
===================================================================
--- apache.conf.d	                        (rev 0)
+++ apache.conf.d	2010-03-06 17:20:41 UTC (rev 71310)
@@ -0,0 +1,15 @@
+# Configuration file for the httpd service.
+
+#
+# The default processing model (MPM) is the process-based
+# 'prefork' model. A thread-based model, 'worker', is also
+# available, but does not work with some modules (such as PHP).
+# The service must be stopped before changing this variable.
+#
+#HTTPD=/usr/sbin/httpd.worker
+
+#
+# To pass additional options (for instance, -D definitions) to the
+# httpd binary at startup, set OPTIONS here.
+#
+#OPTIONS=

Added: apachectl-confd.patch
===================================================================
--- apachectl-confd.patch	                        (rev 0)
+++ apachectl-confd.patch	2010-03-06 17:20:41 UTC (rev 71310)
@@ -0,0 +1,15 @@
+--- support/apachectl.in.orig	2010-03-06 18:09:11.000000000 +0100
++++ support/apachectl.in	2010-03-06 18:12:31.000000000 +0100
+@@ -56,6 +56,12 @@
+ # the URL to your server's mod_status status page.  If you do not
+ # have one, then status and fullstatus will not work.
+ STATUSURL="http://localhost:@PORT@/server-status"
++
++# Source /etc/conf.d/apache for $HTTPD setting, etc.
++if [ -r /etc/conf.d/apache ]; then
++    . /etc/conf.d/apache
++fi
++
+ #
+ # Set this variable to a command that increases the maximum
+ # number of file descriptors allowed per child process. This is