Merge branch 'lichang' into lite

build/default/omc.yaml

@@ -13,11 +13,11 @@ serverVersion: "lite"
 server:
   - ipv4: 0.0.0.0
     ipv6: ""
-    port: 33080
+    port: 33080 # http listen port
     schema: http
   - ipv4: 0.0.0.0
     ipv6: ""
-    port: 33443
+    port: 33443 # https listen port
     schema: https
     certFile: /usr/local/etc/omc/certs/www.omc.net.crt
     keyFile: /usr/local/etc/omc/certs/www.omc.net.key
@@ -26,7 +26,7 @@ server:
 # web service configuration
 # if you are using nginx to take over, you can disable the
 webServer:
-  enabled: true
+  enabled: true # web server enabled, default false
   rootDir: /usr/local/etc/omc/web
   listen:
     - addr: 0.0.0.0:44080
@@ -36,13 +36,12 @@ webServer:
       certFile: /usr/local/etc/omc/certs/www.omc.net.crt
       keyFile: /usr/local/etc/omc/certs/www.omc.net.key
 
-
-# track configuration for NE
+# track configuration for NE signaling trace
+# host fill in the specific IP address
 trace:
-  enabled: false
-  host: "172.16.5.100" # fill in the specific IP address
-  port: 33033
-
+  enabled: false # trace enabled, default false
+  host: "172.16.5.100" # trace host, default 127.0.0.1
+  port: 33033 # trace port, default 33033
 
 # data source
 database:
@@ -50,15 +49,15 @@ database:
     # std: standard
     std:
       type: "mysql"
-      host: "127.0.0.1"
-      port: 33066
-      username: "root"
-      password: "1000omc@kp!"
-      database: "omc_db"
+      host: "127.0.0.1" # mysql host
+      port: 33066 # mysql port
+      username: "root" # mysql username
+      password: "1000omc@kp!" # mysql password
+      database: "omc_db" # mysql database
     # lite: lite
     lite:
       type: "sqlite"
-      database: "/usr/local/etc/omc/database/omc_db.sqlite" 
+      database: "/usr/local/etc/omc/database/omc_db.sqlite" # sqlite database
   # default data source name
   defaultDataSourceName: "lite"
 
@@ -67,9 +66,9 @@ database:
 redis:
   dataSource:
     default:
-      port: 6379 # Redis port
-      host: "127.0.0.1" # Redis host
-      password: "helloearth"
+      port: 6379 # redis port
+      host: "127.0.0.1" # redis host
+      password: "helloearth" # redis password
       db: 10 # Redis db_num
   # default data source name
   defaultDataSourceName: "default"