chore: 打包程序restagent变更omc

2024-03-19 20:20:12 +08:00
parent a4c71a4d70
commit b01bc44578
84 changed files with 308 additions and 190 deletions
--- a/build/build/lib/systemd/system/restagent.service
+++ b/build/build/lib/systemd/system/restagent.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=REST agent daemon
+Description=OMC Service daemon
 After=network-online.target

 [Service]
@@ -7,7 +7,7 @@ Type=simple
 LimitNOFILE=65535

 Restart=always
-ExecStart=/usr/local/omc/bin/restagent -c /usr/local/omc/etc/restconf.yaml
+ExecStart=/usr/local/omc/bin/omc -c /usr/local/omc/etc/omc.yaml
 RestartSec=2
 RestartPreventExitStatus=1
 ExecReload=/bin/kill -HUP $MAINPID
--- a/build/build/usr/local/omc/etc/default/restconf.yaml
+++ b/build/build/usr/local/omc/etc/default/restconf.yaml
@@ -3,18 +3,18 @@
 # duration: rotation time with xx hours, example: 1/12/24 hours
 # count: rotation count of log, default is 30 rotation
 logger:
-  file: /usr/local/omc/log/restagent.log 
+  file: /usr/local/omc/log/omc.log
  level: debug
  duration: 24
-  count: 90   
+  count: 90

 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
 rest:
  - ipv4: 0.0.0.0
-    ipv6: 
+    ipv6:
    port: 3030
-  - ipv4: 
+  - ipv4:
    ipv6: ::0
    port: 6060

@@ -58,15 +58,15 @@ omc:
  frontUpload: /usr/local/omc/htdocs/front/upload
  software: /usr/local/omc/software
  license: /usr/local/omc/license
-  gtpUri: gtp:192.168.2.119:2152 
+  gtpUri: gtp:192.168.2.119:2152
  checkContentType: false
  testMode: true
  rbacMode: true

 # Alarm module setting
 # Forward interface:
-# email/sms  
-alarm: 
+# email/sms
+alarm:
  forwardAlarm: true
  email:
    smtp: smtp@ruijie.com.cn
@@ -79,7 +79,7 @@ alarm:
    accessKeySecret: xxxx
    signName: Ruijie SMSC
    templateCode: 1000
-  
+
 #User authorized information
 # crypt: mysql/md5/bcrypt
 # token: true/false to check accessToken
@@ -91,7 +91,7 @@ auth:
  expires: 1800
  session: multiple

-# Parameter for limit number 
+# Parameter for limit number
 # rmuid_maxnum: the max number of rmUID, default: 50
 # alarmid_maxnum: the max number of AlarmID, default: 50
 # pmid_maxnum: the max number of pmID, default: 50
@@ -108,4 +108,40 @@ params:

 testConfig:
  enabled: true
-  file: /usr/local/omc/etc/testconfig.yaml
+  file: /usr/local/omc/etc/testconfig.yaml
+
+# NMS-中国星网研究院
+nmsCXY:
+  # 注入路由组
+  routerGroup: "/nms-cxy/api/rest"
+  # 专业编码2位 核心网HX 无线网WX
+  professionCode: "HX"
+  # 厂商编码2位 中信科ZX
+  vendorCode: "AG"
+  # OMC编号3位
+  omcCode: "001"
+  # 设备序列号
+  serialNumber: "1153492"
+  # Kafka配置
+  kafka:
+    addrs:
+      - "192.168.5.59:19092"
+      - "192.168.5.59:29092"
+      - "192.168.5.59:39092"
+    # 启用 Kerberos 认证
+    krb5:
+      enable: false
+      config:
+        configPath: "/path/to/krb5.conf"
+        keyTabPath: "/path/to/keytab"
+        serviceName: "kafka"
+        realm: "EXAMPLE.COM"
+        username: "client"
+
+  # OSS配置
+  oss:
+    bucketname: "omc-bucket"
+    endpoint: "192.168.5.59:9000"
+    useSSL: false
+    accessKeyID: "aOW0r1gfw74G88Z3XZJ6"
+    secretAccessKey: "9tDErvtCEuVox6LoQu5BOVtycQKcQjlXOGvjl1eD"
--- a/build/config/etc/default/restconf.yaml
+++ b/build/config/etc/default/restconf.yaml
@@ -3,21 +3,21 @@
 # duration: rotation time with xx hours, example: 1/12/24 hours
 # count: rotation count of log, default is 30 rotation
 logger:
