AW: [LinuxFailSafe] apache resource script patch

[Martin Bene]

This is a multi-part message in MIME format.

------_=_NextPart_001_01C1F784.05B8210A
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

Hi Lars,

> OK. I just try to prevent adding additional parameters to the=20
> instance ;-)=20

understandable - changing the resource definition is a pain in the neck =
from
a compatibility point of view.

> The original resource I had had the path to the=20
> apache binary as a configureable option, but that didn't work=20
> out too well.

> What about this: The resource name is actually pretty much=20
> unused so far. What if the script tried to source a=20
> "profile.<resource name>", similiar to how it
> finds the httpd.conf ?

Ok, that IS a feasible alternative. should work fine for me without =
changing
the existing resource parameters. actually, we don't even need the =
resource
name here I think: since the httpd.conf filename is already hardcoded
(relative to server root), we know that the server root is resource
specific. we can just use an "apache_profile" file in the same directory
where httpd.conf is.

> It probably should also look for the httpd binary in
> $server_root/(s)bin/httpd, while I am at it.

$server_root/bin/httpd: yes, don't think the sbin version makes sense =
here.

Which should give a patch somewhat like the attached.

Bye, Martin

------_=_NextPart_001_01C1F784.05B8210A
Content-Type: application/octet-stream;
	name="apache.diff"
Content-Transfer-Encoding: base64
Content-Description: apache.diff
Content-Disposition: attachment;
	filename="apache.diff"

SW5kZXg6IGNsdXN0ZXJfc2VydmljZXMvY21kL3NybS9zY3JpcHRzL2FwYWNoZS9hcGFjaGVfbGli
LnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvZmFpbHNhZmUvRmFpbFNhZmUvY2x1c3Rlcl9z
ZXJ2aWNlcy9jbWQvc3JtL3NjcmlwdHMvYXBhY2hlL2FwYWNoZV9saWIuc2gsdgpyZXRyaWV2aW5n
IHJldmlzaW9uIDEuNApkaWZmIC11IC1yMS40IGFwYWNoZV9saWIuc2gKLS0tIGNsdXN0ZXJfc2Vy
dmljZXMvY21kL3NybS9zY3JpcHRzL2FwYWNoZS9hcGFjaGVfbGliLnNoCTIwMDEvMDMvMDcgMjE6
Mzc6MzMJMS40CisrKyBjbHVzdGVyX3NlcnZpY2VzL2NtZC9zcm0vc2NyaXB0cy9hcGFjaGUvYXBh
Y2hlX2xpYi5zaAkyMDAyLzA1LzA5IDE4OjAwOjA2CkBAIC03Myw3ICs3MywxMCBAQAogICAgIGxv
Y2FsIFJFU09VUkNFUz0iJDEiCiAgICAgbG9jYWwgQVBBQ0hFPQogICAgIGxvY2FsIFNFUlZFUl9D
T05GPQorICAgIGxvY2FsIFNFUlZFUl9QUk9GSUxFPQogCisgICAgbG9jYWwgc2VydmVyX3Jvb3Q9
JChzMl9nZXRfYXR0cmlidXRlX3ZhbHVlIHNlcnZlci1yb290ICIkUkVTT1VSQ0VTIikKKwogICAg
ICMgZmluZCB0aGUgbG9jYXRpb24gb2YgdGhlIHNlcnZlciBiaW5hcnkKICAgICBpZiBbIC14IC91
c3Ivc2Jpbi9odHRwZCBdIDsgdGhlbgogCUFQQUNIRT0vdXNyL3NiaW4vaHR0cGQKQEAgLTgxLDEy
ICs4NCwxNCBAQAogCUFQQUNIRT0vdXNyL2Jpbi9odHRwZAogICAgIGVsaWYgWyAteCAvdXNyL3Ni
aW4vYXBhY2hlIF0gOyB0aGVuCiAJQVBBQ0hFPS91c3Ivc2Jpbi9hcGFjaGUKKyAgICBlbGlmIFsg
LXggL3Vzci9sb2NhbC9hcGFjaGUvYmluL2h0dHBkIF0gOyB0aGVuCisJQVBBQ0hFPS91c3IvbG9j
YWwvYXBhY2hlL2Jpbi9odHRwZAorICAgIGVsaWYgWyAteCAkc2VydmVyX3Jvb3QvYmluL2h0dHBk
IF0gOyB0aGVuCisJQVBBQ0hFPSRzZXJ2ZXJfcm9vdC9iaW4vaHR0cGQKICAgICBlbHNlCiAJQVBB
Q0hFPS91c3IvYmluL2FwYWNoZQogICAgIGZpCiAKLSAgICBsb2NhbCBzZXJ2ZXJfcm9vdD0kKHMy
X2dldF9hdHRyaWJ1dGVfdmFsdWUgc2VydmVyLXJvb3QgIiRSRVNPVVJDRVMiKQotCiAgICAgIyBz
ZXQgdGhlIHNlcnZlciByb290IGFuZCB0aGUgcHJpbWFyeSBjb25maWcgZmlsZS4KICAgICBpZiBb
IC1mICR7c2VydmVyX3Jvb3R9L2NvbmYvaHR0cGQuY29uZiBdIDsgdGhlbgogCVNFUlZFUl9DT05G
PSR7c2VydmVyX3Jvb3R9L2NvbmYvaHR0cGQuY29uZgpAQCAtOTksNiArMTA0LDEzIEBACiAgICAg
ICAgIHMyX2V4aXQgMQogICAgIGZpCiAKKyAgICAjIHNldCBwcm9maWxlIHNjcmlwdCBmb3IgcmVz
b3VyY2UgLSBzcGVjaWZpYyBjb25maWd1cmF0aW9uCisgICAgaWYgWyAteCAke3NlcnZlcl9yb290
fS9jb25mL2FwYWNoZV9wcm9maWxlIF0gOyB0aGVuCisJU0VSVkVSX1BST0ZJTEU9JHtzZXJ2ZXJf
cm9vdH0vY29uZi9hcGFjaGVfcHJvZmlsZQorICAgIGVsaWYgWyAteCAke3NlcnZlcl9yb290fS9h
cGFjaGVfcHJvZmlsZSBdIDsgdGhlbgorCVNFUlZFUl9QUk9GSUxFPSR7c2VydmVyX3Jvb3R9L2Fw
YWNoZV9wcm9maWxlCisgICAgZmkKKwogICAgICMgbWlnaHQgYXMgd2VsbCBncmFiIHRoZSBQSUQg
ZmlsZS4uLgogICAgIEhUVFBfUElEX0ZJTEU9YGF3ayAnL15QaWRGaWxlLyB7cHJpbnQgJDI7IGV4
aXQgMH0nICR7U0VSVkVSX0NPTkZ9YAogCkBAIC0xMDksNiArMTIxLDcgQEAKICAgICBlY2hvICJz
ZXJ2ZXItY29uZiAkU0VSVkVSX0NPTkYiCiAgICAgZWNobyAiYXBhY2hlLWJpbiAkQVBBQ0hFIgog
ICAgIGVjaG8gInBpZC1maWxlICRIVFRQX1BJRF9GSUxFIgorICAgIGVjaG8gInNlcnZlci1wcm9m
aWxlICRTRVJWRVJfUFJPRklMRSIKIAogICAgIHJldHVybiAwCiB9CkBAIC0xMzMsNiArMTQ2LDcg
QEAKICAgICBmaQogICAgIGxvY2FsIHNlcnZlcl9yb290PSQoczJfZ2V0X2F0dHJpYnV0ZV92YWx1
ZSBzZXJ2ZXItcm9vdCAiJFJFU09VUkNFUyIpCiAgICAgbG9jYWwgc2VydmVyX2NvbmY9JChzMl9n
ZXRfYXR0cmlidXRlX3ZhbHVlIHNlcnZlci1jb25mICIkUkVTT1VSQ0VTIikKKyAgICBsb2NhbCBz
ZXJ2ZXJfcHJvZmlsZT0kKHMyX2dldF9hdHRyaWJ1dGVfdmFsdWUgc2VydmVyLXByb2ZpbGUgIiRS
RVNPVVJDRVMiKQogICAgIGlmIFsgLXogIiRzZXJ2ZXJfcm9vdCIgLW8gISAtZCAiJHNlcnZlcl9y
b290IiAtbyBcCiAJIC16ICIkc2VydmVyX2NvbmYiIC1vICEgLWYgIiRzZXJ2ZXJfY29uZiIgXSA7
IHRoZW4KIAllY2hvICJBcGFjaGU6IFNlcnZlclJvb3Qgb3IgaHR0cGQuY29uZiBub3QgYXZhaWxh
YmxlLCBhYm9ydGluZyBzdGFydCIgPiAke1NUQVRGSUxFfSAyPiYxCkBAIC0xNDIsNiArMTU2LDkg
QEAKICAgICBpZiBbIC16ICIkZGVmYXVsdF9wYWdlIiAtbyAhIC1mICIkZGVmYXVsdF9wYWdlIiBd
IDsgdGhlbgogCWVjaG8gIkFwYWNoZTogZGVmYXVsdC1wYWdlLWxvY2F0aW9uIFwiJGRlZmF1bHRf
cGFnZVwiIG5vdCBhdmFpbGFibGUsIGFib3J0aW5nIHN0YXJ0IiA+ICR7U1RBVEZJTEV9IDI+JjEK
IAlyZXR1cm4gMQorICAgIGZpCisgICAgaWYgWyAtbiAiJHNlcnZlcl9wcm9maWxlIiAtYSAteCAi
JHNlcnZlcl9wcm9maWxlIiBdIDsgdGhlbgorCS4gJHNlcnZlcl9wcm9maWxlCiAgICAgZmkKICAg
ICBsb2NhbCBIQV9DTUQ9IiR7YXBhY2hlfSAtZCAke3NlcnZlcl9yb290fSAtZiAke3NlcnZlcl9j
b25mfSIKICAgICBzMl9ydW5fY29tbWFuZCAiJHtIQV9DTUR9IiAic3RhcnRpbmcgdGhlIHdlYnNl
cnZlciBzZXJ2ZXIgbG9jYXRlZCBhdCAkc2VydmVyX3Jvb3QiICA+ICRTVEFURklMRSAyPiYxCg==

------_=_NextPart_001_01C1F784.05B8210A--