浏览代码

:bug: fix ai-translate & openai-proxy container

Jeremy Zheng 8 月之前
父节点
当前提交
47b5e78687

+ 2 - 2
deploy/mint.yml

@@ -74,7 +74,7 @@
   hosts:
     - ai_translate
   tasks:
-    - name: Enable php ai-translate service
+    - name: Enable ai-translate service
       ansible.builtin.systemd_service:
         name: "{{ app_container_prefix }}-{{ app_domain }}-worker-mq-ai.translate"
         enabled: true
@@ -87,7 +87,7 @@
   tasks:
     - name: Enable openai-proxy service
       ansible.builtin.systemd_service:
-        name: "{{ app_container_prefix }}-{{ app_domain }}-worker-mq-openai.proxy"
+        name: "{{ app_container_prefix }}-{{ app_domain }}-openai.proxy"
         enabled: true
         state: started
         scope: user

+ 3 - 3
deploy/roles/mint-v2.1/tasks/ai-translate.yml

@@ -1,14 +1,14 @@
 - name: Upload script for ai.translate
   ansible.builtin.template:
     src: containers/ai-translate.sh.j2
-    dest: "{{ app_deploy_target }}/scripts/worker-mq-ai.translate.sh"
+    dest: "{{ app_deploy_target }}/ai-translate/start.sh"
     mode: "0555"
 
 - name: Upload config for ai.translate
   ansible.builtin.template:
     src: v2/ai-translate.toml.j2
     dest: "{{ app_deploy_target }}/ai-translate/config.toml"
-    mode: "0555"
+    mode: "0444"
 
 - name: Stop ai.translate
   containers.podman.podman_container:
@@ -19,7 +19,7 @@
   containers.podman.podman_container:
     name: "{{ app_domain }}-worker-mq-ai.translate"
     image: "mint-python-3.13"
-    command: "{{ app_deploy_target }}/scripts/worker-mq-ai.translate.sh"
+    command: "{{ app_deploy_target }}/ai-translate/start.sh"
     volumes:
       - "{{ app_deploy_target }}/ai-translate:{{ app_deploy_target }}:z"
     workdir: "{{ app_deploy_target }}"

+ 3 - 3
deploy/roles/mint-v2.1/tasks/clove.yml

@@ -1,4 +1,4 @@
-- name: Clone source codes
+- name: Clone clove source codes
   ansible.builtin.git:
     repo: "https://github.com/iapt-platform/clove.git"
     dest: "{{ app_deploy_target | dirname }}/clove"
@@ -8,7 +8,7 @@
 #     path: "{{ app_deploy_target }}/api-v8/storage/resources"
 #     state: absent
 
-- name: Setup resources for v8
+- name: Setup clove resources for v8
   become: true
   ansible.builtin.file:
     src: "{{ app_deploy_target | dirname }}/clove"
@@ -21,7 +21,7 @@
 #     path: "{{ app_deploy_target }}/api-v12/storage/resources"
 #     state: absent
 
-- name: Setup resources for v12
+- name: Setup clove resources for v12
   become: true
   ansible.builtin.file:
     src: "{{ app_deploy_target | dirname }}/clove"

+ 0 - 3
deploy/roles/mint-v2.1/tasks/laravel.yml

@@ -46,9 +46,6 @@
   loop_control:
     loop_var: worker_name
 
-- name: Setup clove resources
-  ansible.builtin.import_tasks: clove.yml
-
 - name: Setup schedule run
   ansible.builtin.import_tasks: schedule-run.yml
 

+ 9 - 0
deploy/roles/mint-v2.1/tasks/main.yml

@@ -15,6 +15,9 @@
     remote_src: true
     creates: "{{ app_deploy_target }}"
 
+- name: Setup clove resources
+  ansible.builtin.import_tasks: clove.yml
+
 # ---------------------------------------------------------
 
 # - name: Clone source codes directly
@@ -56,6 +59,12 @@
 - name: Setup laravel
   ansible.builtin.import_tasks: laravel.yml
 
+- name: Setup ai-translate
+  ansible.builtin.import_tasks: ai-translate.yml
+
+- name: Setup openai-proxy
+  ansible.builtin.import_tasks: openai-proxy.yml
+
 - name: Force systemd to reread configs
   become: true
   ansible.builtin.systemd:

+ 3 - 3
deploy/roles/mint-v2.1/tasks/openai-proxy.yml

@@ -1,14 +1,14 @@
 - name: Upload script for openai-proxy
   ansible.builtin.template:
     src: containers/openai-proxy.sh.j2
-    dest: "{{ app_deploy_target }}/scripts/openai-proxy.sh"
+    dest: "{{ app_deploy_target }}/open-ai-server/start.sh"
     mode: "0555"
 
 - name: Upload config for openai-proxy
   ansible.builtin.template:
     src: v2/openai-proxy.json.j2
     dest: "{{ app_deploy_target }}/open-ai-server/config.json"
-    mode: "0555"
+    mode: "0444"
 
 - name: Upload openai-proxy dist
   ansible.posix.synchronize:
@@ -24,7 +24,7 @@
   containers.podman.podman_container:
     name: "{{ app_domain }}-openai.proxy"
     image: "mint-nodejs-jod"
-    command: "{{ app_deploy_target }}/scripts/openai-proxy.sh"
+    command: "{{ app_deploy_target }}/open-ai-server/start.sh"
     volumes:
       - "{{ app_deploy_target }}/open-ai-server:{{ app_deploy_target }}:z"
     workdir: "{{ app_deploy_target }}"

+ 3 - 3
deploy/roles/mint-v2.1/tasks/schedule-run.yml

@@ -1,10 +1,10 @@
-- name: Setup schedule run worker service
-  ansible.builtin.include_tasks: workers.yml
+- name: Setup laravel schedule run worker service
+  ansible.builtin.include_tasks: laravel-workers.yml
   vars:
     zone_name: schedule
     worker_name: run
 
-- name: Setup schedule run worker timer
+- name: Setup laravel schedule run worker timer
   ansible.builtin.template:
     src: containers/schedule-run.timer.j2
     dest: "{{ ansible_env.HOME }}/.config/systemd/user/{{ app_domain }}-scheduler.timer"

+ 2 - 2
deploy/roles/openai-proxy-build/tasks/main.yml

@@ -1,10 +1,10 @@
-- name: Install nodejs dependencies
+- name: Install openai-proxy nodejs dependencies
   ansible.builtin.shell: npm install
   args:
     chdir: "{{ playbook_dir }}/tmp/mint/open-ai-server"
     creates: "{{ playbook_dir }}/tmp/mint/open-ai-server/node_modules"
 
-- name: Build target dist
+- name: Build openai-proxy target dist
   ansible.builtin.shell: npm run build
   args:
     chdir: "{{ playbook_dir }}/tmp/mint/open-ai-server"