修改脚本

nginx/kafka.conf

@@ -0,0 +1,31 @@
+server {
+    listen 80;
+    server_name kafkaui.bywaystudios.com;
+
+    # 将 HTTP 请求重定向到 HTTPS
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name kafkaui.bywaystudios.com;
+
+    ssl_certificate /etc/nginx/ssl/bywaystudios.com.pem;
+    ssl_certificate_key /etc/nginx/ssl/bywaystudios.com.key;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+
+    location /api {
+        proxy_pass http://localhost:500;
+        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;
+    }
+
+    # 可选：配置日志文件
+    access_log /var/log/nginx/kafka_access.log;
+    error_log /var/log/nginx/kafka_error.log;
+}

nginx/tcp_london.conf

@@ -0,0 +1,31 @@
+server {
+    listen 80;
+    server_name london.bywaystudios.com;
+
+    # 将 HTTP 请求重定向到 HTTPS
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name london.bywaystudios.com;
+
+    ssl_certificate /etc/nginx/ssl/bywaystudios.com.pem;
+    ssl_certificate_key /etc/nginx/ssl/bywaystudios.com.key;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+
+    location / {
+        proxy_pass http://localhost: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;
+    }
+
+    # 可选：配置日志文件
+    access_log /var/log/nginx/pethome_access.log;
+    error_log /var/log/nginx/pethome_error.log;
+}

playbook/hosts

@@ -18,3 +18,7 @@ gitea1 ansible_ssh_host=8.155.14.94  ansible_ssh_user="root" ansible_ssh_port=22
 [release]
 a1 ansible_ssh_host=1.15.182.107 ansible_ssh_user="root" ansible_ssh_port=22
 g1 ansible_ssh_host=47.254.83.25  ansible_ssh_user="root" ansible_ssh_port=22
+
+
+[london]
+london_1 ansible_ssh_host=8.208.47.208 ansible_ssh_user="root" ansible_ssh_port=22

playbook/merge_pet_install.yml

@@ -1,6 +1,6 @@
 ---
 - name: Deploy GoLeaf release
-  hosts: test
+  hosts: london
   remote_user: root
   vars:
     goleaf_src: /data/devops/source/main

playbook/merge_pet_online.yml

@@ -28,9 +28,16 @@
         src: "{{ goleaf_src }}"
         dest: "{{goleaf_dest}}"
 
-    - name: copy goleaf
+
+    - name: parse config
+      shell: cd /data/docs && git pull && python3 /data/docs/tool/cfg/tool_cfg_json.py
+      delegate_to: localhost
+
+    - name: tar config
       command:  tar -cvf /usr/local/conf.tar  -C /data/docs/tool/out .
       delegate_to: localhost
+      warn: false
+
     - name: copy tar
       copy:
         src: /usr/local/conf.tar

playbook/merge_pet_sdk.yml

@@ -32,9 +32,17 @@
         src: "{{ goleaf_src }}"
         dest: "{{goleaf_dest}}"
 
-    - name: copy goleaf
+
+    - name: parse config
+      shell: cd /data/docs && git pull && python3 /data/docs/tool/cfg/tool_cfg_json.py
+      delegate_to: localhost
+
+    - name: tar config
       command:  tar -cvf /usr/local/conf.tar  -C /data/docs/tool/out .
       delegate_to: localhost
+      warn: false
+
+
     - name: copy tar
       copy:
         src: /usr/local/conf.tar

playbook/merge_pet_test.yml

@@ -16,6 +16,7 @@
     - name: stop goleaf
       command: "{{ goleaf_dest }}/tool/tool stop node 1"
       register: stop_result
+      ignore_errors: yes
 
     - name: show stop_result
       debug:
@@ -33,9 +34,15 @@
         src: "{{ goleaf_src }}"
         dest: "{{goleaf_dest}}"
 
-    - name: copy goleaf
+    - name: parse config
+      shell: cd /data/docs && git pull && python3 /data/docs/tool/cfg/tool_cfg_json.py
+      delegate_to: localhost
+
+    - name: tar config
       command:  tar -cvf /usr/local/conf.tar  -C /data/docs/tool/out .
       delegate_to: localhost
+      warn: false
+
     - name: copy tar
       copy:
         src: /usr/local/conf.tar

playbook/web.yml

@@ -5,28 +5,28 @@
 
   tasks:
 
-    - name: tar web
-      command: tar -cvf /data/admin/apps/web-antd/dist.tar  -C /data/admin/apps/web-antd/dist .
-      delegate_to: localhost
+    # - name: tar web
+    #   command: tar -cvf /data/admin/apps/web-antd/dist.tar  -C /data/admin/apps/web-antd/dist .
+    #   delegate_to: localhost
 
-    - name: copy tar
-      copy:
-        src: /data/admin/apps/web-antd/dist.tar
-        dest: /usr/local/admin
+    # - name: copy tar
+    #   copy:
+    #     src: /data/admin/apps/web-antd/dist.tar
+    #     dest: /usr/local/admin
 
-    - name: untar
-      command: tar -xvf /usr/local/admin/dist.tar -C /usr/local/admin/web/
+    # - name: untar
+    #   command: tar -xvf /usr/local/admin/dist.tar -C /usr/local/admin/web/
 
     # - name: tar backend
     #   shell: tar -cvf /data/backend/release/backend.tar  -C /data/backend/release .
     #   delegate_to: localhost
-    # - name: pack.sh
-    #   shell: sh /data/backend/release/pack.sh
-    #   delegate_to: localhost
-    # - name: copy tar
-    #   copy:
-    #     src: /data/backend/release/backend
-    #     dest: /usr/local/admin/backend
+    - name: pack.sh
+      shell: sh /data/backend/release/pack.sh
+      delegate_to: localhost
+    - name: copy tar
+      copy:
+        src: /data/backend/release/backend
+        dest: /usr/local/admin/backend
 
     # - name: untar
     #   shell: tar -xvf /usr/local/admin/backend.tar -C /usr/local/admin/backend/