-  file: /usr/local/omc/log/restagent.log 
+  file: /usr/local/omc/log/omc.log
  level: debug
  duration: 24
-  count: 90   
+  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, 
+# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert,
 #                 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
 rest:
  - ipv4: 0.0.0.0
-    ipv6: 
+    ipv6:
    port: 33030
  - ipv4: 0.0.0.0
-    ipv6: 
+    ipv6:
    port: 33443
    schema: https
    clientAuthType: 0
@@ -26,9 +26,9 @@ rest:
    keyFile: /usr/local/omc/etc/certs/omc-server.key

 webServer:
-  enabled: true
+  enabled: false
  rootDir: /usr/local/omc/htdocs/front
-  listen: 
+  listen:
    - addr: :80
      schema: http
    - addr: :443
@@ -86,9 +86,9 @@ ne:
  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 
+  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
@@ -114,7 +114,7 @@ omc:
  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:2152
  checkContentType: false
  testMode: false
  rbacMode: true
@@ -123,8 +123,8 @@ omc:

 # Alarm module setting
 # Forward interface:
-# email/sms  
-alarm: 
+# email/sms
+alarm:
  forwardAlarm: true
  email:
    smtp: smtp.xxx.com
@@ -132,14 +132,14 @@ alarm:
    user: smtpuser@xxx.com
    password: xxxxxx
    # TLS skip verify: true/false
-    tlsSkipVerify: true    
+    tlsSkipVerify: true
  sms:
    apiURL: http://smsc.xxx.com
    accessKeyID: xxx
    accessKeySecret: xxx
    signName: XXX SMSC
    templateCode: 1000
-  
+
 # User authorized information
 # crypt: mysql/md5/bcrypt
 # token: true/false to check accessToken
@@ -154,7 +154,7 @@ auth:
  publicKey: /usr/local/omc/etc/certs/omc
  privateKey: /usr/local/omc/etc/certs/omc

-# Parameter for limit number 
+# Parameter for limit number
 # rmuid_maxnum: the max number of rmUID, default: 50
 # alarmid_maxnum: the max number of AlarmID, default: 50
 # pmid_maxnum: the max number of pmID, default: 50
@@ -171,4 +171,40 @@ params:

 testConfig:
  enabled: false
-  file: /usr/local/omc/etc/testconfig.yaml
+  file: /usr/local/omc/etc/testconfig.yaml
+
+# NMS-中国星网研究院
+nmsCXY:
+  # 注入路由组
+  routerGroup: "/nms-cxy/api/rest"
+  # 专业编码2位 核心网HX 无线网WX
+  professionCode: "HX"
+  # 厂商编码2位 中信科ZX
+  vendorCode: "AG"
+  # OMC编号3位
+  omcCode: "001"
+  # 设备序列号
+  serialNumber: "1153492"
+  # Kafka配置
+  kafka:
+    addrs:
+      - "192.168.5.59:19092"
+      - "192.168.5.59:29092"
+      - "192.168.5.59:39092"
+    # 启用 Kerberos 认证
+    krb5:
+      enable: false
+      config:
+        configPath: "/path/to/krb5.conf"
+        keyTabPath: "/path/to/keytab"
+        serviceName: "kafka"
+        realm: "EXAMPLE.COM"
+        username: "client"
+
+  # OSS配置
+  oss:
+    bucketname: "omc-bucket"
+    endpoint: "192.168.5.59:9000"
+    useSSL: false
+    accessKeyID: "aOW0r1gfw74G88Z3XZJ6"
+    secretAccessKey: "9tDErvtCEuVox6LoQu5BOVtycQKcQjlXOGvjl1eD"
--- a/build/config/systemd/restagent.service
+++ b/build/config/systemd/restagent.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=OMC rest agent daemon
+Description=OMC Service daemon
 After=network-online.target mysql.service

 [Service]
