On Thu, Mar 19, 2009 at 12:36:31PM +1100, Nathan Scott wrote:
> Changes committed to git://oss.sgi.com/nathans/pcp.git
>
> VERSION.pcp | 2
> configure.in | 11 -----
> debian/changelog | 4 -
> src/pmdas/weblog/server.sh | 99
> ++++++++++-----------------------------------
> 4 files changed, 27 insertions(+), 89 deletions(-)
>
> commit 40f4eafd7bb6827ab4ca0b217af34c1eff3277a9
> Author: Nathan Scott <nathans@xxxxxxxxxx>
> Date: Thu Mar 19 12:29:46 2009 +1100
>
> Bump date stamp version number for packaging.
>
> commit f0ef5c68b5f650fff8fd7f34e84fabaf6a13238b
> Author: Nathan Scott <nathans@xxxxxxxxxx>
> Date: Thu Mar 19 12:28:11 2009 +1100
>
> Update weblog PMDA server.sh to detect apache correctly.
>
Sorry. Trying to catch up on reviews.
In this you change a list of paths to be a single entry. Redhat is
still deficient.
# look for Apache servers here
-# On Linux they live under /etc/httpd
-# Apache from Irix Freeware keeps its stuff in /usr/freeware/apache/etc
-# And by default it's in /usr/apache.
-# On IRIX, the bundled Apache maintains its files below
-# /var/sgi_apache/httpd-outbox
#
-APACHEPATH="${APACHEPATH-/etc/httpd:/usr/freeware/apache:/usr/apache:/var/sgi_apache/httpd-outbox}"
+APACHEPATH="${APACHEPATH-/etc/apache2}"
[root@quiero-admin ~]# cat /etc/redhat-release
Red Hat Enterprise Linux Server release 5.2 (Tikanga)
[root@quiero-admin ~]# ls /etc/apache2
ls: /etc/apache2: No such file or directory
[root@quiero-admin ~]# ls -l /etc/httpd/
total 8
drwxr-xr-x 2 root root 4096 Dec 30 01:47 conf
drwxr-xr-x 2 root root 4096 Mar 23 16:59 conf.d
lrwxrwxrwx 1 root root 19 Mar 23 16:22 logs -> ../../var/log/httpd
lrwxrwxrwx 1 root root 29 Mar 23 16:22 modules ->
../../usr/lib64/httpd/modules
lrwxrwxrwx 1 root root 13 Mar 23 16:22 run -> ../../var/run
[root@quiero-admin ~]#
so this change will break on redhat distros.
mh
|