diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index c2fc4ae60..4967e7220 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -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.', diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig index 8538d16eb..b0ced3136 100755 --- a/xCAT-server/sbin/xcatconfig +++ b/xCAT-server/sbin/xcatconfig @@ -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.");