From c00ef3a6a8780e1a63f8b74fd670aa3d00f37d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 16 May 2025 16:10:46 +0800 Subject: [PATCH] xxx --- environment.sh | 2 +- nginx/temp_vhosts/consul.conf | 21 --------------------- nginx/temp_vhosts/minio.conf | 20 -------------------- nginx/temp_vhosts/minioconsole.conf | 20 -------------------- nginx/temp_vhosts/oidcservice.conf | 22 ---------------------- nginx/temp_vhosts/upstream.conf | 1 - nginx/temp_vhosts/xxljob.conf | 21 --------------------- start/airport.sh | 2 +- 8 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 nginx/temp_vhosts/consul.conf delete mode 100644 nginx/temp_vhosts/minio.conf delete mode 100644 nginx/temp_vhosts/minioconsole.conf delete mode 100644 nginx/temp_vhosts/oidcservice.conf delete mode 100644 nginx/temp_vhosts/upstream.conf delete mode 100644 nginx/temp_vhosts/xxljob.conf diff --git a/environment.sh b/environment.sh index 7b4667b..a76c1ec 100644 --- a/environment.sh +++ b/environment.sh @@ -62,7 +62,7 @@ export SRS_DATA=${NETWORK}_srs_data #Minio 配置 -export MINIO_NAME=${MINIO_DOMAIN} +export MINIO_NAME=MINIO_${DOMAIN} export MINIO_MEMORY=512m export MINIO_IMAGE=quay.io/minio/minio export MINIO_DATA=${NETWORK}_minio_data diff --git a/nginx/temp_vhosts/consul.conf b/nginx/temp_vhosts/consul.conf deleted file mode 100644 index c948825..0000000 --- a/nginx/temp_vhosts/consul.conf +++ /dev/null @@ -1,21 +0,0 @@ - -server { - listen 80; - listen 443 ssl; - server_name consul-bazhong.t-aaron.com; - - ssl_certificate /etc/nginx/t-aaron.com.pem; - ssl_certificate_key /etc/nginx/t-aaron.com.key; - ssl_session_timeout 5m; - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - - location / { - proxy_pass http://CONSUL_bazhong:8500; - 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; - } -} diff --git a/nginx/temp_vhosts/minio.conf b/nginx/temp_vhosts/minio.conf deleted file mode 100644 index 4c8ce8c..0000000 --- a/nginx/temp_vhosts/minio.conf +++ /dev/null @@ -1,20 +0,0 @@ - -server { - listen 80; - listen 443 ssl; - server_name minio-bazhong.t-aaron.com; - - ssl_certificate /etc/nginx/t-aaron.com.pem; - ssl_certificate_key /etc/nginx/t-aaron.com.key; - ssl_session_timeout 5m; - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - - location / { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://minio-bazhong.t-aaron.com:9000; - } -} diff --git a/nginx/temp_vhosts/minioconsole.conf b/nginx/temp_vhosts/minioconsole.conf deleted file mode 100644 index a0b1eaf..0000000 --- a/nginx/temp_vhosts/minioconsole.conf +++ /dev/null @@ -1,20 +0,0 @@ - -server { - listen 80; - listen 443 ssl; - server_name minioconsole-bazhong.t-aaron.com; - - ssl_certificate /etc/nginx/t-aaron.com.pem; - ssl_certificate_key /etc/nginx/t-aaron.com.key; - ssl_session_timeout 5m; - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - - location / { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://minio-bazhong.t-aaron.com:9001; - } -} diff --git a/nginx/temp_vhosts/oidcservice.conf b/nginx/temp_vhosts/oidcservice.conf deleted file mode 100644 index 8717a2d..0000000 --- a/nginx/temp_vhosts/oidcservice.conf +++ /dev/null @@ -1,22 +0,0 @@ - server { - listen 80; - listen 443 ssl; - server_name oidc-bazhong.t-aaron.com; - - # SSL证书配置 - ssl_certificate /etc/nginx/t-aaron.com.pem; - ssl_certificate_key /etc/nginx/t-aaron.com.key; - ssl_session_timeout 5m; - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - - - location / { - proxy_pass http://OIDC-SERVERbazhong:8090; - 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; - } - } diff --git a/nginx/temp_vhosts/upstream.conf b/nginx/temp_vhosts/upstream.conf deleted file mode 100644 index 8b13789..0000000 --- a/nginx/temp_vhosts/upstream.conf +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nginx/temp_vhosts/xxljob.conf b/nginx/temp_vhosts/xxljob.conf deleted file mode 100644 index a8fc8df..0000000 --- a/nginx/temp_vhosts/xxljob.conf +++ /dev/null @@ -1,21 +0,0 @@ -server { - listen 80; - listen 443 ssl; - server_name xxljob-bazhong.t-aaron.com; - - # SSL证书配置 - ssl_certificate /etc/nginx/t-aaron.com.pem; - ssl_certificate_key /etc/nginx/t-aaron.com.key; - ssl_session_timeout 5m; - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - location / { - proxy_pass http://XXL_JOB_bazhong:8080; - 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; - } -} - diff --git a/start/airport.sh b/start/airport.sh index 6345ef4..9e70631 100755 --- a/start/airport.sh +++ b/start/airport.sh @@ -26,7 +26,7 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_ONLINEURL=http://${MQTT_NAME}:1883 \ --env SPRING_NEWMQTT_NEWURL=http://${MQTT_NAME}:1883 \ --env SPRING_KAFKA_COMMON_BOOTSTRAP-SERVERS=${KAFKA_NAME}:9092 \ ---env MINIO_OSS_ENDPOINT=https://${MINIO_NAME}:${NGINX_HTTPS_PORT} \ +--env MINIO_OSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \ --env MINIO_OSS_ACCESS_KEY=${MINIO_ACCESS_KEY} \ --env MINIO_OSS_SECRET_KEY=${MINIO_SECRET_KEY} \ --env TZ=Asia/Shanghai \