aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-08-06 06:21:05 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-08-06 06:25:03 +0000
commitde3901a821e4e6567c13cb005a2ed74b1b34bde1 (patch)
tree630163364be3bf037fbf3f80abebc0b38b92f193
parentfdab5d06edc8e48314f0b47f33dd13c5cf8dccf1 (diff)
downloadaports-de3901a821e4e6567c13cb005a2ed74b1b34bde1.tar.bz2
aports-de3901a821e4e6567c13cb005a2ed74b1b34bde1.tar.xz
main/apache2: create pid dir at startup. ignore missing conf.d/*.conf
fixes #2171
-rw-r--r--main/apache2/APKBUILD14
-rwxr-xr-xmain/apache2/apache2.initd1
-rw-r--r--main/apache2/httpd.conf2
3 files changed, 9 insertions, 8 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index db5d211c85..b3b79230b6 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apache2
pkgver=2.4.6
-pkgrel=0
+pkgrel=1
pkgdesc="A high performance Unix-based HTTP server"
url="http://httpd.apache.org/"
arch="all"
@@ -203,8 +203,8 @@ _lua() {
md5sums="ea5e361ca37b8d7853404419dd502efe httpd-2.4.6.tar.bz2
e322b5211e49511cac6e40c86af1b1da apache2.confd
75fe4138b98fcffd01b8c8c077b944f3 apache2.logrotate
-7105fc70298b24bfca6dba517f7486d7 apache2.initd
-cceb6f5c3949326b48e0fcf196a2495d httpd.conf
+cda94e6ec9e6f0322db0f32de2b3d68d apache2.initd
+d99af87f64688e7e62703ca27fcfe3bd httpd.conf
5d0d024ca43571b863874ab871b2c109 ssl.conf
b70fe826486043e3953cfe21f9e6fa16 ldap.conf
fe26a0a70f572eb256a3c6c183a62223 proxy-html.conf
@@ -214,8 +214,8 @@ c66ff5f70260d5266e6803a59b39bd7f alpine.layout"
sha256sums="dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea httpd-2.4.6.tar.bz2
8b0ce62fc4e7cea3801744969d0b2390e28e4d11dd533816eb91e9d7af225500 apache2.confd
dabf43e11c941125c771d2f4f5dadd1038906420716b747dfc8f5a946a0bdad5 apache2.logrotate
-3ee9541be1a60bd3577e5469e46d83625e7d01f4cf9df058f8b1408df61d4db3 apache2.initd
-c64fd8078d9905b4a2ad758b1bef3365642dc846178dfaa8704b63b27382c78f httpd.conf
+312a35bddc4f6e78d2f951be02e46ac48a13a19038cbc480cb6b498120c65636 apache2.initd
+758f7dca0070544697247e42338fc72511eb8927055fc66e8b1b39592b236e67 httpd.conf
5c97ba711b062427682c342e233bb81a8c1b62f714ca25143e856a47f3f0c031 ssl.conf
25771023d7c921a13c792607d47bd716c92698b20af21c018f0922eaf79a9604 ldap.conf
2511d6ea64c0f253b219670c445ed4f403f94caba5fb05e0b9600f0d107e1dda proxy-html.conf
@@ -225,8 +225,8 @@ cf0033a245d1d7752539613b6c92beaea9c0a755e7a877c8d41a2d4fd0f3eb22 alpine.layout"
sha512sums="8ade7ec5291f07a60e279f7a73a79c11c150dbf09c9e7b059e136fcb250130aa0f381b118f84e230184b065d452d5e946df8a5766991be8cdc6e8f5d4c4bac01 httpd-2.4.6.tar.bz2
e0a0b87889eff01e8a1ee21853d26c0307ceb87428727e60819d29644d8e54e9bfc08c197924567bed26befc904f8384af19516aea849f3cd6859d76b175b742 apache2.confd
566a8c469ef148dfbb9449e91d6fb93baf85d06a31a52c283a7e402aef7bfa8b46c34ebed91c76b3e5a2cc606660145e8fc63fa41bdb22574c7efc4fc4d993e5 apache2.logrotate
-9d6b9de14435acbdbb9526f7dfa9b190a36442a8b7b7cf1875f76a6b340d90551ffe0441b51c2909d5f6914a771a09d4b1436607fc5fc56a7e0314e7f4ca298b apache2.initd
-3f146155bd4fe03d3d3a66c1dc7ebdf5830d633158b457381ea65d82d1f15a506953cfde09a7306daa455d0beadb8a60952e889ffd5c4bc803c5a933ea3316e5 httpd.conf
+64480330f8a73c0b9c5a59a6a22c41869dd2593c97b3a4715f4e97670a4cbf8414986fa504f278042a081faad519d35294c1d9267a561bbffaa1739a491377f8 apache2.initd
+ddbf077826ea16c9ecafea7b606adad04d5f4ce126f0d64fe677d9b6f4d81fddcd83a3f9d73c5c734ea0012e69c44c9d81bd0d4864aa4111045ab20f68cfbd13 httpd.conf
07493965ba04d29ad9bc94bf21cf9bdad74947952c61a1050f1f9ff60d8d08d6b4f9de107ca01b9c3f2764b9bc55ce0777cfaf9005dbbfa050a423b513acfda9 ssl.conf
fbdc28ea4b94af91640794945ac4e1f45e4200e54d5bdf64c0c03fc8bdb589e444cc4f7dd0b70b696c0e5e033c8489b8bd8f8fd090906c4379651c7d032c2449 ldap.conf
263149f4a0b515e3b6d162ff282ffa90f8a448c10eb7185aec0caf75af7691b5486fa74ebe4fd46ae0ccdcf226a227705b4be4c23ed12b6d0c0aedd94a348810 proxy-html.conf
diff --git a/main/apache2/apache2.initd b/main/apache2/apache2.initd
index 537f435ab2..4c994dff53 100755
--- a/main/apache2/apache2.initd
+++ b/main/apache2/apache2.initd
@@ -55,6 +55,7 @@ checkconfig() {
}
start() {
+ checkpath --directory /var/run/apache2
checkconfig || return 1
[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
diff --git a/main/apache2/httpd.conf b/main/apache2/httpd.conf
index dd1258808d..1166d8d24e 100644
--- a/main/apache2/httpd.conf
+++ b/main/apache2/httpd.conf
@@ -269,7 +269,7 @@ LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
#
# Load config files from the config directory "/etc/apache2/conf.d".
#
-Include /etc/apache2/conf.d/*.conf
+IncludeOptional /etc/apache2/conf.d/*.conf
#
# ExtendedStatus controls whether Apache will generate "full" status