diff -Nur --no-dereference smeserver-git-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories smeserver-git-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories
--- smeserver-git-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories 2022-07-22 02:56:15.846000000 -0400
+++ smeserver-git-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories 2022-07-22 03:07:22.029000000 -0400
@@ -98,13 +98,13 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#~~~ Gitweb default access permissions for viewing
- my $gitweb_allow = '127.0.0.1'; # Catch incorrect values, including empty ones
+ my $gitweb_allow = 'ip 127.0.0.1'; # Catch incorrect values, including empty ones
# Setup the rules from which address range we allow access
if( $git{'gitweb_access_from'} ) {
if ($git{'gitweb_access_from'} eq 'internet') {
- $gitweb_allow = 'All';
+ $gitweb_allow = 'all granted';
} elsif ($git{'gitweb_access_from'} eq 'local') {
- $gitweb_allow = $localAccess;
+ $gitweb_allow = "ip $localAccess";
}
}
@@ -262,16 +262,14 @@
$OUT .= " # Access permissions for the git root directory\n";
$OUT .= " \n";
$OUT .= " Options +ExecCGI\n";
- $OUT .= " Order Allow,Deny\n";
- $OUT .= " Allow from All\n";
+ $OUT .= " Require all granted\n";
$OUT .= " \n";
$OUT .= "\n";
$OUT .= " # Access permissions for git backend scripts\n";
$OUT .= " \n";
$OUT .= " Options +ExecCGI +Indexes\n";
- $OUT .= " Order Allow,Deny\n";
- $OUT .= " Allow from All\n";
+ $OUT .= " Require all granted\n";
$OUT .= " \n";
$OUT .= "\n";
@@ -338,16 +336,14 @@
$OUT .= " AllowOverride None\n";
$OUT .= " AddHandler cgi-script .cgi\n";
$OUT .= " DirectoryIndex gitweb.cgi\n";
- $OUT .= " Order Allow,Deny\n";
- $OUT .= " Allow from $gitweb_allow\n";
+ $OUT .= " Require $gitweb_allow\n";
$OUT .= " \n\n";
if( $gitweb_theme eq 'enabled' ) {
$OUT .= " # Access permissions for additional gitweb theme files\n";
$OUT .= " \n";
$OUT .= " AllowOverride None\n";
- $OUT .= " Order Allow,Deny\n";
- $OUT .= " Allow from $gitweb_allow\n";
+ $OUT .= " Require $gitweb_allow\n";
$OUT .= " \n\n";
}
} else {
@@ -367,12 +363,12 @@
# Retrieve the network access rules for the repository
my $satisfy = 'All';
- my $allow_from_network = '127.0.0.1'; # Catch incorrect values, including empty ones
+ my $allow_from_network = 'ip 127.0.0.1'; # Catch incorrect values, including empty ones
if( $properties{'allow_access_from'} ) {
if( $properties{'allow_access_from'} eq 'internet' ) {
- $allow_from_network = 'All';
+ $allow_from_network = 'all granted';
} elsif ($properties{'allow_access_from'} eq 'local') {
- $allow_from_network = $localAccess;
+ $allow_from_network = "ip $localAccess";
}
}
@@ -403,6 +399,8 @@
$OUT .= " # PULL access to $gitpath/$git_repository.git\n";
+ $OUT .= " \n";
+
if( $effective_pull_users ) {
$OUT .= " # PULL Access Control\n";
$OUT .= " AuthName \"Git repository: $git_repository\.git (" . ($properties{'description'} || "ERROR - DESCRIPTION NOT CONFIGURED!"). ")\"\n";
@@ -414,15 +412,13 @@
} else {
$OUT .= " # Anonymous PULL Access\n";
}
- if( $allow_from_network ne 'All' ) {
+ if( $allow_from_network ne 'all granted' ) {
$OUT .= " # Restricted network access\n";
- $OUT .= " Order Deny,Allow\n";
- $OUT .= " Deny from All\n";
- $OUT .= " Allow from $allow_from_network\n";
+ $OUT .= " Require $allow_from_network\n";
} else {
- $OUT .= " # Internet access enabled\n";
+ $OUT .= " Require all granted \n # Internet access enabled\n";
}
- $OUT .= " Satisfy All\n";
+ $OUT .= " \n";
$OUT .= " # $gitpath/$git_repository.git\n\n";
@@ -433,6 +429,7 @@
$OUT .= " # PUSH access to $gitpath/$git_repository.git\n";
+ $OUT .= " \n";
if( $effective_push_users ) {
$OUT .= " # PUSH Access Control\n";
$OUT .= " AuthName \"Git repository: $git_repository\.git (" . ($properties{'description'} || "ERROR - DESCRIPTION NOT CONFIGURED!"). ")\"\n";
@@ -444,15 +441,13 @@
} else {
$OUT .= " # Anonymous PUSH Access\n";
}
- if( $allow_from_network ne 'All' ) {
+ if( $allow_from_network ne 'all granted' ) {
$OUT .= " # Restricted network access\n";
- $OUT .= " Order Deny,Allow\n";
- $OUT .= " Deny from All\n";
- $OUT .= " Allow from $allow_from_network\n";
+ $OUT .= " Require $allow_from_network\n";
} else {
- $OUT .= " # Internet access enabled\n";
+ $OUT .= " Require all granted \n # Internet access enabled\n";
}
- $OUT .= " Satisfy All\n";
+ $OUT .= " \n";
$OUT .= " # /push$gitpath/$git_repository.git\n\n";
}
diff -Nur --no-dereference smeserver-git-1.2.0.old/createlinks smeserver-git-1.2.0/createlinks
--- smeserver-git-1.2.0.old/createlinks 2022-07-31 23:45:52.845000000 -0400
+++ smeserver-git-1.2.0/createlinks 2022-07-31 23:46:54.690000000 -0400
@@ -18,7 +18,7 @@
#action specific to this package
#event_link('action', $event, '30');
#services we need to restart
-safe_symlink('restart',"root/etc/e-smith/events/$event/services2adjust/e-smith-httpd");
+safe_symlink('restart',"root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
#and Server Manager panel link
#panel_link('somefunction', 'manager');