rpms/netdisco/F-12 INSTALL.fedora, NONE, 1.1 INSTALL.rhel, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.2, 1.3 netdisco.init, 1.3, 1.4 netdisco.spec, 1.6, 1.7 netdisco_config, 1.2, 1.3 sources, 1.2, 1.3
gouldwp
gouldwp at fedoraproject.org
Fri Nov 6 22:09:14 UTC 2009
Author: gouldwp
Update of /cvs/pkgs/rpms/netdisco/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20388/F-12
Modified Files:
.cvsignore import.log netdisco.init netdisco.spec
netdisco_config sources
Added Files:
INSTALL.fedora INSTALL.rhel
Log Message:
--- NEW FILE INSTALL.fedora ---
Fedora / RHEL / CentOS Installations
====================================
***Important***
After installing the netdisco rpm, be sure to run /usr/sbin/netdisco_config !!
This script will walk you through configuring netdisco, setting up the postgresql
db tables, setting up permissions, startup scripts, and most importantly - the network discovery.
If you don't run the above netdisco_config script, netdisco will not work as intended and there
will be much manual configuration needed to be done before netdisco will even run.
Again, to save yourself time and heartache - run /usr/sbin/netdisco_config!!
If you have questions/suggestions/complaints - feel free to e-mail me at gouldwp at fedoraproject.org.
--- NEW FILE INSTALL.rhel ---
Fedora / RHEL / CentOS Installations
====================================
***Important***
After installing the netdisco rpm, be sure to run /usr/sbin/netdisco_config !!
This script will walk you through configuring netdisco, setting up the postgresql
db tables, setting up permissions, startup scripts, and most importantly - the network discovery.
If you don't run the above netdisco_config script, netdisco will not work as intended and there
will be much manual configuration needed to be done before netdisco will even run.
Again, to save yourself time and heartache - run /usr/sbin/netdisco_config!!
If you have questions/suggestions/complaints - feel free to e-mail me at gouldwp at fedoraproject.org.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 28 Jul 2009 05:21:19 -0000 1.2
+++ .cvsignore 6 Nov 2009 22:09:13 -0000 1.3
@@ -1,2 +1,2 @@
-netdisco-0.95.tar.gz
netdisco-mibs-0.7.tar.gz
+netdisco-1.0.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 22 Aug 2009 03:48:41 -0000 1.2
+++ import.log 6 Nov 2009 22:09:13 -0000 1.3
@@ -1,2 +1,3 @@
netdisco-0_95-2_fc11:HEAD:netdisco-0.95-2.fc11.src.rpm:1248740814
netdisco-0_95-3_fc11:HEAD:netdisco-0.95-3.fc11.src.rpm:1250912874
+netdisco-1_0-1_fc11:F-12:netdisco-1.0-1.fc11.src.rpm:1257527350
Index: netdisco.init
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-12/netdisco.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netdisco.init 17 Sep 2009 21:39:24 -0000 1.3
+++ netdisco.init 6 Nov 2009 22:09:13 -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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-12/netdisco.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- netdisco.spec 17 Sep 2009 21:52:10 -0000 1.6
+++ netdisco.spec 6 Nov 2009 22:09:14 -0000 1.7
@@ -1,8 +1,8 @@
%define mibs_version 0.7
Name: netdisco
-Version: 0.95
-Release: 4%{?dist}
+Version: 1.0
+Release: 1%{?dist}
Summary: A web-based network management tool
License: BSD
Group: Applications/Internet
@@ -11,6 +11,8 @@ Source0: http://downloads.sourcef
Source1: http://downloads.sourceforge.net/project/%{name}/%{name}-mibs/%{mibs_version}/%{name}-mibs-%{mibs_version}.tar.gz
Source2: netdisco.init
Source3: netdisco_config
+Source4: INSTALL.fedora
+Source5: INSTALL.rhel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: httpd
@@ -57,6 +59,11 @@ optionally provides automatic discovery
cp %{SOURCE2} netdisco.init
cp %{SOURCE3} netdisco_config
+cp %{SOURCE4} INSTALL.fedora
+cp %{SOURCE5} INSTALL.rhel
+
+# remove malformed-line-in-lsb-comment-block in netdisco.init - from netdisco source
+perl -pi -e "s|# corporate and university networks.||g" netdisco.init
# prefix fix
find -type f | xargs perl -pi -e "s|/usr/local/netdisco|/usr/share/netdisco|g"
@@ -108,6 +115,12 @@ install -m0644 netdisco.pm %{buildroot}/
%__ln_s %{_sysconfdir}/netdisco.conf %{buildroot}%_datadir/%{name}/netdisco.conf
%__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/cisco/CISCO-VSAN-MIB.my
+%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/FC4_install.sh
+%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/FC5_install.sh
+%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/CentOs_install.sh
+%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/Debian_3.1_install.sh
+%__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/0.95/
+%__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/1.0/
%pre
@@ -123,19 +136,25 @@ install -m0644 netdisco.pm %{buildroot}/
/sbin/chkconfig --add %{name}
+
%preun
if [ "$1" = "0" ]; then
- /sbin/service netdisco stop > /dev/null 2>&1
+ /sbin/service %{name} stop > /dev/null 2>&1
/sbin/chkconfig --del %{name}
fi
+%postun
+/usr/sbin/userdel %{name} 1>&2 > /dev/null
+%__rm -rf %_datadir/%{name}
+
+
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc ChangeLog INSTALL README* UPGRADE
+%doc ChangeLog INSTALL README* UPGRADE INSTALL.fedora INSTALL.rhel
%{_initrddir}/netdisco
%config(noreplace) %{_sysconfdir}/netdisco.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/netdisco_apache.conf
@@ -147,11 +166,13 @@ fi
%dir %_datadir/netdisco
%_datadir/netdisco/*
%{_mandir}/man1/*
+
%changelog
-* Thu Sep 17 2009 <gouldwp at fedoraproject.org> 0.95-4
+* Tue Oct 27 2009 <gouldwp at fedoraproject.org> 1.0-1
- Netdisco network management software.
+- Upstream 1.0 release
- Added require graphviz-gd package for graphing to work
- Added chkconfig line in netdisco_config script
- Changed chkconfig line in netdisco.init script to not start daemon by default
Index: netdisco_config
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-12/netdisco_config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netdisco_config 17 Sep 2009 21:39:24 -0000 1.2
+++ netdisco_config 6 Nov 2009 22:09:14 -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 28 Jul 2009 05:21:19 -0000 1.2
+++ sources 6 Nov 2009 22:09:14 -0000 1.3
@@ -1,2 +1,2 @@
-24ff61ee909fcdb47eb837967dbb67be netdisco-0.95.tar.gz
35b656bdb8506f0b413c4abab44523e6 netdisco-mibs-0.7.tar.gz
+bbb9cd2dbf487a3c106456eb67a10b6a netdisco-1.0.tar.gz
More information about the scm-commits
mailing list