[arch-commits] Commit in apache/repos (14 files)

Pierre Schmitz pierre at nymeria.archlinux.org
Fri May 31 03:20:48 EDT 2013


    Date: Friday, May 31, 2013 @ 09:20:48
  Author: pierre
Revision: 186782

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  apache/repos/staging-i686/
  apache/repos/staging-i686/PKGBUILD
    (from rev 186781, apache/trunk/PKGBUILD)
  apache/repos/staging-i686/apache.install
    (from rev 186781, apache/trunk/apache.install)
  apache/repos/staging-i686/apache.tmpfiles.conf
    (from rev 186781, apache/trunk/apache.tmpfiles.conf)
  apache/repos/staging-i686/arch.layout
    (from rev 186781, apache/trunk/arch.layout)
  apache/repos/staging-i686/httpd.logrotate
    (from rev 186781, apache/trunk/httpd.logrotate)
  apache/repos/staging-i686/httpd.service
    (from rev 186781, apache/trunk/httpd.service)
  apache/repos/staging-x86_64/
  apache/repos/staging-x86_64/PKGBUILD
    (from rev 186781, apache/trunk/PKGBUILD)
  apache/repos/staging-x86_64/apache.install
    (from rev 186781, apache/trunk/apache.install)
  apache/repos/staging-x86_64/apache.tmpfiles.conf
    (from rev 186781, apache/trunk/apache.tmpfiles.conf)
  apache/repos/staging-x86_64/arch.layout
    (from rev 186781, apache/trunk/arch.layout)
  apache/repos/staging-x86_64/httpd.logrotate
    (from rev 186781, apache/trunk/httpd.logrotate)
  apache/repos/staging-x86_64/httpd.service
    (from rev 186781, apache/trunk/httpd.service)

-------------------------------------+
 staging-i686/PKGBUILD               |  161 ++++++++++++++++++++++++++++++++++
 staging-i686/apache.install         |    7 +
 staging-i686/apache.tmpfiles.conf   |    1 
 staging-i686/arch.layout            |   22 ++++
 staging-i686/httpd.logrotate        |    6 +
 staging-i686/httpd.service          |   15 +++
 staging-x86_64/PKGBUILD             |  161 ++++++++++++++++++++++++++++++++++
 staging-x86_64/apache.install       |    7 +
 staging-x86_64/apache.tmpfiles.conf |    1 
 staging-x86_64/arch.layout          |   22 ++++
 staging-x86_64/httpd.logrotate      |    6 +
 staging-x86_64/httpd.service        |   15 +++
 12 files changed, 424 insertions(+)

