From c81ecea2360b96278262e9f4f6fe75f60616edeb Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 20 Mar 2024 10:40:36 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=89=93=E5=8C=85nginx=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/config/etc/nginx/default | 91 -------------------- build/config/etc/nginx/default.conf | 52 +++++++++++ build/config/etc/nginx/omc.conf | 72 ---------------- build/debbuild/DEBIAN/postinst | 12 +-- build/debbuild/DEBIAN/postrm | 2 +- build/debbuild/etc/nginx/conf.d/default.conf | 52 +++++++++++ build/debbuild/etc/nginx/conf.d/omc.conf | 66 -------------- build/misc/importdb.sh | 21 ++--- 8 files changed, 122 insertions(+), 246 deletions(-) delete mode 100644 build/config/etc/nginx/default create mode 100644 build/config/etc/nginx/default.conf delete mode 100644 build/config/etc/nginx/omc.conf create mode 100644 build/debbuild/etc/nginx/conf.d/default.conf delete mode 100644 build/debbuild/etc/nginx/conf.d/omc.conf diff --git a/build/config/etc/nginx/default b/build/config/etc/nginx/default deleted file mode 100644 index a6f2279..0000000 --- a/build/config/etc/nginx/default +++ /dev/null @@ -1,91 +0,0 @@ -## -# You should look at the following URL's in order to grasp a solid understanding -# of Nginx configuration files in order to fully unleash the power of Nginx. -# https://www.nginx.com/resources/wiki/start/ -# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/ -# https://wiki.debian.org/Nginx/DirectoryStructure -# -# In most cases, administrators will remove this file from sites-enabled/ and -# leave it as reference inside of sites-available where it will continue to be -# updated by the nginx packaging team. -# -# This file will automatically load configuration files provided by other -# applications, such as Drupal or Wordpress. These applications will be made -# available underneath a path with that package name, such as /drupal8. -# -# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. -## - -# Default server configuration -# -server { - listen 1080 default_server; - listen [::]:1080 default_server; - - # SSL configuration - # - # listen 443 ssl default_server; - # listen [::]:443 ssl default_server; - # - # Note: You should disable gzip for SSL traffic. - # See: https://bugs.debian.org/773332 - # - # Read up on ssl_ciphers to ensure a secure configuration. - # See: https://bugs.debian.org/765782 - # - # Self signed certs generated by the ssl-cert package - # Don't use them in a production server! - # - # include snippets/snakeoil.conf; - - root /var/www/html; - - # Add index.php to the list if you are using PHP - index index.html index.htm index.nginx-debian.html; - - server_name _; - - location / { - # First attempt to serve request as file, then - # as directory, then fall back to displaying a 404. - try_files $uri $uri/ =404; - } - - # pass PHP scripts to FastCGI server - # - #location ~ \.php$ { - # include snippets/fastcgi-php.conf; - # - # # With php-fpm (or other unix sockets): - # fastcgi_pass unix:/run/php/php7.4-fpm.sock; - # # With php-cgi (or other tcp sockets): - # fastcgi_pass 127.0.0.1:9000; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} -} - - -# Virtual Host configuration for example.com -# -# You can move that to a different file under sites-available/ and symlink that -# to sites-enabled/ to enable it. -# -#server { -# listen 80; -# listen [::]:80; -# -# server_name example.com; -# -# root /var/www/example.com; -# index index.html; -# -# location / { -# try_files $uri $uri/ =404; -# } -#} diff --git a/build/config/etc/nginx/default.conf b/build/config/etc/nginx/default.conf new file mode 100644 index 0000000..fd16407 --- /dev/null +++ b/build/config/etc/nginx/default.conf @@ -0,0 +1,52 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + location /omc-api/ { + proxy_pass http://127.0.0.1:33030/; + + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + location /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; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + location / { + root /usr/local/omc/htdocs/front; + + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} + diff --git a/build/config/etc/nginx/omc.conf b/build/config/etc/nginx/omc.conf deleted file mode 100644 index 3fda700..0000000 --- a/build/config/etc/nginx/omc.conf +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen 44443 ssl; - listen [::]:44443 ssl; - server_name 0.0.0.0; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - # SSL - ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; - ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; - - # CA, 自定义 - ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; - ssl_verify_client on; - - # ssl ciphers - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - -# location /api/rest/securityManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/resourceManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/performanceManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/faultManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/aaaa/ { -# proxy_pass http://127.0.0.1:44040; -# } - location /api/rest/ { - proxy_pass http://127.0.0.1:33030; - } - location / { - try_files $uri $uri/ =404; - } -} - -server { - listen 38888 default_server; - listen [::]:38888 default_server; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - - location /omc-api/ { - proxy_pass http://127.0.0.1:33030/; - - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Port $server_port; - } - - location / { - root /usr/local/omc/htdocs/front; - - try_files $uri $uri/ /index.html; - index index.html index.htm; - } -} - diff --git a/build/debbuild/DEBIAN/postinst b/build/debbuild/DEBIAN/postinst index 01435eb..127d1f7 100644 --- a/build/debbuild/DEBIAN/postinst +++ b/build/debbuild/DEBIAN/postinst @@ -68,15 +68,15 @@ if ! id -u omc >/dev/null 2>&1 ; then else echo "user omc exist"; fi -if [ ! -e "${NginxConfDir}/omc.conf" ]; then +if [ ! -e "${NginxConfDir}/default.conf" ]; then mkdir -p ${NginxConfDir} - cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; + cp -rf ${OMCEtcDir}/nginx/default.conf ${NginxConfDir}; fi #cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable} -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 +# 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 omc.service systemctl enable crontask.service systemctl enable sshsvc.service diff --git a/build/debbuild/DEBIAN/postrm b/build/debbuild/DEBIAN/postrm index 4ed7e3b..3e67391 100644 --- a/build/debbuild/DEBIAN/postrm +++ b/build/debbuild/DEBIAN/postrm @@ -16,7 +16,7 @@ systemctl stop captrace.service systemctl stop adb.service #rm -rf /usr/local/omc -rm -rf /etc/nginx/conf.d/omc.conf +rm -rf /etc/nginx/conf.d/default.conf systemctl disable omc.service systemctl disable crontask.service diff --git a/build/debbuild/etc/nginx/conf.d/default.conf b/build/debbuild/etc/nginx/conf.d/default.conf new file mode 100644 index 0000000..fd16407 --- /dev/null +++ b/build/debbuild/etc/nginx/conf.d/default.conf @@ -0,0 +1,52 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + location /omc-api/ { + proxy_pass http://127.0.0.1:33030/; + + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + location /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; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + location / { + root /usr/local/omc/htdocs/front; + + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} + diff --git a/build/debbuild/etc/nginx/conf.d/omc.conf b/build/debbuild/etc/nginx/conf.d/omc.conf deleted file mode 100644 index 5eebc39..0000000 --- a/build/debbuild/etc/nginx/conf.d/omc.conf +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen 4443 ssl; - listen [::]:4443 ssl; - server_name 0.0.0.0; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - # SSL - ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem; - ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem; - #ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem; - #ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem; - -# location /api/rest/securityManagement { -# proxy_pass http://127.0.0.1:5050; -# } -# location /api/rest/resourceManagement { -# proxy_pass http://127.0.0.1:5050; -# } -# location /api/rest/performanceManagement { -# proxy_pass http://127.0.0.1:5050; -# } -# location /api/rest/faultManagement { -# proxy_pass http://127.0.0.1:5050; -# } -# location /api/rest/aaaa/ { -# proxy_pass http://127.0.0.1:4040; -# } - location /api/rest/ { - proxy_pass http://127.0.0.1:3030; - } - location / { - try_files $uri $uri/ =404; - } -} - -server { - listen 8888 default_server; - listen [::]:8888 default_server; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - - location /omc-api/ { - proxy_pass http://127.0.0.1:3030/; - - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Port $server_port; - } - - location / { - root /usr/local/omc/htdocs/front; - - try_files $uri $uri/ /index.html; - index index.html index.htm; - } -} - diff --git a/build/misc/importdb.sh b/build/misc/importdb.sh index 9a3d7df..abc7dde 100644 --- a/build/misc/importdb.sh +++ b/build/misc/importdb.sh @@ -4,6 +4,7 @@ USER="root" PASSWORD="1000omc@kp!" PORT="33066" DBNAME="omc_db" +HOSTIP="127.0.0.1" UpgradeSQLDir=/usr/local/omc/etc/db/upgrade Upgvue3SQLDir=/usr/local/omc/etc/db/upgvue3 InstallSQLDir=/usr/local/omc/etc/db/install @@ -16,7 +17,7 @@ case "$1" in echo "Upgrade database ${DBNAME}" for SQL in ${UpgradeSQLDir}/*.sql; do echo "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; done ;; @@ -25,18 +26,18 @@ case "$1" in echo "Upgrade to vue3 database ${DBNAME}" for SQL in ${Upgvue3SQLDir}/*.sql; do echo "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; done ;; install) echo "Drop database ${DBNAME} ...!!!" - mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${drop_db_sql}" + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${drop_db_sql}" echo "Create database ${DBNAME} if not exist" - mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}" + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}" for SQL in ${InstallSQLDir}/*.sql; do echo "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; done ;; @@ -52,7 +53,7 @@ case "$1" in for SQL in ${UpgradeSQLDir}/*.sql; do echo "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; done break @@ -64,7 +65,7 @@ case "$1" in for SQL in ${Upgvue3SQLDir}/*.sql; do echo "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; done break @@ -73,13 +74,13 @@ case "$1" in [iI][nN][sS][tT][aA][lL][lL]|[iI]) echo "Drop database ${DBNAME} ...!!!" - mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${drop_db_sql}" + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${drop_db_sql}" echo "Create database ${DBNAME} if not exist" - mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}" + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}" for SQL in ${InstallSQLDir}/*.sql; do echo "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + mysql -h${HOSTIP} -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; done break