/[smecontribs]/rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.6.0-bz12055-httpd24.patch
ViewVC logotype

Annotation of /rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.6.0-bz12055-httpd24.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Sun Jul 24 03:44:42 2022 UTC (2 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-phpldapadmin-1_6_0-7_el7_sme, smeserver-phpldapadmin-1_6_0-9_el7_sme, smeserver-phpldapadmin-1_6_0-6_el7_sme, smeserver-phpldapadmin-1_6_0-8_el7_sme, HEAD
* Sat Jul 23 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.6.0-6.sme
- update access to httpd24 syntax [SME: 12055]

1 jpp 1.1 diff -Nur --no-dereference 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-23 23:24:01.232000000 -0400
3     +++ smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin 2022-07-23 23:42:12.972000000 -0400
4     @@ -4,37 +4,31 @@
5     SSLRequireSSL on
6     Options -Indexes
7     AllowOverride None
8     - order deny,allow
9     - deny from all
10     + <IfModule mod_access_compat.c>
11     + order deny,allow
12     + deny from all
13     + allow from { (($phpldapadmin{access} || 'private' ) eq "public" ) ? "all" : "$localAccess $externalSSLAccess";}
14     + </IfModule>
15     + <IfModule !mod_access_compat.c>
16     + Require { (($phpldapadmin{access} || 'private' ) eq "public" ) ? "all granted": "ip $localAccess $externalSSLAccess";}
17     + </IfModule>
18     {
19     - my $phpldapadminaxs = $phpldapadmin{'access'} || "private";
20     - if ($phpldapadminaxs eq "private")
21     - {
22     - $OUT .= " allow from $localAccess $externalSSLAccess";
23     - } else {
24     - $OUT .= " allow from all";
25     - }
26     -}
27     +# we use the ldap auth now
28     # AuthName "phpLdapAdmin"
29     # AuthBasicProvider external
30     # AuthType Basic
31     # AuthExternal pwauth
32     # require user admin
33     # Satisfy all
34     - AddType application/x-httpd-php .php .php3
35     -
36     +} AddType application/x-httpd-php .php
37     {
38     # we do not want people to mess with this for the moment
39     my $version = '74';
40     $OUT .= qq(
41     - <FilesMatch .php\$\>
42     - SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost"
43     - </FilesMatch>
44     - )
45     -
46     + <FilesMatch .php\$\>
47     + SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost"
48     + </FilesMatch>
49     + )
50     }
51     -
52     - #php_flag magic_quotes_gpc on
53     - #php_flag track_vars on
54     </Directory>
55    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed