From 7b883b2ad6395c5c2df94b3d8fee0d8bd3634abd Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Jan 04 2013 22:02:21 +0000 Subject: Install our README file as README.fedora --- diff --git a/cacti.README.Fedora b/cacti.README.Fedora deleted file mode 100644 index 2506536..0000000 --- a/cacti.README.Fedora +++ /dev/null @@ -1,23 +0,0 @@ -In order for Cacti to function properly, please edit the following: - -/etc/cacti/db.php -/etc/cron.d/cacti -/etc/http/conf.d/cacti.conf - -For more information about setting up the database please read: - -docs/INSTALL - -Cacti's install procedure is not fully compatible with mod_security. If you use -mod_security, please uncomment the SecRuleRemoveById lines in -/etc/http/conf.d/cacti.conf. - -As of Feb. 6, 2006 Cacti does not work correctly with SELinux. This will -change in the future. If you're having issues getting Cacti to work properly -and SELinux is enabled, please run the following commands after installing -Cacti: - -chcon -R -t httpd_sys_content_t /var/log/cacti/ -chcon -R -t httpd_sys_content_t /var/lib/cacti/rra/ - - diff --git a/cacti.README.fedora b/cacti.README.fedora new file mode 100644 index 0000000..ac0ff3a --- /dev/null +++ b/cacti.README.fedora @@ -0,0 +1,32 @@ +In order for Cacti to function properly, please edit the following: + +/etc/cacti/db.php +/etc/cron.d/cacti +/etc/http/conf.d/cacti.conf + +For more information about setting up the database please read: + +docs/INSTALL + +The installation procedure, briefly summarized: + + Create the cacti MySQL database: + + # mysqladmin create cacti + + Import the default cacti database: + + # mysql cacti < /usr/share/doc/cacti-0.8.8a/cacti.sql + + Create the user: + + # mysql + mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'cactiuser'; + + Then visit http://localhost/cacti/ to complete the installation. + +Cacti's install procedure is not fully compatible with mod_security. If you use +mod_security, please uncomment the SecRuleRemoveById lines in +/etc/http/conf.d/cacti.conf. + +Cacti should work with SELinux. If you cannot get it to work, please file a bug. diff --git a/cacti.spec b/cacti.spec index 25e0171..e2eba8e 100644 --- a/cacti.spec +++ b/cacti.spec @@ -1,6 +1,6 @@ Name: cacti Version: 0.8.8a -Release: 4%{?dist} +Release: 5%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -12,7 +12,7 @@ URL: http://www.cacti.net/ Source0: %{name}-%{version}-notreeview.tar.gz Source1: cacti-httpd.conf Source2: cacti.logrotate -Source3: cacti.README.Fedora +Source3: cacti.README.fedora Source4: d.gif Source5: d.png Source6: throbber.gif @@ -70,7 +70,7 @@ rm -rf %{buildroot} %endif %{__cp} -a images/ include/ install/ lib/ plugins/ resource/ %{buildroot}%{_datadir}/%{name} -%{__cp} %{SOURCE3} ./docs/README.cacti +%{__cp} %{SOURCE3} ./docs/README.fedora %{__cp} -a docs/ %{buildroot}/%{_docdir}/%{name}-%{version} %{__mv} %{buildroot}/%{_datadir}/%{name}/include/config.php %{buildroot}/%{_sysconfdir}/%{name}/db.php %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/cmd.php %{buildroot}/%{_datadir}/%{name}/poller.php @@ -128,6 +128,9 @@ fi %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Fri Jan 04 2013 Ken Dreyer - 0.8.8a-5 +- Install our README file as README.fedora + * Fri Jan 4 2013 Tom Callaway - 0.8.8a-4 - remove non-free treeview bits (replace with jquery future code from 0.8.9 trunk)