xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 12:20:40 +00:00
Code Issues Releases Wiki Activity

For the newly installed xCAT-core, set site.xcatsslversion to TLSv1_2 as the default setting (#5798)

Browse Source
This commit is contained in:
Gᴏɴɢ Jie
2018-11-23 11:29:13 +08:00
committed by yangsong
parent b45acce651
commit fc49f012e6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/Schema.pm
View File

@ -1310,7 +1310,7 @@ passed as argument rather than by table value',
" xcatdport: The port used by the xcatd daemon for client/server communication.\n\n" .
" xcatiport: The port used by xcatd to receive install status updates from nodes.\n\n" .
" xcatlport: The port used by xcatd command log writer process to collect command output.\n\n" .
" xcatsslversion: The ssl version by xcatd. Default is TLSv1.\n\n" .
" xcatsslversion: The ssl version by xcatd. Default is TLSv1_2.\n\n" .
" xcatsslciphers: The ssl cipher by xcatd. Default is 3DES.\n\n",
value => 'The value of the attribute specified in the "key" column.',
comments => 'Any user-written notes.',

6
xCAT-server/sbin/xcatconfig
View File

@ -1206,7 +1206,7 @@ sub initDB
$chtabcmds .= "$::XCATROOT/sbin/chtab key=cleanupxcatpost site.value=no;";
$chtabcmds .= "$::XCATROOT/sbin/chtab key=dhcplease site.value=43200;";
$chtabcmds .= "$::XCATROOT/sbin/chtab key=auditnosyslog site.value=0;";
$chtabcmds .= "$::XCATROOT/sbin/chtab key=xcatsslversion site.value=TLSv1;";
$chtabcmds .= "$::XCATROOT/sbin/chtab key=xcatsslversion site.value=TLSv1_2;";
$chtabcmds .= "$::XCATROOT/sbin/chtab key=auditskipcmds site.value=ALL;";
#$chtabcmds .= "$::XCATROOT/sbin/chtab key=useflowcontrol site.value=yes;"; # need to fix 4031
@ -1478,8 +1478,8 @@ sub initDB
xCAT::Utils->runcmd("$cmds", -1);
if ($::RUNCMD_RC != 0) {
# if site.xcatsslversion was not set, then set the default value TLSv1
$cmds = "$::XCATROOT/sbin/chtab key=xcatsslversion site.value=TLSv1;";
# if site.xcatsslversion was not set, then set the default value TLSv1_2
$cmds = "$::XCATROOT/sbin/chtab key=xcatsslversion site.value=TLSv1_2;";
xCAT::Utils->runcmd("$cmds", 0);
if ($::RUNCMD_RC != 0) {
xCAT::MsgUtils->message('E', "Could not add default value for site.xcatsslversion.");