rpms/netdisco/F-11 .cvsignore, 1.2, 1.3 netdisco.init, 1.3, 1.4 netdisco_config, 1.2, 1.3

[gouldwp]

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3640

Modified Files:
	.cvsignore netdisco.init netdisco_config 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jul 2009 05:27:18 -0000	1.2
+++ .cvsignore	6 Nov 2009 21:06:27 -0000	1.3
@@ -1,2 +1,3 @@
-netdisco-0.95.tar.gz
-netdisco-mibs-0.7.tar.gz
+netdisco-1.0.tar.gz
+INSTALL.fedora
+INSTALL.rhel


Index: netdisco.init
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netdisco.init	17 Sep 2009 22:02:17 -0000	1.3
+++ netdisco.init	6 Nov 2009 21:06:27 -0000	1.4
@@ -12,9 +12,9 @@
 # Provides: netdisco
 # Required-Start: $local_fs $network
 # Required-Stop: $local_fs $network
+# Default-Stop:
 # Short-Description: start and stop netdisco admin daemon 
-# Description: Netdisco is a network management application targeted at large
-# corporate and university networks. 
+# Description: Netdisco is a network management application targeted at large corporate and university networks.
 ### END INIT INFO
 
 


Index: netdisco_config
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco_config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netdisco_config	17 Sep 2009 22:02:17 -0000	1.2
+++ netdisco_config	6 Nov 2009 21:06:29 -0000	1.3
@@ -84,15 +84,34 @@ mv -f /tmp/netdisco.conf.$$ /etc/netdisc
 
 
 # Making Apache2 - Modperl2 changes
-cat /etc/httpd/conf.d/netdisco_apache.conf | sed 's/#LoadModule perl_module  libexec\/apache2\/mod_perl.so/LoadModule perl_module  \/usr\/lib\/httpd\/modules\/mod_perl.so/' > /tmp/netdisco_apache.conf.$$
+
+if [ `/bin/uname -i` == "i386" ]; then
+
+cat /etc/httpd/conf.d/netdisco_apache.conf | sed 's/libexec\/apache2\/mod_perl.so/\/usr\/lib\/httpd\/modules\/mod_perl.so/' > /tmp/netdisco_apache.conf.$$
 mv -f /tmp/netdisco_apache.conf.$$ /etc/httpd/conf.d/netdisco_apache.conf
 #
-cat /etc/httpd/conf.d/netdisco_apache.conf | sed 's/#LoadModule apreq_module libexec\/apache2\/mod_apreq2.so/LoadModule apreq_module \/usr\/lib\/httpd\/modules\/mod_apreq2.so/' > /tmp/netdisco_apache.conf.$$
+cat /etc/httpd/conf.d/netdisco_apache.conf | sed 's/libexec\/apache2\/mod_apreq2.so/\/usr\/lib\/httpd\/modules\/mod_apreq2.so/' > /tmp/netdisco_apache.conf.$$
 mv -f /tmp/netdisco_apache.conf.$$ /etc/httpd/conf.d/netdisco_apache.conf
-#
-cat /etc/httpd/conf.d/netdisco_apache.conf | sed 's/#PerlModule/PerlModule/' > /tmp/netdisco_apache.conf.$$
+
+  elif [ `/bin/uname -i` == "x86_64" ]; then
+
+cat /etc/httpd/conf.d/netdisco_apache.conf | sed 's/libexec\/apache2\/mod_perl.so/\/usr\/lib64\/httpd\/modules\/mod_perl.so/' > /tmp/netdisco_apache.conf.$$
 mv -f /tmp/netdisco_apache.conf.$$ /etc/httpd/conf.d/netdisco_apache.conf
 #
+cat /etc/httpd/conf.d/netdisco_apache.conf | sed 's/libexec\/apache2\/mod_apreq2.so/\/usr\/lib64\/httpd\/modules\/mod_apreq2.so/' > /tmp/netdisco_apache.conf.$$
+mv -f /tmp/netdisco_apache.conf.$$ /etc/httpd/conf.d/netdisco_apache.conf
+
+  else 
+
+echo ""
+echo ""
+echo "Your machine's architecture is unknown to us.  You need to find the path of mod_perl.so and mod_apreq2.so, and update /etc/httpd/conf.d/netdisco_apache.conf with that information." 
+echo ""
+echo ""
+
+fi
+
+
 # Stop apache errors at startup
 mv -f /etc/httpd/conf.d/apreq.conf /etc/httpd/conf.d/apreq.conf.orig
 mv -f /etc/httpd/conf.d/perl.conf /etc/httpd/conf.d/perl.conf.orig