2
0
Эх сурвалжийг харах

:bug: fix laravel logs path

China Kassapa 7 сар өмнө
parent
commit
d4d3bf5464

+ 1 - 1
deploy/roles/mint-nginx/tasks/main.yml

@@ -1,7 +1,7 @@
 - name: Create nginx logs folder
   become: true
   ansible.builtin.file:
-    path: "{{ app_deploy_target | dirname }}/logs"
+    path: "{{ app_deploy_target | dirname }}/logs/nginx"
     state: directory
     owner: www-data
     mode: "0755"

+ 2 - 2
deploy/roles/mint-nginx/templates/nginx.conf.j2

@@ -16,8 +16,8 @@ server {
     gzip_vary on;
     client_max_body_size 512M;
 
-    access_log {{ app_deploy_target | dirname }}/logs/access.log;
-    error_log {{ app_deploy_target | dirname }}/logs/error.log warn;
+    access_log {{ app_deploy_target | dirname }}/logs/nginx/access.log;
+    error_log {{ app_deploy_target | dirname }}/logs/nginx/error.log warn;
     # access_log syslog:server=unix:/dev/log,tag={{ app_domain }},nohostname,severity=info combined;
     # error_log  syslog:server=unix:/dev/log,tag={{ app_domain }},nohostname,severity=error;
 

+ 1 - 0
deploy/roles/mint-release-build/templates/build.sh.j2

@@ -51,6 +51,7 @@ cd {{ app_deploy_target }}/ai-translate/
 if [ ! -d python3 ]
 then
     python3.13 -m venv $PWD/python3
+    sleep 1
 fi
 source $PWD/python3/bin/activate
 if [ ! -f get-pip.py ]

+ 15 - 0
deploy/roles/mint-v2.2/tasks/laravel.yml

@@ -16,6 +16,21 @@
     dest: "{{ app_deploy_target }}/api-v8/public/app/config.js"
     mode: "0444"
 
+- name: Create logs folder
+  become: true
+  ansible.builtin.file:
+    path: "{{ app_deploy_target | dirname }}/logs/laravel"
+    state: directory
+    owner: www-data
+    mode: "0755"
+
+- name: Link logs folder
+  become: true
+  ansible.builtin.file:
+    src: "{{ app_deploy_target | dirname }}/logs/laravel"
+    dest: "{{ app_deploy_target }}/api-v8/storage/logs"
+    state: link
+
 - name: "Setup configuration"
   ansible.builtin.shell:
     cmd: "docker run --rm -it --hostname=mint --network host -v /srv/{{ app_domain }}/clove:/srv/{{ app_domain }}/clove:z -v {{ app_deploy_target }}:{{ app_deploy_target }}:z {{ app_docker_image_name }} {{ app_deploy_target }}/scripts/run.sh setup"

+ 1 - 2
deploy/roles/mint-v2.2/templates/containers/php-fpm.sh.j2

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-docker run --rm --hostname=mint -p {{ app_php_fpm_port }}:9000 -v /srv:/srv:z {{ app_docker_image_name }} /bin/bash -c \
-    "sed -i 's/^listen = .*/listen = 9000/g' /etc/php/{{ app_php_version }}/fpm/pool.d/www.conf && /usr/sbin/php-fpm{{ app_php_version }} --nodaemonize --fpm-config /etc/php/{{ app_php_version }}/fpm/php-fpm.conf"
+docker run --rm -d --network host -v /srv:/srv:z {{ app_docker_image_name }} {{ app_deploy_target }}/scripts/run.sh php-fpm
    

+ 9 - 2
deploy/roles/mint-v2.2/templates/containers/run.sh.j2

@@ -9,7 +9,6 @@ fi
 
 export WORK_DIR="{{ app_deploy_target }}"
 
-
 if [[ "$1" == "mq:discussion" || "$1" == "mq:pr" || "$1" == "mq:progress" || "$1" == "mq:wbw.analyses" || "$1" == "mq:export.pali.chapter" || "$1" == "mq:export.article" || "$1" == "schedule:run" ]]; then
     cd $WORK_DIR/api-v8/    
     php -d memory_limit={{ app_php_memory_limit }} artisan $1
@@ -21,7 +20,15 @@ elif [ "$1" = "ai-translate" ]; then
 elif [ "$1" = "openai-proxy" ]; then
     cd $WORK_DIR/openai-proxy/
     source "$HOME/.nvm/nvm.sh"    
-    node dist/main.*.js config.json    
+    node dist/main.*.js config.json
+elif [ "$1" = "php-fpm" ]; then
+    cd /var/lib/php/
+    sed -i 's/^listen = .*/listen = {{ app_php_fpm_port }}/g' /etc/php/{{ app_php_version }}/fpm/pool.d/www.conf
+    sed -i 's/^pm.min_spare_servers = .*/pm.min_spare_servers = 4/g' /etc/php/{{ app_php_version }}/fpm/pool.d/www.conf
+    sed -i 's/^pm.max_spare_servers = .*/pm.max_spare_servers = 12/g' /etc/php/{{ app_php_version }}/fpm/pool.d/www.conf
+    sed -i 's/^pm.max_children = .*/pm.max_children = 20/g' /etc/php/{{ app_php_version }}/fpm/pool.d/www.conf
+    sed -i 's/^pm.start_servers = .*/pm.start_servers = 8/g' /etc/php/{{ app_php_version }}/fpm/pool.d/www.conf
+    /usr/sbin/php-fpm{{ app_php_version }} --nodaemonize --fpm-config /etc/php/{{ app_php_version }}/fpm/php-fpm.conf
 elif [ "$1" = "setup" ]; then
     cd $WORK_DIR/api-v8/
     echo "caching configuration "

+ 1 - 1
deploy/roles/mint-v2.2/templates/containers/shell.sh.j2

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-docker run --rm -it --hostname=mint --network host \
+docker run --rm -it --network host \
     -v /srv/{{ app_deploy_target | dirname }}/clove:/srv/{{ app_deploy_target | dirname }}/clove:z \
     -v {{ app_deploy_target }}:{{ app_deploy_target }}:z \
     {{ app_docker_image_name }}