Patch $url_path to default to "/cacti/" (upstream bug 2217)
This commit is contained in:
parent
12e71f16d6
commit
77c72073c0
26
cacti-0.8.8-default-url-path.patch
Normal file
26
cacti-0.8.8-default-url-path.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff --git a/cacti/branches/0.8.8/include/config.php.dist b/cacti/branches/0.8.8/include/config.php.dist
|
||||||
|
index fa59eef..20c1929 100644
|
||||||
|
--- a/cacti/branches/0.8.8/include/config.php.dist
|
||||||
|
+++ b/cacti/branches/0.8.8/include/config.php
|
||||||
|
@@ -36,7 +36,7 @@ $database_ssl = false;
|
||||||
|
ex: if your cacti install as at http://serverip/cacti/ this
|
||||||
|
would be set to /cacti/
|
||||||
|
*/
|
||||||
|
-//$url_path = "/";
|
||||||
|
+//$url_path = "/cacti/";
|
||||||
|
|
||||||
|
/* Default session name - Session name must contain alpha characters */
|
||||||
|
//$cacti_session_name = "Cacti";
|
||||||
|
diff --git a/cacti/branches/0.8.8/include/global.php b/cacti/branches/0.8.8/include/global.php
|
||||||
|
index 4e3bdbb..e41515d 100644
|
||||||
|
--- a/cacti/branches/0.8.8/include/global.php
|
||||||
|
+++ b/cacti/branches/0.8.8/include/global.php
|
||||||
|
@@ -43,7 +43,7 @@ $database_ssl = false;
|
||||||
|
$cacti_session_name = "Cacti";
|
||||||
|
|
||||||
|
/* define default url path */
|
||||||
|
-$url_path = "/";
|
||||||
|
+$url_path = "/cacti/";
|
||||||
|
|
||||||
|
/* Include configuration */
|
||||||
|
include(dirname(__FILE__) . "/config.php");
|
10
cacti.spec
10
cacti.spec
@ -1,6 +1,6 @@
|
|||||||
Name: cacti
|
Name: cacti
|
||||||
Version: 0.8.8
|
Version: 0.8.8
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: An rrd based graphing tool
|
Summary: An rrd based graphing tool
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -11,6 +11,7 @@ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
|
|||||||
Source1: cacti-httpd.conf
|
Source1: cacti-httpd.conf
|
||||||
Source2: cacti.logrotate
|
Source2: cacti.logrotate
|
||||||
Source3: cacti.README.Fedora
|
Source3: cacti.README.Fedora
|
||||||
|
Patch0: cacti-0.8.8-default-url-path.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -33,6 +34,10 @@ used to creating traffic graphs with MRTG.
|
|||||||
|
|
||||||
echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
|
echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
|
||||||
|
|
||||||
|
# Use "/cacti/" for the default URL, if none is defined.
|
||||||
|
# http://bugs.cacti.net/view.php?id=2217
|
||||||
|
%patch0 -p4
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
|
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
|
||||||
@ -114,6 +119,9 @@ fi
|
|||||||
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
|
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 11 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8-3
|
||||||
|
- Patch $url_path to default to "/cacti/" (upstream bug 2217)
|
||||||
|
|
||||||
* Fri Apr 06 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8-2
|
* Fri Apr 06 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8-2
|
||||||
- Adjust httpd ACL conditionals to test the presence of mod_authz_core
|
- Adjust httpd ACL conditionals to test the presence of mod_authz_core
|
||||||
(as discussed on fedora-devel)
|
(as discussed on fedora-devel)
|
||||||
|
Loading…
Reference in New Issue
Block a user