diff --git a/build.sh b/build.sh index c4b7430..2592910 100644 --- a/build.sh +++ b/build.sh @@ -33,19 +33,13 @@ OmcInstallDir=/usr/local/omc ConfigEtcDir=${EmsBEDir}/build/config/etc ConfigSystemdDir=${EmsBEDir}/build/config/systemd EmsFEVue3Dir=/home/agtuser/Docker/nginx/html/dist -RESTAGENT=omc -CRONTASK=crontask -SshSvcBin=sshsvc -CapTraceBin=captrace -Data2htmlBin=data2html -NBI_ALARM=nbi_alarm -NBI_AGENT=nbi_agent -AAAA_AGENT=4a_agent + RestagentDir=${EmsBEDir}/omc CrontaskDir=/usr/local/omc/bin SshSvcDir=/usr/local/omc/bin CapTraceDir=/usr/local/omc/bin Data2htmlDir=/usr/local/omc/bin + DBSQLSrcDir=${EmsBEDir}/build/database MiscDir=${EmsBEDir}/build/misc FrontBuildDir=${EmsBEDir}/build/build/usr/local/omc/htdocs @@ -80,10 +74,7 @@ case "$1" in cp -rf ${SshSvcDir}/sshsvc ${BuildOMCBinDir} cp -rf ${CapTraceDir}/captrace ${BuildOMCBinDir} cp -rf ${Data2htmlDir}/data2html ${BuildOMCBinDir} - # cp -rf ${MiscDir}/ne-hosts ${BuildOMCBinDir} - # cp -rf ./nbi/${NBI_ALARM}/bin/${NBI_ALARM} ${BinDir2} - # cp -rf ./nbi/${NBI_AGENT}/bin/${NBI_AGENT} ${BinDir2} - # cp -rf ./${4A_AGENT}/bin/${4A_AGENT} ${BinDir2} + cp -rf ${MiscDir}/* ${BuildOMCBinDir} # rm -rf ${BinDir2}/ne-hosts cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir} diff --git a/build/build/etc/nginx/conf.d/default.conf b/build/build/etc/nginx/conf.d/default.conf index abcde44..0a6f5c3 100644 --- a/build/build/etc/nginx/conf.d/default.conf +++ b/build/build/etc/nginx/conf.d/default.conf @@ -8,11 +8,11 @@ server { # ssl_certificate /usr/share/nginx/cert/www.x.cn_chain.crt; # ssl_certificate_key /usr/share/nginx/cert/www.x.cn.key; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_session_timeout 5m; - ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; - ssl_prefer_server_ciphers on; - ssl_dhparam /usr/share/nginx/cert/dhparams.pem; + # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; + # ssl_session_timeout 5m; + # ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; + # ssl_prefer_server_ciphers on; + # ssl_dhparam /usr/share/nginx/cert/dhparams.pem; # OMC location / { @@ -23,7 +23,7 @@ server { } location /omc-api/ { - proxy_pass http://192.168.5.57:33030/; + proxy_pass http://127.0.0.1:33030/; proxy_cache_bypass $http_upgrade; proxy_set_header Upgrade $http_upgrade; @@ -37,7 +37,9 @@ server { } location /api/rest/ { - proxy_pass http://192.168.5.57:33030/nms-cxy/api/rest/; + # 添加斜杠并重定向 + #rewrite ^([^.]*[^/])$ $1/ permanent; + proxy_pass http://127.0.0.1:33030/nms-cxy/api/rest/; proxy_cache_bypass $http_upgrade; proxy_set_header Upgrade $http_upgrade; diff --git a/build/debbuild/DEBIAN/postinst b/build/debbuild/DEBIAN/postinst index 127d1f7..716fed4 100644 --- a/build/debbuild/DEBIAN/postinst +++ b/build/debbuild/DEBIAN/postinst @@ -10,7 +10,6 @@ UsrLocalBinDir=/usr/local/bin OmcDaemon=omcd NginxEtcDir=/etc/nginx NginxConfDir=${NginxEtcDir}/conf.d -NginxSiteAvailable=${NginxEtcDir}/sites-available CFileList="omc.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml" LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"