/[smeserver]/rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz8150-SSLproperty2SSLRequireSSL.patch
ViewVC logotype

Diff of /rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz8150-SSLproperty2SSLRequireSSL.patch

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

Revision 1.1 by jpp, Tue Mar 9 23:24:40 2021 UTC Revision 1.3 by jpp, Wed Mar 10 06:00:27 2021 UTC
# Line 1  Line 1 
 diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/initialize-default-databases e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/initialize-default-databases  
 --- e-smith-ibays-2.6.0.old/root/etc/e-smith/events/actions/initialize-default-databases        1969-12-31 19:00:00.000000000 -0500  
 +++ e-smith-ibays-2.6.0/root/etc/e-smith/events/actions/initialize-default-databases    2021-03-09 18:20:58.284000000 -0500  
 @@ -0,0 +1,35 @@  
 +#!/usr/bin/perl -w  
 +  
 +#----------------------------------------------------------------------  
 +# copyright (C) 1999-2003 Mitel Networks Corporation  
 +#  
 +# This program is free software; you can redistribute it and/or modify  
 +# it under the terms of the GNU General Public License as published by  
 +# the Free Software Foundation; either version 2 of the License, or  
 +# (at your option) any later version.  
 +#                
 +# This program is distributed in the hope that it will be useful,  
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of  
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
 +# GNU General Public License for more details.  
 +#                
 +# You should have received a copy of the GNU General Public License  
 +# along with this program; if not, write to the Free Software  
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  
 +#  
 +# Technical support for this program is available from Mitel Networks  
 +# Please visit our web site www.mitel.com/sme/ for details.  
 +#----------------------------------------------------------------------  
 +package esmith;  
 +  
 +use strict;  
 +use esmith::util;  
 +  
 +if (esmith::util::initialize_default_databases())  
 +{  
 +    exit 0;  
 +}  
 +else  
 +{  
 +    exit 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  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 2021-03-08 15:10:26.507000000 -0500  --- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2021-03-08 15:10:26.507000000 -0500
3  +++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays     2021-03-09 18:20:58.028000000 -0500  +++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays     2021-03-09 18:20:58.028000000 -0500
# Line 150  diff -Nur --no-dereference e-smith-ibays Line 111  diff -Nur --no-dereference e-smith-ibays
111               );               );
112    
113               # Untaint $name before use in system()               # Untaint $name before use in system()
114    diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts e-smith-ibays-2.6.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts
115    --- e-smith-ibays-2.6.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts        2016-02-05 17:52:36.000000000 -0500
116    +++ e-smith-ibays-2.6.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts    2021-03-10 00:58:57.504000000 -0500
117    @@ -4,5 +4,15 @@
118             # SME9 introduced SSLRequireSSL with enabled/disabled.
119             # This replaces local customisation, so migrate 'on' to 'enabled'
120             $ibay->set_prop ('SSLRequireSSL', 'enabled') if (($ibay->prop ('SSLRequireSSL') || '') eq 'on');
121    +
122    +       # SME10 merge SSL property (setting to redirect to https) with SSLRequireSSL (setting to force SSL in a directory)
123    +       # while they have two different purpose, most admin will want to protect one directory with SSL and ease access to their
124    +       # client to gently redirect them to https, hence the merge.
125    +       my $SSL = $DB->get_prop_and_delete($ibay->key, 'SSL') || 'disabled';
126    +
127    +       # if SSL is enabled or SSLRequireSSL is enabled we want the new one enabled
128    +       # default remains empty for disabled for the moment
129    +       $ibay->set_prop('SSLRequireSSL','enabled')  if ($SSL eq 'enabled');
130    +
131         }
132     }

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed