diff options
| author | root <root@rshg054.dnsready.net> | 2012-09-20 01:37:39 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-09-20 01:37:39 -0700 |
| commit | 005a14f92ef5d35e4c47d970cb7e69367a835958 (patch) | |
| tree | c9e998e38c83fe1d0947a0ceec528b45b4aaa1f1 /extra/apache | |
| parent | e8f387c8a45ee846f01fed02259d061d2d6e8d3d (diff) | |
Thu Sep 20 01:37:13 PDT 2012
Diffstat (limited to 'extra/apache')
| -rw-r--r-- | extra/apache/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/apache/httpd.service | 15 |
2 files changed, 29 insertions, 11 deletions
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index fd13bdd73..295d98174 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161295 2012-06-08 23:50:11Z heftig $ +# $Id: PKGBUILD 166855 2012-09-19 22:46:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.22 -pkgrel=4 +pkgver=2.2.23 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') @@ -37,10 +37,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 apache.tmpfiles.conf httpd.logrotate httpd - arch.layout - pcre_info.patch) -md5sums=('9fe3093194c8a57f085ff7c3fc43715f' - '41b3a6e4948679cab70b9caf490877c4' + httpd.service + arch.layout) +md5sums=('ca133de0e4b4b15316990a97186b9993' + '3289ae3b16e1a2dc633c811d6569abb6' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' @@ -56,13 +56,12 @@ md5sums=('9fe3093194c8a57f085ff7c3fc43715f' '82068753dab92fe86312b1010a2904d7' '6382331e9700ed9e8cc78ea51887b537' 'c7e300a287ef7e2e066ac7639536f87e' - '3d659d41276ba3bfcb20c231eb254e0c' - 'fde5121e32b5aeef5a7eedb5a97009ff') + 'ed219c8228d4d5ae9b7a55107cf79706' + '3d659d41276ba3bfcb20c231eb254e0c') build() { cd "${srcdir}/httpd-${pkgver}" - patch -p1 -i "${srcdir}/pcre_info.patch" patch -Np0 -i "${srcdir}/apachectl-confd.patch" # set default user @@ -133,7 +132,7 @@ build() { # symlinks for /etc/httpd ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" - ln -fs /var/run/httpd "${pkgdir}/etc/httpd/run" + 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" @@ -152,4 +151,8 @@ build() { rm -rf "${pkgdir}/srv/" rm -rf "${pkgdir}/usr/bin" rm -rf "${pkgdir}/var/run" + + + install -m755 -d "${pkgdir}/usr/lib/systemd/system" + install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/" } diff --git a/extra/apache/httpd.service b/extra/apache/httpd.service new file mode 100644 index 000000000..bb02b5992 --- /dev/null +++ b/extra/apache/httpd.service @@ -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/sbin/apachectl start +ExecStop=/usr/sbin/apachectl graceful-stop +ExecReload=/usr/sbin/apachectl graceful +PrivateTmp=true +LimitNOFILE=infinity + +[Install] +WantedBy=multi-user.target |