[sticky-notes] Make sticky-notes.conf compatible with both httpd 2.4.x and 2.2.x.

[Athmane Madjoudj]

commit ff7c1f12f5fa25d193f87f74e2a8421ee6fbd61c
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Tue Oct 30 18:23:22 2012 +0100

     Make sticky-notes.conf compatible with both httpd 2.4.x and 2.2.x.

 sticky-notes-http-conf => sticky-notes.conf |   19 +++++++++++++++----
 sticky-notes.spec                           |    7 +++++--
 2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/sticky-notes-http-conf b/sticky-notes.conf
similarity index 89%
rename from sticky-notes-http-conf
rename to sticky-notes.conf
index b75e594..7099fac 100644
--- a/sticky-notes-http-conf
+++ b/sticky-notes.conf
@@ -1,10 +1,21 @@
 Alias /sticky-notes "/usr/share/sticky-notes" 
 
 <Directory /usr/share/sticky-notes>
-    Allow from 127.0.0.1
-    AllowOverride all
-#    Options None
-    Order allow,deny
+
+    # ACL for Apache 2.4
+    <IfModule mod_authz_core.c>
+        Require local
+    </IfModule>
+    
+    # ACL for Apache 2.2
+    <IfModule !mod_authz_core.c>
+        Order Deny,Allow
+        Deny from all
+        Allow from 127.0.0.1
+        Allow from ::1
+    </IfModule>
+
+    # URL rewriting 
     <IfModule mod_rewrite.c>
     # Tell PHP that rewrite rules are available
     SetEnv HTTP_MOD_REWRITE On
diff --git a/sticky-notes.spec b/sticky-notes.spec
index 74d6602..7a0bae6 100644
--- a/sticky-notes.spec
+++ b/sticky-notes.spec
@@ -1,7 +1,7 @@
 Summary:	Sticky notes is a free and open source paste-bin application
 Name:		sticky-notes
 Version:	0.3.09062012.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	BSD
 Group:		Applications/Internet
 URL:		http://gitorious.org/sticky-notes	
@@ -11,7 +11,7 @@ URL:		http://gitorious.org/sticky-notes
 # cd sticky-notes 
 # git archive HEAD --format=tar --prefix=sticky-notes/ | gzip > ../sticky-notes-0.3.09062012.4.tar.gz
 Source0:	sticky-notes-%{version}.tar.gz
-Source1:	sticky-notes-http-conf
+Source1:	sticky-notes.conf
 Patch0:		sticky-notes-unbundle-php-geshi.patch
 # Fix XSS issue in username parameter at login page
 # https://gitorious.org/sticky-notes/sticky-notes/merge_requests/2
@@ -71,6 +71,9 @@ ln -sf ../../../etc/sticky-notes/install.php ${RPM_BUILD_ROOT}%{_datadir}/%{name
 %doc VERSION
 
 %changelog
+* Tue Oct 30 2012 Athmane Madjoudj <athmane at fedoraproject.org> 0.3.09062012.4-9
+- Make sticky-notes.conf compatible with both httpd 2.4.x and 2.2.x.
+
 * Fri Oct 12 2012 Athmane Madjoudj <athmane at fedoraproject.org> 0.3.09062012.4-8
 - Fix hostname issue in rss URLs when reverse proxy is used.