build: 打包说明和补充rpm安装图标文件

README.deb.md

@@ -1,8 +1,8 @@
 # Deb 安装
 
-关于kafka和oss配置在文件 `/usr/local/omc/etc/omc.yaml` 配置项nmsCXY
+关于 kafka 和 oss 配置在文件 `/usr/local/omc/etc/omc.yaml` 
 
-## 安装 Nginx
+配置项 nmsCXY
 
 ```sh
 sudo apt install -y nginx
@@ -12,7 +12,7 @@ sudo apt install -y nginx
 ## include /etc/nginx/conf.d/*.conf;
 sudo vim /etc/nginx/nginx.conf
 
-# 检查配置
+# 复制omc默认配置
 sudo cp -rf /usr/local/omc/etc/default/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 sudo vim /etc/nginx/conf.d/default.conf
 # 重启 Nginx
@@ -28,7 +28,9 @@ sudo dpkg -i kvdb-xx
 sudo vim /usr/local/etc/kvdb/kvdb.conf
 # 找到以下配置修改
 # protected-mode yes
+# bind 127.0.0.1
 # requirepass "helloearth"
+# 若omc是从库需要添加
 # slaveof xxx.UDM的kvdb服务地址.xxx 6379
 # masterauth "helloearth"
 

README.rpm.md

@@ -1,18 +1,19 @@
 # Deb 安装
 
-关于 kafka 和 oss 配置在文件 `/usr/local/omc/etc/omc.yaml` 配置项 nmsCXY
+关于 kafka 和 oss 配置在文件 `/usr/local/omc/etc/omc.yaml` 
+
+配置项 nmsCXY
 
 ## 安装 Nginx
 
 ```sh
 sudo yum install nginx
 
-## 1 解除gzip相关注释 
-## 2 注释conf.d下面的一行
-## include /etc/nginx/conf.d/*.conf;
+## 把http{}部分删除或注释
+## 解开行注释 include /etc/nginx/conf.d/*.conf;
 sudo vim /etc/nginx/nginx.conf
 
-# 检查配置
+# 复制omc默认配置
 sudo cp -rf /usr/local/omc/etc/default/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 sudo vim /etc/nginx/conf.d/default.conf
 # 重启 Nginx
@@ -28,7 +29,9 @@ sudo yum -Uvh kvdb-xx
 sudo vim /usr/local/etc/kvdb/kvdb.conf
 # 找到以下配置修改
 # protected-mode yes
+# bind 127.0.0.1
 # requirepass "helloearth"
+# 若omc是从库需要添加
 # slaveof xxx.UDM的kvdb服务地址.xxx 6379
 # masterauth "helloearth"
 
@@ -60,15 +63,19 @@ sudo systemctl restart mariadb
 
 ```sh
 # 卸载程序
-sudo yum -e omc
+sudo yum remove omc
 sudo rm -rf /usr/local/etc/omc /usr/local/omc
 
 # 安装程序
-sudo yum -Uvh omc-xxx.deb
+# sudo yum -Uvh omc-xxx.deb
+sudo yum localinstall omc-xxx.deb
 
 # 初始化数据库
 sudo /usr/local/omc/bin/setomc.sh -m install -c agt
 
 # 服务重启
 sudo service omc restart
+
+# 查看版本
+sudo yum info omc
 ```

build/rpmbuild/SPECS/omc.spec

@@ -41,6 +41,11 @@ for CFile in ${CFileList}; do
         cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
     fi
 done
+for LogoFile in ${LogoFileList}; do
+    if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
+        cp ${OMCStaticDir}/agt.d/logo/${LogoFile} ${OMCStaticDir}/logo;
+    fi                 
+done
 
 # setting firewall
 PortList="443 80 33030"