From 0d515b9bf4016afe74a81f2a6eed5442ee37c843 Mon Sep 17 00:00:00 2001 From: chenglch Date: Mon, 15 Jan 2018 13:49:21 +0800 Subject: [PATCH] Modify the default configuration for gocons As output plugins are suported by goconserver, this patch modify the configuration file accordingly. partial: #4597 --- xCAT-server/lib/perl/xCAT/Goconserver.pm | 51 ++++++++++++++++-------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm index 7f281cde4..b6a55a390 100644 --- a/xCAT-server/lib/perl/xCAT/Goconserver.pm +++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm @@ -218,23 +218,40 @@ sub is_conserver_running { #------------------------------------------------------------------------------- sub build_conf { - # TODO(chenglch): add -f options to support import the configuration file customized by the user, - # it would be friendly to the version control system. - my $config= "#generated by xcat ".xCAT::Utils->Version()."\n". - "global:\n". - " host: 0.0.0.0\n". - " ssl_key_file: /etc/xcat/cert/server-cred.pem\n". - " ssl_cert_file: /etc/xcat/cert/server-cred.pem\n". - " ssl_ca_cert_file: /etc/xcat/cert/ca.pem\n". - " logfile: /var/log/goconserver/server.log # the log for goconserver\n". - "api:\n". - " port: $go_api_port # the port for rest api\n". - "console:\n". - " datadir: /var/lib/goconserver/ # the data file to save the hosts\n". - " port: $go_cons_port # the port for console\n". - " logdir: ".CONSOLE_LOG_DIR." # log files for session nodes\n". - " log_timestamp: true # log the timestamp at the beginning of line\n". - " reconnect_interval: 10 # retry interval in second if console could not be connected\n"; + my $config = "#generated by xcat ".xCAT::Utils->Version()."\n". + "global:\n". + " host: 0.0.0.0\n". + " ssl_key_file: /etc/xcat/cert/server-cred.pem\n". + " ssl_cert_file: /etc/xcat/cert/server-cred.pem\n". + " ssl_ca_cert_file: /etc/xcat/cert/ca.pem\n". + " logfile: /var/log/goconserver/server.log # the log for goconserver\n". + "api:\n". + " port: $go_api_port # the port for rest api\n". + "console:\n". + " datadir: /var/lib/goconserver/ # the data file to save the hosts\n". + " port: $go_cons_port # the port for console\n". + " log_timestamp: true # log the timestamp at the beginning of line\n". + " reconnect_interval: 10 # retry interval in second if console could not be connected\n". + " logger: # multiple logger targets could be specified\n". + " file: # file logger, valid fields: name,logdir. Accept array in yaml format\n". + " - name: default # the identity name customized by user\n". + " logdir: ".CONSOLE_LOG_DIR." # default log directory of xcat\n". + " # - name: goconserver \n". + " # logdir: /var/log/goconserver/nodes \n". + " # tcp: # valied fields: name, host, port, timeout, ssl_key_file, ssl_cert_file, ssl_ca_cert_file, ssl_insecure\n". + " # - name: logstash \n". + " # host: 127.0.0.1 \n". + " # port: 9653 \n". + " # timeout: 3 # default 3 second\n". + " # - name: filebeat \n". + " # host: \n". + " # port: \n". + " # udp: # valid fiedls: name, host, port, timeout\n". + " # - name: rsyslog \n". + " # host: \n". + " # port: \n". + " # timeout: # default 3 second\n"; + my $file; my $ret = open ($file, '>', '/etc/goconserver/server.conf'); if ($ret == 0) {