Copied: apache/repos/staging-i686/PKGBUILD (from rev 186781, apache/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,161 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=apache
+pkgver=2.2.24
+pkgrel=2
+pkgdesc='A high performance Unix-based HTTP server'
+arch=('i686' 'x86_64')
+options=('!libtool')
+url='http://www.apache.org/dist/httpd'
+license=('APACHE')
+backup=(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
+        etc/logrotate.d/httpd)
+depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
+optdepends=('lynx: apachectl status')
+install=apache.install
+_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
+source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
+        http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
+        ${_itkurl}/02-rename-prefork-to-itk.patch
+        ${_itkurl}/03-add-mpm-to-build-system.patch
+        ${_itkurl}/04-correct-output-makefile-location.patch
+        ${_itkurl}/05-add-copyright.patch
+        ${_itkurl}/06-hook-just-after-merging-perdir-config.patch
+        ${_itkurl}/07-base-functionality.patch
+        ${_itkurl}/08-max-clients-per-vhost.patch
+        ${_itkurl}/09-capabilities.patch
+        ${_itkurl}/10-nice.patch
+        ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
+        apache.tmpfiles.conf
+        httpd.logrotate
+        httpd.service
+        arch.layout)
+md5sums=('91bd1484aca13a7095d6432be37fc7ae'
+         'SKIP'
+         'f1d9d41360908ceb2374da55ae99197a'
+         'cdfa04985a0efa850976aef01c2a0c40'
+         '0930d2d0612eb0a53a0d00aea7e8687f'
+         '3a0c29bb91442c33ea73ebbe072af922'
+         '0ef4729a6f1ffc848ad0e9b440a66f66'
+         '940944caa948340b11ddae56adaef89b'
+         'ce09a987523884de8838f73dc8ec0d19'
+         'e75b7dd8d8afcd299ba4ab2ab81c11e4'
+         'ce1ccc21f3ad8625169c8f62913450ac'
+         '1e5b222edcfbf99a3edc56fcb2074fbe'
+         '82068753dab92fe86312b1010a2904d7'
+         '13dbaaf949c5bc36cfcf5718b95cb020'
+         'a823bb355c136fd0e2b3fb820e2d903c'
+         '6b7122245a67597230a3b3f317eaf34e')
+
+build() {
+	cd "${srcdir}/httpd-${pkgver}"
+
+	# set default user
+	sed -e 's#User daemon#User http#' \
+	    -e 's#Group daemon#Group http#' \
+	    -i docs/conf/httpd.conf.in
+
+	cat "${srcdir}/arch.layout" >> config.layout
+
+	cd ..
+	cp -r httpd-${pkgver} httpd-itk-${pkgver}
+
+	cd httpd-itk-${pkgver}
+	
+	# Fix patch to apply with latest Apache version
+	sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
+
+	mkdir -p server/mpm/experimental/itk
+	cp -r server/mpm/prefork/* server/mpm/experimental/itk/
+	mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
+
+	patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
+	patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
+	patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
+	patch -Np1 -i "${srcdir}/05-add-copyright.patch"
+	patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
+	patch -Np1 -i "${srcdir}/07-base-functionality.patch"
+	patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
+	patch -Np1 -i "${srcdir}/09-capabilities.patch"
+	patch -Np1 -i "${srcdir}/10-nice.patch"
+	patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
+
+	autoconf
+	cd ..
+	for mpm in prefork worker itk; do
+		if [ "${mpm}" = "itk" ]; then
+			CONFIGURE=../httpd-itk-${pkgver}/configure
+		else
+			CONFIGURE=../httpd-${pkgver}/configure
+		fi
+
+		mkdir build-${mpm}
+		pushd build-${mpm}
+		$CONFIGURE --enable-layout=Arch \
+			--enable-modules=all \
+			--enable-mods-shared=all \
+			--enable-so \
+			--enable-suexec \
+			--with-suexec-caller=http \
+			--with-suexec-docroot=/srv/http \
+			--with-suexec-logfile=/var/log/httpd/suexec.log \
+			--with-suexec-bin=/usr/bin/suexec \
+			--with-suexec-uidmin=99 --with-suexec-gidmin=99 \
+			--enable-ldap --enable-authnz-ldap \
+			--enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
+			--enable-ssl --with-ssl \
+			--enable-deflate --enable-cgid \
+			--enable-proxy --enable-proxy-connect \
+			--enable-proxy-http --enable-proxy-ftp \
+			--enable-dbd \
+			--with-apr=/usr/bin/apr-1-config \
+			--with-apr-util=/usr/bin/apu-1-config \
+			--with-pcre=/usr \
+			--with-mpm=${mpm}
+		make
+		popd
+	done
+}
+
+package() {
+	cd "${srcdir}"
+	cd build-prefork
+	make DESTDIR="${pkgdir}" install
+	cd ..
+	
+	install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker"
+	install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk"
+
+	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
+	install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
+
+	# symlinks for /etc/httpd
+	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
+	ln -fs /run/httpd "${pkgdir}/etc/httpd/run"
+	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"
+
+	# cleanup
+	rm -rf "${pkgdir}/usr/share/httpd/manual"
+	rm -rf "${pkgdir}/etc/httpd/conf/original"
+	rm -rf "${pkgdir}/srv/"
+	rm -rf "${pkgdir}/run"
+
+        install -m755 -d "${pkgdir}/usr/lib/systemd/system"
+        install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/"
+}

Copied: apache/repos/staging-i686/apache.install (from rev 186781, apache/trunk/apache.install)
===================================================================
--- staging-i686/apache.install	                        (rev 0)
+++ staging-i686/apache.install	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,7 @@
+post_install() {
+  systemd-tmpfiles --create apache.conf
+}
+
+post_upgrade() {
+  systemd-tmpfiles --create apache.conf
+}

Copied: apache/repos/staging-i686/apache.tmpfiles.conf (from rev 186781, apache/trunk/apache.tmpfiles.conf)
===================================================================
--- staging-i686/apache.tmpfiles.conf	                        (rev 0)
+++ staging-i686/apache.tmpfiles.conf	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -

Copied: apache/repos/staging-i686/arch.layout (from rev 186781, apache/trunk/arch.layout)
===================================================================
--- staging-i686/arch.layout	                        (rev 0)
+++ staging-i686/arch.layout	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,22 @@
+<Layout Arch>
+	prefix:          /etc/httpd
+	exec_prefix:     /usr
+	bindir:          /usr/bin
+	sbindir:         /usr/bin
+	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:      /run/httpd
+	logfiledir:      /var/log/httpd
+	proxycachedir:   /var/cache/httpd
+</Layout>
\ No newline at end of file

Copied: apache/repos/staging-i686/httpd.logrotate (from rev 186781, apache/trunk/httpd.logrotate)
===================================================================
--- staging-i686/httpd.logrotate	                        (rev 0)
+++ staging-i686/httpd.logrotate	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,6 @@
+/var/log/httpd/*log {
+   missingok
+   postrotate
+      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+   endscript
+}

Copied: apache/repos/staging-i686/httpd.service (from rev 186781, apache/trunk/httpd.service)
===================================================================
--- staging-i686/httpd.service	                        (rev 0)
+++ staging-i686/httpd.service	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/httpd/httpd.pid
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target

Copied: apache/repos/staging-x86_64/PKGBUILD (from rev 186781, apache/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,161 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=apache
+pkgver=2.2.24
+pkgrel=2
+pkgdesc='A high performance Unix-based HTTP server'
+arch=('i686' 'x86_64')
+options=('!libtool')
+url='http://www.apache.org/dist/httpd'
+license=('APACHE')
+backup=(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
+        etc/logrotate.d/httpd)
+depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
+optdepends=('lynx: apachectl status')
+install=apache.install
+_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
+source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
+        http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
+        ${_itkurl}/02-rename-prefork-to-itk.patch
+        ${_itkurl}/03-add-mpm-to-build-system.patch
+        ${_itkurl}/04-correct-output-makefile-location.patch
+        ${_itkurl}/05-add-copyright.patch
+        ${_itkurl}/06-hook-just-after-merging-perdir-config.patch
+        ${_itkurl}/07-base-functionality.patch
+        ${_itkurl}/08-max-clients-per-vhost.patch
+        ${_itkurl}/09-capabilities.patch
+        ${_itkurl}/10-nice.patch
+        ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
+        apache.tmpfiles.conf
+        httpd.logrotate
+        httpd.service
+        arch.layout)
+md5sums=('91bd1484aca13a7095d6432be37fc7ae'
+         'SKIP'
+         'f1d9d41360908ceb2374da55ae99197a'
+         'cdfa04985a0efa850976aef01c2a0c40'
+         '0930d2d0612eb0a53a0d00aea7e8687f'
+         '3a0c29bb91442c33ea73ebbe072af922'
+         '0ef4729a6f1ffc848ad0e9b440a66f66'
+         '940944caa948340b11ddae56adaef89b'
+         'ce09a987523884de8838f73dc8ec0d19'
+         'e75b7dd8d8afcd299ba4ab2ab81c11e4'
+         'ce1ccc21f3ad8625169c8f62913450ac'
+         '1e5b222edcfbf99a3edc56fcb2074fbe'
+         '82068753dab92fe86312b1010a2904d7'
+         '13dbaaf949c5bc36cfcf5718b95cb020'
+         'a823bb355c136fd0e2b3fb820e2d903c'
+         '6b7122245a67597230a3b3f317eaf34e')
+
+build() {
+	cd "${srcdir}/httpd-${pkgver}"
+
+	# set default user
+	sed -e 's#User daemon#User http#' \
+	    -e 's#Group daemon#Group http#' \
+	    -i docs/conf/httpd.conf.in
+
+	cat "${srcdir}/arch.layout" >> config.layout
+
+	cd ..
+	cp -r httpd-${pkgver} httpd-itk-${pkgver}
+
+	cd httpd-itk-${pkgver}
+	
+	# Fix patch to apply with latest Apache version
+	sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
+
+	mkdir -p server/mpm/experimental/itk
+	cp -r server/mpm/prefork/* server/mpm/experimental/itk/
+	mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
+
+	patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
+	patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
+	patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
+	patch -Np1 -i "${srcdir}/05-add-copyright.patch"
+	patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
+	patch -Np1 -i "${srcdir}/07-base-functionality.patch"
+	patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
+	patch -Np1 -i "${srcdir}/09-capabilities.patch"
+	patch -Np1 -i "${srcdir}/10-nice.patch"
+	patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
+
+	autoconf
+	cd ..
+	for mpm in prefork worker itk; do
+		if [ "${mpm}" = "itk" ]; then
+			CONFIGURE=../httpd-itk-${pkgver}/configure
+		else
+			CONFIGURE=../httpd-${pkgver}/configure
+		fi
+
+		mkdir build-${mpm}
+		pushd build-${mpm}
+		$CONFIGURE --enable-layout=Arch \
+			--enable-modules=all \
+			--enable-mods-shared=all \
+			--enable-so \
+			--enable-suexec \
+			--with-suexec-caller=http \
+			--with-suexec-docroot=/srv/http \
+			--with-suexec-logfile=/var/log/httpd/suexec.log \
+			--with-suexec-bin=/usr/bin/suexec \
+			--with-suexec-uidmin=99 --with-suexec-gidmin=99 \
+			--enable-ldap --enable-authnz-ldap \
+			--enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
+			--enable-ssl --with-ssl \
+			--enable-deflate --enable-cgid \
+			--enable-proxy --enable-proxy-connect \
+			--enable-proxy-http --enable-proxy-ftp \
+			--enable-dbd \
+			--with-apr=/usr/bin/apr-1-config \
+			--with-apr-util=/usr/bin/apu-1-config \
+			--with-pcre=/usr \
+			--with-mpm=${mpm}
+		make
+		popd
+	done
+}
+
+package() {
+	cd "${srcdir}"
+	cd build-prefork
+	make DESTDIR="${pkgdir}" install
+	cd ..
+	
+	install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker"
+	install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk"
+
+	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
+	install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
+
+	# symlinks for /etc/httpd
+	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
+	ln -fs /run/httpd "${pkgdir}/etc/httpd/run"
+	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"
+
+	# cleanup
+	rm -rf "${pkgdir}/usr/share/httpd/manual"
+	rm -rf "${pkgdir}/etc/httpd/conf/original"
+	rm -rf "${pkgdir}/srv/"
+	rm -rf "${pkgdir}/run"
+
+        install -m755 -d "${pkgdir}/usr/lib/systemd/system"
+        install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/"
+}

Copied: apache/repos/staging-x86_64/apache.install (from rev 186781, apache/trunk/apache.install)
===================================================================
--- staging-x86_64/apache.install	                        (rev 0)
+++ staging-x86_64/apache.install	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,7 @@
+post_install() {
+  systemd-tmpfiles --create apache.conf
+}
+
+post_upgrade() {
+  systemd-tmpfiles --create apache.conf
+}

Copied: apache/repos/staging-x86_64/apache.tmpfiles.conf (from rev 186781, apache/trunk/apache.tmpfiles.conf)
===================================================================
--- staging-x86_64/apache.tmpfiles.conf	                        (rev 0)
+++ staging-x86_64/apache.tmpfiles.conf	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -

Copied: apache/repos/staging-x86_64/arch.layout (from rev 186781, apache/trunk/arch.layout)
===================================================================
--- staging-x86_64/arch.layout	                        (rev 0)
+++ staging-x86_64/arch.layout	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,22 @@
+<Layout Arch>
+	prefix:          /etc/httpd
+	exec_prefix:     /usr
+	bindir:          /usr/bin
+	sbindir:         /usr/bin
+	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:      /run/httpd
+	logfiledir:      /var/log/httpd
+	proxycachedir:   /var/cache/httpd
+</Layout>
\ No newline at end of file

Copied: apache/repos/staging-x86_64/httpd.logrotate (from rev 186781, apache/trunk/httpd.logrotate)
===================================================================
--- staging-x86_64/httpd.logrotate	                        (rev 0)
+++ staging-x86_64/httpd.logrotate	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,6 @@
+/var/log/httpd/*log {
+   missingok
+   postrotate
+      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+   endscript
+}

Copied: apache/repos/staging-x86_64/httpd.service (from rev 186781, apache/trunk/httpd.service)
===================================================================
--- staging-x86_64/httpd.service	                        (rev 0)
+++ staging-x86_64/httpd.service	2013-05-31 07:20:48 UTC (rev 186782)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/httpd/httpd.pid
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list