/[smeserver]/rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0-force-https.patch
ViewVC logotype

Contents of /rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0-force-https.patch

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

Revision 1.2 - (show annotations) (download)
Sun Mar 9 08:25:12 2014 UTC (10 years, 8 months ago) by stephdl
Branch: MAIN
CVS Tags: e-smith-ibays-2_4_0-7_el6_sme, e-smith-ibays-2_4_0-14_el6_sme, e-smith-ibays-2_4_0-12_el6_sme, e-smith-ibays-2_4_0-13_el6_sme, e-smith-ibays-2_4_0-11_el6_sme, e-smith-ibays-2_4_0-8_el6_sme, HEAD
Changes since 1.1: +1 -1 lines
Error occurred while calculating annotation data. 
i have updated the patch e-smith-ibays-2.4.0-force-https.patch in order to solve the bug 3675. I do not modified the spec file. Please build the package
1 diff -Nur e-smith-ibays-2.4.0-original/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent
2 --- e-smith-ibays-2.4.0-original/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2008-10-07 19:35:53.000000000 +0200
3 +++ e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2013-09-16 19:57:39.668598361 +0200
4 @@ -42,7 +42,12 @@
5 $OUT .= "\n";
6 $OUT .= " # $key ibay ($name)\n";
7 $OUT .= "\n";
8 -
9 + my $SSLPort = $modSSL{'TCPPort'} || '443';
10 +
11 + if (( $port ne $SSLPort ) && (($ibay->prop('SSL') || 'disabled') eq 'enabled')){
12 + $OUT .= " RewriteEngine on\n";
13 + $OUT .= " RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}/$key\$1 \[L,R\]\n";
14 + }
15 if ($cgiBin)
16 {
17 $OUT .= " ScriptAlias /$key/cgi-bin $basedir/cgi-bin\n";
18 diff -Nur e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays
19 --- e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays 2008-10-07 19:35:53.000000000 +0200
20 +++ e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays 2013-09-16 19:52:27.961524745 +0200
21 @@ -120,6 +120,9 @@
22 <field type="select" id="CgiBin" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
23 <label>ALLOW_DYNAMIC_CONTENT</label>
24 </field>
25 + <field type="select" id="SSL" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
26 + <label>HTTPS_Only</label>
27 + </field>
28 <subroutine src="print_save_or_add_button()" />
29 </page>
30 <page name="Remove" pre-event="turn_off_buttons()" post-event="remove_ibay()">
31 diff -Nur e-smith-ibays-2.4.0-original/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm e-smith-ibays-2.4.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm
32 --- e-smith-ibays-2.4.0-original/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm 2013-01-31 22:31:37.000000000 +0100
33 +++ e-smith-ibays-2.4.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm 2013-09-16 19:49:43.576807649 +0200
34 @@ -248,6 +248,8 @@
35 $rec->prop('PublicAccess'));
36 $q->param(-name=>'CgiBin',-value=>
37 $rec->prop('CgiBin'));
38 + $q->param(-name=>'SSL',-value=>
39 + $rec->prop('SSL'));
40 }
41 } else {
42 print qq(
43 @@ -512,6 +514,7 @@
44 CgiBin => $self->cgi->param('CgiBin'),
45 Group => $self->cgi->param('group'),
46 PublicAccess => $self->cgi->param('publicAccess'),
47 + SSL => $self->cgi->param('SSL'),
48 UserAccess => $self->cgi->param('userAccess'),
49 Uid => $uid,
50 Gid => $uid,
51 @@ -541,6 +544,7 @@
52 CgiBin => $self->cgi->param('CgiBin'),
53 Group => $self->cgi->param('group'),
54 PublicAccess => $self->cgi->param('publicAccess'),
55 + SSL => $self->cgi->param('SSL'),
56 UserAccess => $self->cgi->param('userAccess'),
57 );
58
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed