[netdisco] netdisco 1.1 commit.
gouldwp
gouldwp at fedoraproject.org
Fri Oct 14 14:22:18 UTC 2011
commit a28ab463e8857a44e565dd6d650da8615a4e5735
Author: Walter Gould <gouldwp at fedoraproject.org>
Date: Fri Oct 14 09:22:16 2011 -0500
netdisco 1.1 commit.
.gitignore | 1 +
INSTALL.fedora | 17 ++++++++++++++
INSTALL.rhel | 17 ++++++++++++++
netdisco.spec | 64 +++++++++++++++++++++++++++++++-----------------------
netdisco_config | 7 ++++-
sources | 5 +---
6 files changed, 78 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d35cbd..fa37ab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ INSTALL.fedora
INSTALL.rhel
netdisco-1.0.tar.gz
netdisco-mibs-0.7.tar.gz
+/netdisco-1.1_with_mibs.tar.gz
diff --git a/INSTALL.fedora b/INSTALL.fedora
new file mode 100644
index 0000000..6d00b2f
--- /dev/null
+++ b/INSTALL.fedora
@@ -0,0 +1,17 @@
+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.
diff --git a/INSTALL.rhel b/INSTALL.rhel
new file mode 100644
index 0000000..6d00b2f
--- /dev/null
+++ b/INSTALL.rhel
@@ -0,0 +1,17 @@
+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.
diff --git a/netdisco.spec b/netdisco.spec
index 400dac5..1af70bf 100644
--- a/netdisco.spec
+++ b/netdisco.spec
@@ -1,25 +1,22 @@
-%define mibs_version 0.7
-
Name: netdisco
-Version: 1.0
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: A web-based network management tool
License: BSD
Group: Applications/Internet
URL: http://netdisco.org/
-Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
-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
+Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}_with_mibs.tar.gz
+Source1: netdisco.init
+Source2: netdisco_config
+Source3: INSTALL.fedora
+Source4: INSTALL.rhel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: httpd
Requires: postgresql postgresql-server
Requires: net-snmp net-snmp-perl
Requires: mod_perl mod_ssl
-Requires: graphviz graphviz-gd
+Requires: graphviz graphviz-gd wget
Requires: perl(DBI)
Requires: perl(Apache::DBI)
Requires: perl(DBD::Pg)
@@ -53,14 +50,14 @@ optionally provides automatic discovery of the network topology.
%prep
-%setup -q -n %{name}-%{version} -a1
+%setup -q -n %{name}-%{version}
/usr/bin/iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
%define debug_package %{nil}
-cp %{SOURCE2} netdisco.init
-cp %{SOURCE3} netdisco_config
-cp %{SOURCE4} INSTALL.fedora
-cp %{SOURCE5} INSTALL.rhel
+cp %{SOURCE1} netdisco.init
+cp %{SOURCE2} netdisco_config
+cp %{SOURCE3} INSTALL.fedora
+cp %{SOURCE4} 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
@@ -110,17 +107,20 @@ install -m0755 netdisco_config %{buildroot}%{_sbindir}/netdisco_config
install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/
%__cp -aRf * %{buildroot}%_datadir/%{name}/
-%__mv %{buildroot}%_datadir/%{name}/%{name}-mibs-%{mibs_version} %{buildroot}%_datadir/%{name}/mibs/
+#%__mv %{buildroot}%_datadir/%{name}/%{name}-mibs-%{mibs_version} %{buildroot}%_datadir/%{name}/mibs/
%__rm -rf %{buildroot}%_datadir/%{name}/netdisco.conf
%__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 0644 %{buildroot}%_datadir/%{name}/mibs/cisco/CISCO-LWAPP-DOT11-CCX-CLIENT-DIAG-MIB.my
+%__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfvrrp.mib
+%__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfratelimit.mib
+%__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfipaddress.mib
+%__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfpim.mib
+%__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/
%__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/0.95/
%__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/1.0/
+%__chmod -R 0644 %{buildroot}%_datadir/%{name}/bin/install/0.94/readme*
%pre
@@ -134,6 +134,17 @@ install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/
%post
/sbin/chkconfig --add %{name}
+ echo ''
+ echo ''
+ echo '**************************************************************************************************'
+ echo '**************************************************************************************************'
+ echo ''
+ echo 'To configure netdisco for your environment, you need to run the /usr/sbin/netdisco_config script.'
+ echo ''
+ echo '**************************************************************************************************'
+ echo '**************************************************************************************************'
+ echo ''
+ echo ''
@@ -145,7 +156,6 @@ fi
%postun
-/usr/sbin/userdel %{name} 1>&2 > /dev/null
%__rm -rf %_datadir/%{name}
@@ -161,7 +171,7 @@ fi
%config(noreplace) %{_sysconfdir}/httpd/conf.d/netdisco_apache_dir.conf
%{_sbindir}/netdisco
%{_sbindir}/netdisco_config
-%dir /var/run/netdisco
+%ghost /var/run/netdisco
%perl_vendorlib/netdisco.pm
%dir %_datadir/netdisco
%_datadir/netdisco/*
@@ -170,11 +180,11 @@ fi
%changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Nov 9 2009 <gouldwp at fedoraproject.org> 1.0-2
+* Thu Oct 13 2011 <gouldwp at fedoraproject.org> 1.1-1
- Netdisco network management software.
+- Changed %dir/var/run/netdisco to %ghost /var/run/netdisco - bug 656636
+- Upstream 1.1 release
+* Tue Nov 9 2009 <gouldwp at fedoraproject.org> 1.0-2
- Upstream 1.0 release
- Added require graphviz-gd package for graphing to work
- Added chkconfig line in netdisco_config script
diff --git a/netdisco_config b/netdisco_config
index 9560ff3..be59d10 100755
--- a/netdisco_config
+++ b/netdisco_config
@@ -186,8 +186,11 @@ chcon system_u:object_r:usr_t:s0 /usr/share/netdisco/html/netmap.map /usr/share/
chmod 644 /usr/share/netdisco/html/netmap.map /usr/share/netdisco/html/netmap.gif
chown netdisco:netdisco /usr/share/netdisco/html/netmap.map /usr/share/netdisco/html/netmap.gif
-/etc/init.d/postgresql start
-/etc/init.d/httpd start
+#/etc/init.d/postgresql start
+#/etc/init.d/httpd start
+
+/bin/systemctl start postgresql.service
+/usr/sbin/httpd > /dev/null 2>&1
# Start postgres and httpd at system startup
/sbin/chkconfig postgresql on
diff --git a/sources b/sources
index 1bef426..0593fc7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-8b90b508efd76f206739dc82c3c4601e INSTALL.fedora
-8b90b508efd76f206739dc82c3c4601e INSTALL.rhel
-bbb9cd2dbf487a3c106456eb67a10b6a netdisco-1.0.tar.gz
-35b656bdb8506f0b413c4abab44523e6 netdisco-mibs-0.7.tar.gz
+4f2d655d5520a2006b8b20a2837d66c9 netdisco-1.1_with_mibs.tar.gz
More information about the scm-commits
mailing list