diff --git a/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml b/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml index 8adf264..72cbf8e 100644 --- a/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml +++ b/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml @@ -4,35 +4,39 @@ # count: rotation count of log, default is 30 rotation logger: file: /usr/local/omc/log/restagent.log - level: debug + level: warn duration: 24 count: 90 # rest agent listen ipv4/v6 and port, support multiple routines # ip: 0.0.0.0 or ::0, support IPv4/v6 +# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, +# 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts rest: - ipv4: 0.0.0.0 ipv6: - port: 3030 + port: 33030 - ipv4: 0.0.0.0 ipv6: - port: 4443 + port: 33443 schema: https - caFile: /usr/local/omc/etc/certs/rootca.crt - certFile: /usr/local/omc/etc/certs/tsa-omc.crt - keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key + clientAuthType: 0 + caFile: /usr/local/omc/etc/certs/omc-ca.crt + certFile: /usr/local/omc/etc/certs/omc-server.crt + keyFile: /usr/local/omc/etc/certs/omc-server.key webServer: enabled: true rootDir: /usr/local/omc/htdocs/front listen: - - addr: :8080 + - addr: :80 schema: http - - addr: :8443 + - addr: :443 schema: https - caFile: /usr/local/omc/etc/certs/rootca.crt - certFile: /usr/local/omc/etc/certs/tsa-omc.crt - keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key + clientAuthType: 0 + caFile: /usr/local/omc/etc/certs/omc-ca.crt + certFile: /usr/local/omc/etc/certs/omc-server.crt + keyFile: /usr/local/omc/etc/certs/omc-server.key database: type: mysql @@ -41,89 +45,116 @@ database: host: 127.0.0.1 port: 33066 name: omc_db + connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: /usr/local/omc/database -# Redis 缓存数据,数据源声明全小写 +# Redis data cache redis: dataSource: - # OMC系统使用库 + # OMC system db default: port: 6379 # Redis port host: "127.0.0.1" # Redis host - password: "" + password: "helloearth" db: 10 # Redis db_num - # UDM网元用户库 + # UDM sub/auth db udmuser: port: 6379 # Redis port host: "127.0.0.1" - password: "" + password: "helloearth" db: 0 # Redis db_num - # 多个数据源时可以用这个指定默认的数据源 + # used to specify the default data source for multiple data resourece defaultDataSourceName: "default" +# sleep: time delay for after write buffer (millisecond) +# deadLine: timeout for io read and write (second) mml: port: 4100 + port2: 5002 sleep: 200 + deadLine: 10 + sizeRow: 600 + sizeCol: 128 + bufferSize: 65535 user: admin password: admin mmlHome: ./mmlhome - upload: /home/agtuser +# NE config ne: - user: agtuser + user: omcuser etcdir: /usr/local/etc bindir: /usr/local/bin omcdir: /usr/local/omc scpdir: /tmp licensedir: /usr/local/etc/{neType}/license + # backup etc list of IMS, does not contain spaces + etcListIMS: '{*.yaml,mmtel,vars.cfg}' + etcListDefault: '{*.yaml,*.conf,*.cfg}' + # true/false to overwrite config file when dpkg ne software + dpkgOverwrite: false + # dpkg timeout (second) + dpkgTimeout: 180 # chk2ne: true/false, if put OmcNeConfig parameters to NE omc: - uriPrefix: /api/rest/oam + uriPrefix: "/omc/rest" neType: OMC neId: 001 rmUID: 4400HX101 neName: OMC - province: GD + province: "" vendor: "" - dn: 4600 + dn: "" chk2ne: false - sn: 13750650 + sn: "-" checksign: false + rootDir: /usr/local/omc + binDir: /usr/local/omc/bin backup: /usr/local/omc/backup upload: /usr/local/omc/upload frontUpload: /usr/local/omc/htdocs/front/upload frontTraceDir: /usr/local/omc/htdocs/front/trace software: /usr/local/omc/software license: /usr/local/omc/license - gtpUri: gtp:192.168.2.119:2152 + gtpUri: gtp:192.168.2.119:32152 checkContentType: false testMode: false rbacMode: true runDir: /usr/local/omc/run + cmdTimeout: 120 # Alarm module setting # Forward interface: -# email/sms +# email/sms/smsc alarm: forwardAlarm: true email: - smtp: smtp@xxx.com + smtp: smtp.xxx.com port: 25 - user: smtpuser - password: smtpuser@omc + user: smtpuser@xxx.com + password: xxxxxx + # TLS skip verify: true/false + tlsSkipVerify: true + smProxy: smsc sms: apiURL: http://smsc.xxx.com accessKeyID: xxx accessKeySecret: xxx signName: XXX SMSC templateCode: 1000 + smsc: + addr: "192.168.13.114:2775" + systemID: "alarmsmsfw" + password: "omc123" + systemType: "" -#User authorized information +# User authorized information # crypt: mysql/md5/bcrypt # token: true/false to check accessToken # expires for session, unit: second # Support single/multiple session of user +# auth: crypt: bcrypt token: true @@ -148,5 +179,5 @@ params: rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}" testConfig: - enabled: true + enabled: false file: /usr/local/omc/etc/testconfig.yaml \ No newline at end of file diff --git a/debbuild/usr/local/omc/etc/default/restconf.yaml b/debbuild/usr/local/omc/etc/default/restconf.yaml index 8adf264..72cbf8e 100644 --- a/debbuild/usr/local/omc/etc/default/restconf.yaml +++ b/debbuild/usr/local/omc/etc/default/restconf.yaml @@ -4,35 +4,39 @@ # count: rotation count of log, default is 30 rotation logger: file: /usr/local/omc/log/restagent.log - level: debug + level: warn duration: 24 count: 90 # rest agent listen ipv4/v6 and port, support multiple routines # ip: 0.0.0.0 or ::0, support IPv4/v6 +# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, +# 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts rest: - ipv4: 0.0.0.0 ipv6: - port: 3030 + port: 33030 - ipv4: 0.0.0.0 ipv6: - port: 4443 + port: 33443 schema: https - caFile: /usr/local/omc/etc/certs/rootca.crt - certFile: /usr/local/omc/etc/certs/tsa-omc.crt - keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key + clientAuthType: 0 + caFile: /usr/local/omc/etc/certs/omc-ca.crt + certFile: /usr/local/omc/etc/certs/omc-server.crt + keyFile: /usr/local/omc/etc/certs/omc-server.key webServer: enabled: true rootDir: /usr/local/omc/htdocs/front listen: - - addr: :8080 + - addr: :80 schema: http - - addr: :8443 + - addr: :443 schema: https - caFile: /usr/local/omc/etc/certs/rootca.crt - certFile: /usr/local/omc/etc/certs/tsa-omc.crt - keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key + clientAuthType: 0 + caFile: /usr/local/omc/etc/certs/omc-ca.crt + certFile: /usr/local/omc/etc/certs/omc-server.crt + keyFile: /usr/local/omc/etc/certs/omc-server.key database: type: mysql @@ -41,89 +45,116 @@ database: host: 127.0.0.1 port: 33066 name: omc_db + connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: /usr/local/omc/database -# Redis 缓存数据,数据源声明全小写 +# Redis data cache redis: dataSource: - # OMC系统使用库 + # OMC system db default: port: 6379 # Redis port host: "127.0.0.1" # Redis host - password: "" + password: "helloearth" db: 10 # Redis db_num - # UDM网元用户库 + # UDM sub/auth db udmuser: port: 6379 # Redis port host: "127.0.0.1" - password: "" + password: "helloearth" db: 0 # Redis db_num - # 多个数据源时可以用这个指定默认的数据源 + # used to specify the default data source for multiple data resourece defaultDataSourceName: "default" +# sleep: time delay for after write buffer (millisecond) +# deadLine: timeout for io read and write (second) mml: port: 4100 + port2: 5002 sleep: 200 + deadLine: 10 + sizeRow: 600 + sizeCol: 128 + bufferSize: 65535 user: admin password: admin mmlHome: ./mmlhome - upload: /home/agtuser +# NE config ne: - user: agtuser + user: omcuser etcdir: /usr/local/etc bindir: /usr/local/bin omcdir: /usr/local/omc scpdir: /tmp licensedir: /usr/local/etc/{neType}/license + # backup etc list of IMS, does not contain spaces + etcListIMS: '{*.yaml,mmtel,vars.cfg}' + etcListDefault: '{*.yaml,*.conf,*.cfg}' + # true/false to overwrite config file when dpkg ne software + dpkgOverwrite: false + # dpkg timeout (second) + dpkgTimeout: 180 # chk2ne: true/false, if put OmcNeConfig parameters to NE omc: - uriPrefix: /api/rest/oam + uriPrefix: "/omc/rest" neType: OMC neId: 001 rmUID: 4400HX101 neName: OMC - province: GD + province: "" vendor: "" - dn: 4600 + dn: "" chk2ne: false - sn: 13750650 + sn: "-" checksign: false + rootDir: /usr/local/omc + binDir: /usr/local/omc/bin backup: /usr/local/omc/backup upload: /usr/local/omc/upload frontUpload: /usr/local/omc/htdocs/front/upload frontTraceDir: /usr/local/omc/htdocs/front/trace software: /usr/local/omc/software license: /usr/local/omc/license - gtpUri: gtp:192.168.2.119:2152 + gtpUri: gtp:192.168.2.119:32152 checkContentType: false testMode: false rbacMode: true runDir: /usr/local/omc/run + cmdTimeout: 120 # Alarm module setting # Forward interface: -# email/sms +# email/sms/smsc alarm: forwardAlarm: true email: - smtp: smtp@xxx.com + smtp: smtp.xxx.com port: 25 - user: smtpuser - password: smtpuser@omc + user: smtpuser@xxx.com + password: xxxxxx + # TLS skip verify: true/false + tlsSkipVerify: true + smProxy: smsc sms: apiURL: http://smsc.xxx.com accessKeyID: xxx accessKeySecret: xxx signName: XXX SMSC templateCode: 1000 + smsc: + addr: "192.168.13.114:2775" + systemID: "alarmsmsfw" + password: "omc123" + systemType: "" -#User authorized information +# User authorized information # crypt: mysql/md5/bcrypt # token: true/false to check accessToken # expires for session, unit: second # Support single/multiple session of user +# auth: crypt: bcrypt token: true @@ -148,5 +179,5 @@ params: rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}" testConfig: - enabled: true + enabled: false file: /usr/local/omc/etc/testconfig.yaml \ No newline at end of file