diff -Nur --no-dereference smeserver-subversion-1.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent smeserver-subversion-1.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent
--- smeserver-subversion-1.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent 2015-08-11 09:30:17.000000000 -0400
+++ smeserver-subversion-1.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent 2022-08-01 15:04:48.457000000 -0400
@@ -57,30 +57,30 @@
if ($properties{'AccessType'} eq 'global') {
- $allow = 'all';
+ $allow = 'all granted';
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'RequireAll';
} elsif ($properties{'AccessType'} eq 'private') {
- $allow = join (' ', ($localAccess, $externalSSLAccess)) ;
+ $allow = "ip $localAccess $externalSSLAccess";
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'RequireAll';
} elsif ($properties{'AccessType'} eq 'local') {
- $allow = $localAccess;
+ $allow = "ip $localAccess";
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'RequireAll';
} else {
# Catch all incorrect values, including empty ones
- $allow = '127.0.0.1';
+ $allow = 'ip 127.0.0.1';
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'RequireAll';
}
@@ -271,23 +271,22 @@
# $OUT .= " \n";
$OUT .= " \n";
- $OUT .= " order deny,allow\n";
- $OUT .= " deny from all\n";
-
if ( ( ($groupsRead eq "") && ($usersRead eq "") ) || ( ( ($groupsRead ne "") || ($usersRead ne "") ) && ($port eq 443) ) ) {
- $OUT .= " allow from $allow\n";
+ $OUT .= " \n";
+ $OUT .= " Require $allow\n";
$OUT .= " Require group $groupsRead\n" unless ($groupsRead eq "");
$OUT .= " Require user $usersRead\n" unless ($usersRead eq "");
+ $OUT .= " \n";
} else {
$OUT .= " # Denying access:\n";
+ $OUT .= " Require all denied\n";
$OUT .= " # User authentication required this requires SSL\n";
}
- $OUT .= " Satisfy $satisfy\n";
# $OUT .= " \n\n";
$OUT .= " \n\n";
@@ -299,8 +298,6 @@
# $OUT .= " \n";
$OUT .= " \n";
- $OUT .= " order deny,allow\n";
- $OUT .= " deny from all\n";
if (
( ($port eq 443) &&
@@ -316,14 +313,18 @@
)
) {
- $OUT .= " allow from $allow\n";
- $OUT .= " Require group $groupsWrite\n" unless ($groupsWrite eq "");
- $OUT .= " Require user $usersWrite\n" unless ($usersWrite eq "");
+ $OUT .= " \n";
+ $OUT .= " Require $allow\n";
+ $OUT .= " \n" unless ($groupsWrite eq "" || $usersWrite eq "");
+ $OUT .= " Require group $groupsWrite\n" unless ($groupsWrite eq "");
+ $OUT .= " Require user $usersWrite\n" unless ($usersWrite eq "");
+ $OUT .= " \n" unless ($groupsWrite eq "" || $usersWrite eq "");
+ $OUT .= " \n";
} else {
$OUT .= " # Denying access:\n";
-
+ $OUT .= " Require all denied\n";
if ( ($groupsRead ne "") || ($usersRead ne "") || ( ($groupsRead ne "") && ($usersRead ne "") ) ) {
$OUT .= " # Read authentication required, no anonymous write access allowed\n";
@@ -335,12 +336,9 @@
}
- $OUT .= " Satisfy $satisfy\n";
# $OUT .= " \n\n";
$OUT .= " \n\n";
-# $OUT .= " Satisfy $satisfy\n\n";
-# $OUT .= " Satisfy any\n\n";
$OUT .= " \n\n";