[mrtg/f18] Update mrtg-httpd.conf to work with httpd 2.4

vcrhonek vcrhonek at fedoraproject.org
Thu Nov 1 13:09:52 UTC 2012


commit 1a24094da4c307c7beec1a8fd2118124cf14b799
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Thu Nov 1 14:09:08 2012 +0100

    Update mrtg-httpd.conf to work with httpd 2.4

 mrtg-httpd.conf |    8 +++-----
 mrtg.spec       |    6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/mrtg-httpd.conf b/mrtg-httpd.conf
index b10a71e..b2fd2ea 100644
--- a/mrtg-httpd.conf
+++ b/mrtg-httpd.conf
@@ -6,9 +6,7 @@
 Alias /mrtg /var/www/mrtg
 
 <Location /mrtg>
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
-    Allow from ::1
-    # Allow from .example.com
+    Require local
+    # Require ip 10.1.2.3
+    # Require host example.org
 </Location>
diff --git a/mrtg.spec b/mrtg.spec
index fbad2b5..97e5b7d 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.17.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5
@@ -138,6 +138,10 @@ fi
 %{_unitdir}/mrtg.timer
 
 %changelog
+* Thu Nov 01 2012 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.17.4-4
+- Update mrtg-httpd.conf to work with httpd 2.4
+  Resolves: #871434
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list