[arch-commits] Commit in apache/trunk (PKGBUILD arch.layout httpd.logrotate)

[Pierre Schmitz]

    Date: Sunday, June 22, 2008 @ 07:06:44
  Author: pierre
Revision: 3340

some bugfixes; set some sane defaults

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/arch.layout
  apache/trunk/httpd.logrotate

-----------------+
 PKGBUILD        |   14 ++++++++++++--
 arch.layout     |   40 ++++++++++++++++++++--------------------
 httpd.logrotate |    2 +-
 3 files changed, 33 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-22 09:29:24 UTC (rev 3339)
+++ PKGBUILD	2008-06-22 11:06:44 UTC (rev 3340)
@@ -18,9 +18,9 @@
 source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2"
         'httpd.logrotate' 'httpd' 'arch.layout')
 md5sums=('3afa8137dc1999be695a20b62fdf032b'
-         'a13925eef67108cf22f6bd1b2b8decb1'
+         'f4d627c64024c1b7b95efb5ffbaa625e'
          'fb6baeced65b7cf5b80083f278adebba'
-         '2247f19a9fcfb73394c2a6221c4cb92c')
+         '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
 	cd ${srcdir}/httpd-${pkgver}
@@ -64,8 +64,18 @@
 	ln -fs /usr/lib/httpd/modules ${pkgdir}/etc/httpd/modules
 	ln -fs /usr/lib/httpd/build ${pkgdir}/etc/httpd/build
 
+	# set sane defaults
+	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
+	    -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
+	    -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
+	    -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
+	    -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
+	    -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
+	    -i ${pkgdir}/etc/httpd/conf/httpd.conf || return 1
+
 	# cleanup
 	rm -rf ${pkgdir}/usr/share/httpd/manual
+	rm -rf ${pkgdir}/etc/httpd/conf/original
 	rm -rf ${pkgdir}/srv/http/*
 	rmdir ${pkgdir}/usr/bin
 }
\ No newline at end of file

Modified: arch.layout
===================================================================
--- arch.layout	2008-06-22 09:29:24 UTC (rev 3339)
+++ arch.layout	2008-06-22 11:06:44 UTC (rev 3340)
@@ -1,22 +1,22 @@
 <Layout Arch>
-	prefix:        /usr
-	exec_prefix:   ${prefix}
-	bindir:        ${exec_prefix}/bin
-	sbindir:       ${exec_prefix}/sbin
-	libdir:        ${exec_prefix}/lib/httpd
-	libexecdir:    ${libdir}/modules
-	mandir:        ${prefix}/share/man
-	sysconfdir:    /etc/httpd/conf
-	datadir:       ${prefix}/share/httpd
-	installbuilddir: ${libdir}/build
-	errordir:      ${datadir}/error
-	iconsdir:      ${datadir}/icons
-	htdocsdir:     /srv/http
-	manualdir:     ${datadir}/manual
-	cgidir:        ${htdocsdir}/cgi-bin
-	includedir:    ${prefix}/include/httpd
-	localstatedir: /var
-	runtimedir:    /var/run/httpd
-	logfiledir:    /var/log/httpd
-	proxycachedir: /var/cache/httpd
+	prefix:          /etc/httpd
+	exec_prefix:     /usr
+	bindir:          /usr/bin
+	sbindir:         /usr/sbin
+	libdir:          /usr/lib/httpd
+	libexecdir:      /usr/lib/httpd/modules
+	mandir:          /usr/share/man
+	sysconfdir:      /etc/httpd/conf
+	datadir:         /usr/share/httpd
+	installbuilddir: /usr/lib/httpd/build
+	errordir:        /usr/share/httpd/error
+	iconsdir:        /usr/share/httpd/icons
+	htdocsdir:       /srv/http
+	manualdir:       /usr/share/httpd/manual
+	cgidir:          /srv/http/cgi-bin
+	includedir:      /usr/include/httpd
+	localstatedir:   /var
+	runtimedir:      /var/run/httpd
+	logfiledir:      /var/log/httpd
+	proxycachedir:   /var/cache/httpd
 </Layout>
\ No newline at end of file

Modified: httpd.logrotate
===================================================================
--- httpd.logrotate	2008-06-22 09:29:24 UTC (rev 3339)
+++ httpd.logrotate	2008-06-22 11:06:44 UTC (rev 3340)
@@ -1,5 +1,5 @@
 /var/log/httpd/*log {
    postrotate
-      /bin/kill -HUP `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
+      /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
    endscript
 }