From 320382a1160d8fe1d7ecf77079abe02c9690f2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 15 May 2025 16:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0xxljob?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environment.sh | 3 ++- nginx/vhosts/consul.conf | 21 +++++++++++++++++++++ nginx/vhosts/xxljob.conf | 21 +++++++++++++++++++++ server/nginx.sh | 2 +- 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 nginx/vhosts/consul.conf create mode 100644 nginx/vhosts/xxljob.conf diff --git a/environment.sh b/environment.sh index ce9fa6e..455eb98 100644 --- a/environment.sh +++ b/environment.sh @@ -6,7 +6,8 @@ export NETWORK="swarm_network_$DOMAIN" export HOST_IP=127.0.0.1 export REGISTRY=registry.t-aaron.com export SKY_DOMAIN=sky-${DOMAIN}.t-aaron.com - +export CONSUL_DOMAIN=consul-${DOMAIN}.t-aaron.com +export XXLJOB_DOMAIN=xxljob-${DOMAIN}.t-aaron.com export REGISTRY_HOST=${REGISTRY}/tuoheng/ diff --git a/nginx/vhosts/consul.conf b/nginx/vhosts/consul.conf new file mode 100644 index 0000000..c948825 --- /dev/null +++ b/nginx/vhosts/consul.conf @@ -0,0 +1,21 @@ + +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/vhosts/xxljob.conf b/nginx/vhosts/xxljob.conf new file mode 100644 index 0000000..a8fc8df --- /dev/null +++ b/nginx/vhosts/xxljob.conf @@ -0,0 +1,21 @@ +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/server/nginx.sh b/server/nginx.sh index cf6a128..2dcf8d7 100755 --- a/server/nginx.sh +++ b/server/nginx.sh @@ -9,7 +9,7 @@ if docker ps -a | grep -q ${NGINX_NAME}; then fi # 启动Nginx容器 -docker run -d \ +docker run --pull always -d \ --name ${NGINX_NAME} \ --network ${NETWORK} \ -p ${NGINX_HTTP_PORT}:80 \