diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays
--- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2022-04-16 02:17:57.222000000 -0400
+++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2022-04-16 02:42:53.058000000 -0400
@@ -28,63 +28,63 @@
}
elsif ($properties{'PublicAccess'} eq 'local')
{
- $allow = $localAccess;
+ $allow = "ip $localAccess";
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'All';
}
elsif ($properties{'PublicAccess'} eq 'local-pw')
{
- $allow = $localAccess;
+ $allow = "ip $localAccess";
$pass = 1;
- $satisfy = 'all';
+ $satisfy = 'All';
}
elsif ($properties{'PublicAccess'} eq 'global')
{
- $allow = 'all';
+ $allow = 'all granted';
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'All';
}
elsif ($properties{'PublicAccess'} eq 'global-pw')
{
- $allow = 'all';
+ $allow = 'all granted';
$pass = 1;
- $satisfy = 'all';
+ $satisfy = 'All';
}
elsif ($properties{'PublicAccess'} eq 'global-pw-remote')
{
- $allow = $localAccess;
+ $allow = "ip $localAccess";
$pass = 1;
- $satisfy = 'any';
+ $satisfy = 'Any';
}
}
elsif ($properties {'ReadAccess'} eq 'global')
{
if ($properties {'UsePassword'} eq 'yes')
{
- $allow = 'all';
+ $allow = 'all granted';
$pass = 1;
- $satisfy = 'all';
+ $satisfy = 'All';
}
else
{
- $allow = 'all';
+ $allow = 'all granted';
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'All';
}
}
else
{
if ($properties {'UsePassword'} eq 'yes')
{
- $allow = $localAccess;
+ $allow = "ip $localAccess";
$pass = 1;
- $satisfy = 'all';
+ $satisfy = 'All';
}
else
{
- $allow = $localAccess;
+ $allow = "ip $localAccess";
$pass = 0;
- $satisfy = 'all';
+ $satisfy = 'All';
}
}
@@ -120,23 +120,25 @@
$OUT .= " DirectoryIndex index.shtml index.htm index.html\n";
$OUT .= " Options +IncludesNOEXEC\n";
$OUT .= " \n";
- $OUT .= " order deny,allow\n";
- $OUT .= " Deny from all\n";
+ $OUT .= " Require all denied\n";
$OUT .= " \n";
}
$OUT .= " AllowOverride $allowOverride\n";
- $OUT .= " order deny,allow\n";
- $OUT .= " deny from all\n";
- $OUT .= " allow from $allow\n";
if ($pass)
{
$OUT .= " AuthName \"$properties{'Name'}\"\n";
$OUT .= " AuthType Basic\n";
$OUT .= " AuthBasicProvider external\n";
$OUT .= " AuthExternal pwauth\n";
- $OUT .= " require user $key\n";
- $OUT .= " Satisfy $satisfy\n";
- }
+ $OUT .= " \n";
+ $OUT .= " Require user $key\n";
+ $OUT .= " Require $allow\n";
+ $OUT .= " \n";
+ }
+ else
+ {
+ $OUT .= " Require $allow\n";
+ }
$OUT .= "\n";
@@ -151,18 +153,22 @@
$OUT .= " Options ExecCGI\n";
}
$OUT .= " AllowOverride None\n";
- $OUT .= " order deny,allow\n";
- $OUT .= " deny from all\n";
- $OUT .= " allow from $allow\n";
if ($pass)
{
$OUT .= " AuthName \"$properties{'Name'}\"\n";
$OUT .= " AuthType Basic\n";
$OUT .= " AuthBasicProvider external\n";
$OUT .= " AuthExternal pwauth\n";
- $OUT .= " require user $key\n";
- $OUT .= " Satisfy $satisfy\n";
+ $OUT .= " \n";
+ $OUT .= " Require user $key\n";
+ $OUT .= " Require $allow\n";
+ $OUT .= " \n";
+ }
+ else
+ {
+ $OUT .= " Require $allow\n";
}
+
$OUT .= "\n";
$OUT .= "\n";
@@ -172,17 +178,20 @@
$OUT .= " SSLRequireSSL\n";
}
$OUT .= " AllowOverride None\n";
- $OUT .= " order deny,allow\n";
- $OUT .= " deny from all\n";
- $OUT .= " allow from $allow\n";
if ($pass)
{
$OUT .= " AuthName \"$properties{'Name'}\"\n";
$OUT .= " AuthType Basic\n";
$OUT .= " AuthBasicProvider external\n";
$OUT .= " AuthExternal pwauth\n";
- $OUT .= " require user $key\n";
- $OUT .= " Satisfy $satisfy\n";
+ $OUT .= " \n";
+ $OUT .= " Require user $key\n";
+ $OUT .= " Require $allow\n";
+ $OUT .= " \n";
+ }
+ else
+ {
+ $OUT .= " Require $allow\n";
}
$OUT .= "\n";
}
diff -Nur --no-dereference e-smith-ibays-2.6.0.old/createlinks e-smith-ibays-2.6.0/createlinks
--- e-smith-ibays-2.6.0.old/createlinks 2022-05-26 21:52:25.409000000 -0400
+++ e-smith-ibays-2.6.0/createlinks 2022-05-26 21:58:27.750000000 -0400
@@ -35,3 +35,12 @@
event_link("init-ibays", $event, "15");
}
+my $event = "e-smith-ibays-update";
+templates2events("/etc/httpd/conf/httpd.conf", $event);
+templates2events("/samba/smb.conf", $event);
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smbd");
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/nmbd");
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
+event_link('store-ldap-smbpasswd', $_, "06");
+event_link("systemd-reload", $event, "89");
+event_link("systemd-default", $event, "88");