Skip to content

Commit

Permalink
Merge pull request #346 from erost/feature/nginx-configurable-folders
Browse files Browse the repository at this point in the history
feat(nginx): allow to specify run path for nginx.pid and tmp folders
  • Loading branch information
miraai authored Aug 23, 2023
2 parents ed002df + 3b2baa9 commit 13de1dd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion charts/rasa-x/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v2

version: "4.5.21"
version: "4.5.22"

appVersion: "1.2.2"

Expand Down
12 changes: 6 additions & 6 deletions charts/rasa-x/nginx-config-files/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
worker_processes auto;
worker_rlimit_nofile 10000;
error_log /dev/stdout info;
pid "/etc/nginx/nginx.pid";
pid "{{ trimSuffix "/" .Values.nginx.runFolderPath }}/nginx.pid";

events {
worker_connections 4096;
Expand All @@ -18,11 +18,11 @@ http {

access_log /dev/stdout;

client_body_temp_path "/etc/nginx/client_body" 1 2;
proxy_temp_path "/etc/nginx/proxy" 1 2;
fastcgi_temp_path "/etc/nginx/fastcgi" 1 2;
scgi_temp_path "/etc/nginx/scgi" 1 2;
uwsgi_temp_path "/etc/nginx/uwsgi" 1 2;
client_body_temp_path "{{ trimSuffix "/" .Values.nginx.tmpFolderPath }}/client_body" 1 2;
proxy_temp_path "{{ trimSuffix "/" .Values.nginx.tmpFolderPath }}/proxy" 1 2;
fastcgi_temp_path "{{ trimSuffix "/" .Values.nginx.tmpFolderPath }}/fastcgi" 1 2;
scgi_temp_path "{{ trimSuffix "/" .Values.nginx.tmpFolderPath }}/scgi" 1 2;
uwsgi_temp_path "{{ trimSuffix "/" .Values.nginx.tmpFolderPath }}/uwsgi" 1 2;

sendfile on;

Expand Down
10 changes: 9 additions & 1 deletion charts/rasa-x/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ rasa:
# key: url
# - name: "CUSTOM_MODEL_SERVER"
# value: "https://your-model-server/models/latest-model.tar.gz"

# tolerations can be used to control the pod to node assignment
# https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
tolerations: []
Expand Down Expand Up @@ -677,6 +677,14 @@ nginx:
# https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
podLabels: {}

# runFolderPath specifies where the nginx.pid file will be written
# change the path from the default /etc/nginx in case that folder is not writeable
runFolderPath: /etc/nginx

# tmpFolderPath specifies the main path where client_body, proxy, fastcgi, scgi, and uwsgi subfolders are written
# change the path from the default /etc/nginx in case that folder is not writeable
tmpFolderPath: /etc/nginx

# Duckling specific settings
duckling:
# override the default command to run in the container
Expand Down

0 comments on commit 13de1dd

Please sign in to comment.