@@ -7,7 +7,7 @@ Type=simple
 LimitNOFILE=65535

 Restart=always
-ExecStart=/usr/local/omc/bin/restagent -c /usr/local/omc/etc/restconf.yaml
+ExecStart=/usr/local/omc/bin/omc -c /usr/local/omc/etc/omc.yaml
 RestartSec=2
 RestartPreventExitStatus=SIGTERM SIGKILL
 ExecReload=/bin/kill -HUP $MAINPID
--- a/build/debbuild/22.04/DEBIAN/postinst
+++ b/build/debbuild/22.04/DEBIAN/postinst
@@ -16,7 +16,7 @@ LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"

 echo ""
 echo "* To start/stop/restart/status omc service, please run:"
-echo "    sudo systemctl start/stop/restart/status restagent.service"
+echo "    sudo systemctl start/stop/restart/status omc.service"
 echo "    sudo systemctl start/stop/restart/status crontask.service"
 echo "    sudo systemctl start/stop/restart/status sshsvc.service"
 echo "    sudo systemctl start/stop/restart/status captrace.service"
@@ -77,14 +77,14 @@ if [ -e "${NginxSiteAvailable}/default" ]; then
    sed -i 's/listen 80 default_server;/listen 1080 default_server;/g' ${NginxSiteAvailable}/default
    sed -i 's/listen \[::\]:80 default_server;/listen \[::\]:1080 default_server;/g' ${NginxSiteAvailable}/default
 fi 
-systemctl enable restagent.service
+systemctl enable omc.service
 systemctl enable crontask.service
 systemctl enable sshsvc.service
 systemctl enable captrace.service
 systemctl enable adb.service
 systemctl daemon-reload
 sudo systemctl stop nginx.service 
-sudo systemctl stop restagent.service
+sudo systemctl stop omc.service
 sudo systemctl stop crontask.service
 sudo systemctl stop sshsvc.service
 sudo systemctl stop captrace.service
@@ -94,11 +94,11 @@ sudo systemctl start adb.service
 sudo systemctl start crontask.service
 sudo systemctl start sshsvc.service
 sudo systemctl start captrace.service
-sudo systemctl start restagent.service
+sudo systemctl start omc.service
 #sudo systemctl restart nginx.service
 #sudo systemctl restart adb.service
 #sudo systemctl restart crontask.service
 #sudo systemctl restart sshsvc.service
 #sudo systemctl restart captrace.service
-#sudo systemctl restart restagent.service
+#sudo systemctl restart omc.service

--- a/build/debbuild/22.04/DEBIAN/postrm
+++ b/build/debbuild/22.04/DEBIAN/postrm
@@ -9,7 +9,7 @@ rm libwiretap.so
 rm libwsutil.so.13
 rm libwsutil.so
 systemctl stop nginx.service
-systemctl stop restagent.service
+systemctl stop omc.service
 systemctl stop crontask.service
 systemctl stop sshsvc.service
 systemctl stop captrace.service
@@ -18,7 +18,7 @@ systemctl stop adb.service
 #rm -rf /usr/local/omc
 rm -rf /etc/nginx/conf.d/omc.conf

-systemctl disable restagent.service
+systemctl disable omc.service
 systemctl disable crontask.service
 systemctl disable sshsvc.service
 systemctl disable captrace.service
--- a/build/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml
+++ b/build/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml
@@ -3,19 +3,19 @@
 # duration: rotation time with xx hours, example: 1/12/24 hours
 # count: rotation count of log, default is 30 rotation
 logger:
-  file: /usr/local/omc/log/restagent.log 
+  file: /usr/local/omc/log/omc.log
  level: debug
  duration: 24
-  count: 90   
+  count: 90

 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
 rest:
  - ipv4: 0.0.0.0
-    ipv6: 
+    ipv6:
    port: 3030
  - ipv4: 0.0.0.0
-    ipv6: 
+    ipv6:
    port: 4443
    schema: https
    caFile: /usr/local/omc/etc/certs/rootca.crt
@@ -23,9 +23,9 @@ rest:
    keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key

 webServer:
-  enabled: true
+  enabled: false
  rootDir: /usr/local/omc/htdocs/front
-  listen: 
+  listen:
    - addr: :8080
      schema: http
    - addr: :8443
@@ -96,7 +96,7 @@ omc:
  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:2152
  checkContentType: false
  testMode: false
  rbacMode: true
@@ -104,8 +104,8 @@ omc:

 # Alarm module setting
 # Forward interface:
-# email/sms  
-alarm: 
+# email/sms
+alarm:
  forwardAlarm: true
  email:
    smtp: smtp@xxx.com
@@ -118,7 +118,7 @@ alarm:
    accessKeySecret: xxx
    signName: XXX SMSC
    templateCode: 1000
-  
+
 #User authorized information
 # crypt: mysql/md5/bcrypt
 # token: true/false to check accessToken
@@ -132,7 +132,7 @@ auth:
  publicKey: /usr/local/omc/etc/certs/omc
  privateKey: /usr/local/omc/etc/certs/omc

-# Parameter for limit number 
+# Parameter for limit number
 # rmuid_maxnum: the max number of rmUID, default: 50
 # alarmid_maxnum: the max number of AlarmID, default: 50
 # pmid_maxnum: the max number of pmID, default: 50
@@ -149,4 +149,40 @@ params:

 testConfig:
  enabled: true
-  file: /usr/local/omc/etc/testconfig.yaml
+  file: /usr/local/omc/etc/testconfig.yaml
+
+# NMS-中国星网研究院
+nmsCXY:
+  # 注入路由组
+  routerGroup: "/nms-cxy/api/rest"
+  # 专业编码2位 核心网HX 无线网WX
+  professionCode: "HX"
+  # 厂商编码2位 中信科ZX
+  vendorCode: "AG"
+  # OMC编号3位
+  omcCode: "001"
+  # 设备序列号
+  serialNumber: "1153492"
+  # Kafka配置
+  kafka:
+    addrs:
+      - "192.168.5.59:19092"
+      - "192.168.5.59:29092"
+      - "192.168.5.59:39092"
+    # 启用 Kerberos 认证
+    krb5:
+      enable: false
+      config:
+        configPath: "/path/to/krb5.conf"
+        keyTabPath: "/path/to/keytab"
+        serviceName: "kafka"
+        realm: "EXAMPLE.COM"
+        username: "client"
+
+  # OSS配置
+  oss:
+    bucketname: "omc-bucket"
+    endpoint: "192.168.5.59:9000"
+    useSSL: false
+    accessKeyID: "aOW0r1gfw74G88Z3XZJ6"
+    secretAccessKey: "9tDErvtCEuVox6LoQu5BOVtycQKcQjlXOGvjl1eD"
--- a/build/debbuild/DEBIAN/postinst
+++ b/build/debbuild/DEBIAN/postinst
@@ -16,7 +16,7 @@ LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"

 echo ""
 echo "* To start/stop/restart/status omc service, please run:"
-echo "    sudo systemctl start/stop/restart/status restagent.service"
+echo "    sudo systemctl start/stop/restart/status omc.service"
 echo "    sudo systemctl start/stop/restart/status crontask.service"
 echo "    sudo systemctl start/stop/restart/status sshsvc.service"
 echo "    sudo systemctl start/stop/restart/status captrace.service"
@@ -77,14 +77,14 @@ if [ -e "${NginxSiteAvailable}/default" ]; then
    sed -i 's/listen 80 default_server;/listen 1080 default_server;/g' ${NginxSiteAvailable}/default
    sed -i 's/listen \[::\]:80 default_server;/listen \[::\]:1080 default_server;/g' ${NginxSiteAvailable}/default
 fi 
-systemctl enable restagent.service
+systemctl enable omc.service
 systemctl enable crontask.service
 systemctl enable sshsvc.service
 systemctl enable captrace.service
 systemctl enable adb.service
 systemctl daemon-reload
 sudo systemctl stop nginx.service 
-sudo systemctl stop restagent.service
+sudo systemctl stop omc.service
 sudo systemctl stop crontask.service
 sudo systemctl stop sshsvc.service
 sudo systemctl stop captrace.service
@@ -94,11 +94,11 @@ sudo systemctl start adb.service
 sudo systemctl start crontask.service
 sudo systemctl start sshsvc.service
 sudo systemctl start captrace.service
-sudo systemctl start restagent.service
+sudo systemctl start omc.service
 #sudo systemctl restart nginx.service
 #sudo systemctl restart adb.service
 #sudo systemctl restart crontask.service
 #sudo systemctl restart sshsvc.service
 #sudo systemctl restart captrace.service
-#sudo systemctl restart restagent.service
+#sudo systemctl restart omc.service

--- a/build/debbuild/DEBIAN/postrm
+++ b/build/debbuild/DEBIAN/postrm
@@ -9,7 +9,7 @@ rm libwiretap.so
 rm libwsutil.so.13
 rm libwsutil.so
 systemctl stop nginx.service
-systemctl stop restagent.service
+systemctl stop omc.service
 systemctl stop crontask.service
 systemctl stop sshsvc.service
 systemctl stop captrace.service
@@ -18,7 +18,7 @@ systemctl stop adb.service
 #rm -rf /usr/local/omc
 rm -rf /etc/nginx/conf.d/omc.conf

-systemctl disable restagent.service
+systemctl disable omc.service
 systemctl disable crontask.service
 systemctl disable sshsvc.service
 systemctl disable captrace.service
--- a/build/debbuild/usr/local/omc/etc/default/restconf.yaml
+++ b/build/debbuild/usr/local/omc/etc/default/restconf.yaml
@@ -3,19 +3,19 @@
 # duration: rotation time with xx hours, example: 1/12/24 hours
 # count: rotation count of log, default is 30 rotation
 logger:
-  file: /usr/local/omc/log/restagent.log 
+  file: /usr/local/omc/log/omc.log
  level: debug
  duration: 24
-  count: 90   
+  count: 90

 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
 rest:
  - ipv4: 0.0.0.0
-    ipv6: 
+    ipv6:
    port: 3030
  - ipv4: 0.0.0.0
-    ipv6: 
+    ipv6:
    port: 4443
    schema: https
    caFile: /usr/local/omc/etc/certs/rootca.crt
@@ -23,9 +23,9 @@ rest:
    keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key

 webServer:
-  enabled: true
+  enabled: false
  rootDir: /usr/local/omc/htdocs/front
-  listen: 
+  listen:
    - addr: :8080
      schema: http
    - addr: :8443
@@ -96,7 +96,7 @@ omc:
  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:2152
  checkContentType: false
  testMode: false
  rbacMode: true
@@ -104,8 +104,8 @@ omc:

 # Alarm module setting
 # Forward interface:
-# email/sms  
-alarm: 
+# email/sms
+alarm:
  forwardAlarm: true
  email:
    smtp: smtp@xxx.com
@@ -118,7 +118,7 @@ alarm:
    accessKeySecret: xxx
    signName: XXX SMSC
    templateCode: 1000
-  
+
 #User authorized information
 # crypt: mysql/md5/bcrypt
 # token: true/false to check accessToken
@@ -132,7 +132,7 @@ auth:
  publicKey: /usr/local/omc/etc/certs/omc
  privateKey: /usr/local/omc/etc/certs/omc

-# Parameter for limit number 
+# Parameter for limit number
 # rmuid_maxnum: the max number of rmUID, default: 50
 # alarmid_maxnum: the max number of AlarmID, default: 50
 # pmid_maxnum: the max number of pmID, default: 50
@@ -149,4 +149,40 @@ params:

 testConfig:
  enabled: true
-  file: /usr/local/omc/etc/testconfig.yaml
+  file: /usr/local/omc/etc/testconfig.yaml
+
+# NMS-中国星网研究院
+nmsCXY:
+  # 注入路由组
+  routerGroup: "/nms-cxy/api/rest"
+  # 专业编码2位 核心网HX 无线网WX
+  professionCode: "HX"
+  # 厂商编码2位 中信科ZX
+  vendorCode: "AG"
+  # OMC编号3位
+  omcCode: "001"
+  # 设备序列号
+  serialNumber: "1153492"
+  # Kafka配置
+  kafka:
+    addrs:
+      - "192.168.5.59:19092"
+      - "192.168.5.59:29092"
+      - "192.168.5.59:39092"
+    # 启用 Kerberos 认证
+    krb5:
+      enable: false
+      config:
+        configPath: "/path/to/krb5.conf"
+        keyTabPath: "/path/to/keytab"
+        serviceName: "kafka"
+        realm: "EXAMPLE.COM"
+        username: "client"
+
+  # OSS配置
+  oss:
+    bucketname: "omc-bucket"
+    endpoint: "192.168.5.59:9000"
+    useSSL: false
+    accessKeyID: "aOW0r1gfw74G88Z3XZJ6"
+    secretAccessKey: "9tDErvtCEuVox6LoQu5BOVtycQKcQjlXOGvjl1eD"
--- a/build/misc/actpkg.sh
+++ b/build/misc/actpkg.sh
@@ -16,7 +16,7 @@ fi
 case "${extension}" in
    deb)
        if [ ${neType} == "OMC" ]; then
-            systemctl stop restagent.service
+            systemctl stop omc.service
        fi
        expect <<EOF > ${logFile}
            spawn dpkg -i --force-all "$filename"
@@ -31,7 +31,7 @@ EOF
        ;;
    rpm)
        if [ ${neType} == "OMC" ]; then
-            systemctl stop restagent.service
+            systemctl stop omc.service
        fi    
        expect <<EOF > ${logFile}
            spawn rpm -Uvh "$filename"
--- a/build/misc/checkproc.sh
+++ b/build/misc/checkproc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-process_name="restagent" 
+process_name="omc" 

 if ! pgrep -x "$process_name" >/dev/null; then
    echo "$process_name is not running. Restarting..."
--- a/build/misc/omcsvc.sh
+++ b/build/misc/omcsvc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

-ProcList="restagent crontask sshsvc captrace adb"
-ProcListDesc="adb crontask sshsvc captrace restagent"
+ProcList="omc crontask sshsvc captrace adb"
+ProcListDesc="adb crontask sshsvc captrace omc"

 BinDir=/usr/local/omc/bin

--- a/build/misc/rbkpkg.sh
+++ b/build/misc/rbkpkg.sh
@@ -16,7 +16,7 @@ fi
 case "${extension}" in
    deb)
        if [ ${neType} == "OMC" ]; then
-            systemctl stop restagent.service
+            systemctl stop omc.service
        fi    
        expect <<EOF > ${logFile}
            spawn dpkg -i --force-all "$filename"
@@ -31,7 +31,7 @@ EOF
        ;;
    rpm)
        if [ ${neType} == "OMC" ]; then
-            systemctl stop restagent.service
+            systemctl stop omc.service
        fi    
        expect <<EOF > ${logFile}
            spawn rpm -Uvh "$filename"
