# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1425862699 0
# Node ID 13adb555a7e23f620dcb95d16c09dc2fb8965e9d
# Parent  204330fea19acbb2a316c07ab17e0f4c0fd58249
Use "<IfVersion>" to handle auth differences between 2.2 and 2.4

Also, add Nano, because damnit vi!

diff -r 204330fea19a -r 13adb555a7e2 manifests/templates.pp
--- a/manifests/templates.pp	Mon Mar 09 00:01:27 2015 +0000
+++ b/manifests/templates.pp	Mon Mar 09 00:58:19 2015 +0000
@@ -90,7 +90,7 @@
 }
 
 class tools {
-	$packages = [ 'sqlite', 'bash-completion' ]
+	$packages = [ 'sqlite', 'bash-completion', 'nano' ]
 	package { $packages:
 		ensure => latest;
 	}
@@ -269,7 +269,12 @@
 
 	# Common modules used by multiple sites (mod_auth_basic is safe because we HTTPS all the things)
 	apache::mod {
-		'auth_basic':; 'authn_file':; 'authz_user':; 'auth_token':;'deflate':;
+		'auth_basic':; 'authn_file':; 'authz_user':; 'auth_token':;'deflate':; 'version':;
+	}
+	if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 {
+		apache::mod { 
+			'authn_core':;
+		}
 	}
 	$apache_packages = [ 'mod_auth_token' ]
 	package { $apache_packages:
diff -r 204330fea19a -r 13adb555a7e2 modules/website/files/zzz-custom.conf
--- a/modules/website/files/zzz-custom.conf	Mon Mar 09 00:01:27 2015 +0000
+++ b/modules/website/files/zzz-custom.conf	Mon Mar 09 00:58:19 2015 +0000
@@ -43,12 +43,22 @@
 Header unset ETag
 FileETag None
 
+
 <Location /.hg/>
+    <IfVersion < 2.4>
         Order Allow,Deny
         Deny from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all denied
+    </IfVersion>
 </Location>
 <FilesMatch ^\.>
+    <IfVersion < 2.4>
         Order Allow,Deny
         Deny from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all denied
+    </IfVersion>
 </FilesMatch>
-