/[smeserver]/rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz11774-require.patch
ViewVC logotype

Annotation of /rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz11774-require.patch

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

Revision 1.2 - (hide annotations) (download)
Fri May 27 02:02:30 2022 UTC (2 years ago) by jpp
Branch: MAIN
CVS Tags: e-smith-ibays-2_6_0-20_el7_sme, e-smith-ibays-2_6_0-19_el7_sme, HEAD
Changes since 1.1: +16 -0 lines 
* Thu May 26 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-19.sme
- add missing elements to e-smith-ibays-update event to activate changes [SME: 11774]
1 jpp 1.1 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
2     --- 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
3     +++ 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
4     @@ -28,63 +28,63 @@
5     }
6     elsif ($properties{'PublicAccess'} eq 'local')
7     {
8     - $allow = $localAccess;
9     + $allow = "ip $localAccess";
10     $pass = 0;
11     - $satisfy = 'all';
12     + $satisfy = 'All';
13     }
14     elsif ($properties{'PublicAccess'} eq 'local-pw')
15     {
16     - $allow = $localAccess;
17     + $allow = "ip $localAccess";
18     $pass = 1;
19     - $satisfy = 'all';
20     + $satisfy = 'All';
21     }
22     elsif ($properties{'PublicAccess'} eq 'global')
23     {
24     - $allow = 'all';
25     + $allow = 'all granted';
26     $pass = 0;
27     - $satisfy = 'all';
28     + $satisfy = 'All';
29     }
30     elsif ($properties{'PublicAccess'} eq 'global-pw')
31     {
32     - $allow = 'all';
33     + $allow = 'all granted';
34     $pass = 1;
35     - $satisfy = 'all';
36     + $satisfy = 'All';
37     }
38     elsif ($properties{'PublicAccess'} eq 'global-pw-remote')
39     {
40     - $allow = $localAccess;
41     + $allow = "ip $localAccess";
42     $pass = 1;
43     - $satisfy = 'any';
44     + $satisfy = 'Any';
45     }
46     }
47     elsif ($properties {'ReadAccess'} eq 'global')
48     {
49     if ($properties {'UsePassword'} eq 'yes')
50     {
51     - $allow = 'all';
52     + $allow = 'all granted';
53     $pass = 1;
54     - $satisfy = 'all';
55     + $satisfy = 'All';
56     }
57     else
58     {
59     - $allow = 'all';
60     + $allow = 'all granted';
61     $pass = 0;
62     - $satisfy = 'all';
63     + $satisfy = 'All';
64     }
65     }
66     else
67     {
68     if ($properties {'UsePassword'} eq 'yes')
69     {
70     - $allow = $localAccess;
71     + $allow = "ip $localAccess";
72     $pass = 1;
73     - $satisfy = 'all';
74     + $satisfy = 'All';
75     }
76     else
77     {
78     - $allow = $localAccess;
79     + $allow = "ip $localAccess";
80     $pass = 0;
81     - $satisfy = 'all';
82     + $satisfy = 'All';
83     }
84     }
85    
86     @@ -120,23 +120,25 @@
87     $OUT .= " DirectoryIndex index.shtml index.htm index.html\n";
88     $OUT .= " Options +IncludesNOEXEC\n";
89     $OUT .= " <FilesMatch \"\\.(phar|php|phtml)\$\">\n";
90     - $OUT .= " order deny,allow\n";
91     - $OUT .= " Deny from all\n";
92     + $OUT .= " Require all denied\n";
93     $OUT .= " </FilesMatch>\n";
94     }
95     $OUT .= " AllowOverride $allowOverride\n";
96     - $OUT .= " order deny,allow\n";
97     - $OUT .= " deny from all\n";
98     - $OUT .= " allow from $allow\n";
99     if ($pass)
100     {
101     $OUT .= " AuthName \"$properties{'Name'}\"\n";
102     $OUT .= " AuthType Basic\n";
103     $OUT .= " AuthBasicProvider external\n";
104     $OUT .= " AuthExternal pwauth\n";
105     - $OUT .= " require user $key\n";
106     - $OUT .= " Satisfy $satisfy\n";
107     - }
108     + $OUT .= " <Require$satisfy>\n";
109     + $OUT .= " Require user $key\n";
110     + $OUT .= " Require $allow\n";
111     + $OUT .= " </Require$satisfy>\n";
112     + }
113     + else
114     + {
115     + $OUT .= " Require $allow\n";
116     + }
117    
118     $OUT .= "</Directory>\n";
119    
120     @@ -151,18 +153,22 @@
121     $OUT .= " Options ExecCGI\n";
122     }
123     $OUT .= " AllowOverride None\n";
124     - $OUT .= " order deny,allow\n";
125     - $OUT .= " deny from all\n";
126     - $OUT .= " allow from $allow\n";
127     if ($pass)
128     {
129     $OUT .= " AuthName \"$properties{'Name'}\"\n";
130     $OUT .= " AuthType Basic\n";
131     $OUT .= " AuthBasicProvider external\n";
132     $OUT .= " AuthExternal pwauth\n";
133     - $OUT .= " require user $key\n";
134     - $OUT .= " Satisfy $satisfy\n";
135     + $OUT .= " <Require$satisfy>\n";
136     + $OUT .= " Require user $key\n";
137     + $OUT .= " Require $allow\n";
138     + $OUT .= " </Require$satisfy>\n";
139     + }
140     + else
141     + {
142     + $OUT .= " Require $allow\n";
143     }
144     +
145     $OUT .= "</Directory>\n";
146    
147     $OUT .= "\n";
148     @@ -172,17 +178,20 @@
149     $OUT .= " SSLRequireSSL\n";
150     }
151     $OUT .= " AllowOverride None\n";
152     - $OUT .= " order deny,allow\n";
153     - $OUT .= " deny from all\n";
154     - $OUT .= " allow from $allow\n";
155     if ($pass)
156     {
157     $OUT .= " AuthName \"$properties{'Name'}\"\n";
158     $OUT .= " AuthType Basic\n";
159     $OUT .= " AuthBasicProvider external\n";
160     $OUT .= " AuthExternal pwauth\n";
161     - $OUT .= " require user $key\n";
162     - $OUT .= " Satisfy $satisfy\n";
163     + $OUT .= " <Require$satisfy>\n";
164     + $OUT .= " Require user $key\n";
165     + $OUT .= " Require $allow\n";
166     + $OUT .= " </Require$satisfy>\n";
167     + }
168     + else
169     + {
170     + $OUT .= " Require $allow\n";
171     }
172     $OUT .= "</Directory>\n";
173     }
174 jpp 1.2 diff -Nur --no-dereference e-smith-ibays-2.6.0.old/createlinks e-smith-ibays-2.6.0/createlinks
175     --- e-smith-ibays-2.6.0.old/createlinks 2022-05-26 21:52:25.409000000 -0400
176     +++ e-smith-ibays-2.6.0/createlinks 2022-05-26 21:58:27.750000000 -0400
177     @@ -35,3 +35,12 @@
178     event_link("init-ibays", $event, "15");
179     }
180    
181     +my $event = "e-smith-ibays-update";
182     +templates2events("/etc/httpd/conf/httpd.conf", $event);
183     +templates2events("/samba/smb.conf", $event);
184     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smbd");
185     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/nmbd");
186     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
187     +event_link('store-ldap-smbpasswd', $_, "06");
188     +event_link("systemd-reload", $event, "89");
189     +event_link("systemd-default", $event, "88");
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed