smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.6.0-bz12055-24syntax.patch

diff -urN smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin
--- smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin        2022-07-26 14:00:55.852461246 +0300
+++ smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin    2022-07-26 14:02:52.211834695 +0300
@@ -4,14 +4,7 @@
     SSLRequireSSL on
     Options -Indexes
     AllowOverride None
-    <IfModule mod_access_compat.c>
-      order deny,allow
-      deny from all
-      allow from { (($phpldapadmin{access} || 'private' ) eq "public" ) ? "all" : "$localAccess $externalSSLAccess";}
-    </IfModule>
-    <IfModule !mod_access_compat.c>
       Require { (($phpldapadmin{access} || 'private' ) eq "public" ) ?  "all granted": "ip $localAccess $externalSSLAccess";}
-    </IfModule>
 {
 # we use the ldap auth now
 #    AuthName "phpLdapAdmin"
diff -Nur --no-dereference smeserver-phpldapadmin-1.6.0.old/createlinks smeserver-phpldapadmin-1.6.0/createlinks
--- smeserver-phpldapadmin-1.6.0.old/createlinks        2022-07-31 23:08:33.554000000 -0400
+++ smeserver-phpldapadmin-1.6.0/createlinks    2022-07-31 23:14:45.392000000 -0400
@@ -16,4 +16,6 @@
     templates2events("/etc/httpd/conf/httpd.conf", $event);
 
 }
+my $event="smeserver-phpldapadmin-update";
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/phpldapadmin/config.php/template-begin");
1	terryfage	1.1	diff -urN smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin
2			--- smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin 2022-07-26 14:00:55.852461246 +0300
3			+++ smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin 2022-07-26 14:02:52.211834695 +0300
4			@@ -4,14 +4,7 @@
5			SSLRequireSSL on
6			Options -Indexes
7			AllowOverride None
8			- <IfModule mod_access_compat.c>
9			- order deny,allow
10			- deny from all
11			- allow from { (($phpldapadmin{access} \|\| 'private' ) eq "public" ) ? "all" : "$localAccess $externalSSLAccess";}
12			- </IfModule>
13			- <IfModule !mod_access_compat.c>
14			Require { (($phpldapadmin{access} \|\| 'private' ) eq "public" ) ? "all granted": "ip $localAccess $externalSSLAccess";}
15			- </IfModule>
16			{
17			# we use the ldap auth now
18			# AuthName "phpLdapAdmin"
19	jpp	1.2	diff -Nur --no-dereference smeserver-phpldapadmin-1.6.0.old/createlinks smeserver-phpldapadmin-1.6.0/createlinks
20			--- smeserver-phpldapadmin-1.6.0.old/createlinks 2022-07-31 23:08:33.554000000 -0400
21			+++ smeserver-phpldapadmin-1.6.0/createlinks 2022-07-31 23:14:45.392000000 -0400
22			@@ -16,4 +16,6 @@
23			templates2events("/etc/httpd/conf/httpd.conf", $event);
24
25			}
26			+my $event="smeserver-phpldapadmin-update";
27			+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
28			safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/phpldapadmin/config.php/template-begin");