--- a/build/rpmbuild/SPECS/omc.spec
+++ b/build/rpmbuild/SPECS/omc.spec
@@ -51,7 +51,7 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/*
 #cp -rf omc/database ${RPM_BUILD_ROOT}/usr/local/omc/
 #cp -rf db/* ${RPM_BUILD_ROOT}/usr/local/db/
 #cp -f nginx/omc.conf ${RPM_BUILD_ROOT}/etc/nginx/conf.d/
-#cp -f systemd/restagent.service ${RPM_BUILD_ROOT}/lib/systemd/system/restagent.service
+#cp -f systemd/omc.service ${RPM_BUILD_ROOT}/lib/systemd/system/omc.service
 #cp -f systemd/crontask.service ${RPM_BUILD_ROOT}/lib/systemd/system/crontask.service
 #cp -f systemd/sshsvc.service ${RPM_BUILD_ROOT}/lib/systemd/system/sshsvc.service
 #cp -f systemd/captrace.service ${RPM_BUILD_ROOT}/lib/systemd/system/captrace.service
@@ -110,12 +110,12 @@ if [ ! -e ${OmcDaemon} ]; then  ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi
 sed -i 's/listen       80;/listen       1080;/g' ${NginxEtcDir}/nginx.conf
 sed -i 's/listen       \[::\]:80;/listen       \[::\]:1080;/g' ${NginxEtcDir}/nginx.conf 
 systemctl daemon-reload
-systemctl enable restagent.service
+systemctl enable omc.service
 systemctl enable crontask.service
 systemctl enable sshsvc.service
 systemctl enable captrace.service
 systemctl enable adb.service
-systemctl stop restagent.service
+systemctl stop omc.service
 systemctl stop crontask.service
 systemctl stop sshsvc.service
 systemctl stop captrace.service
@@ -126,7 +126,7 @@ systemctl start nginx.service
 systemctl start captrace.service
 systemctl start sshsvc.service
 systemctl start crontask.service
-systemctl start restagent.service
+systemctl start omc.service

 # 卸载时执行
 %postun
@@ -139,7 +139,7 @@ rm libwiretap.so
 rm libwsutil.so.13
 rm libwsutil.so
 if [ "$1" = "0" ] ; then
-sudo systemctl stop restagent.service
+sudo systemctl stop omc.service
 sudo systemctl stop crontask.service
 sudo systemctl stop sshsvc.service
 sudo systemctl stop captrace.service
@@ -147,7 +147,7 @@ sudo systemctl stop adb.service
 sudo systemctl stop nginx.service 
 #rm -rf /usr/local/omc
 rm -rf /etc/nginx/conf.d/omc.conf
-sudo systemctl disable restagent.service
+sudo systemctl disable omc.service
 sudo systemctl disable crontask.service
 sudo systemctl disable sshsvc.service
 sudo systemctl disable captrace.service
@@ -156,7 +156,7 @@ sudo systemctl daemon-reload
 else
 sudo systemctl daemon-reload
 sudo systemctl stop nginx.service 
-sudo systemctl stop restagent.service
+sudo systemctl stop omc.service
 sudo systemctl stop crontask.service
 sudo systemctl stop sshsvc.service
 sudo systemctl stop captrace.service
@@ -166,7 +166,7 @@ sudo systemctl start adb.service
 sudo systemctl start crontask.service
 sudo systemctl start sshsvc.service
 sudo systemctl start captrace.service
-sudo systemctl start restagent.service
+sudo systemctl start omc.service
 fi

 # 规定那些文件必须放入安装程序中，如果没有就报错
@@ -187,7 +187,7 @@ fi
 /usr/local/omc/static
 /usr/local/db
 /etc/nginx/conf.d/omc.conf
-/lib/systemd/system/restagent.service
+/lib/systemd/system/omc.service
 /lib/systemd/system/crontask.service
 /lib/systemd/system/sshsvc.service
 /lib/systemd/system/captrace.service