diff --git a/helm/templates/cm.yaml b/helm/templates/cm.yaml index 692ab21..e1cde37 100644 --- a/helm/templates/cm.yaml +++ b/helm/templates/cm.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: labels: {{- include "uv-portal-desktop.labels" . | nindent 4 }} - name: system-consts + name: {{ include "uv-portal-desktop.name" . }} namespace: {{ include "uv-portal-desktop.namespace" . }} data: -{{- .Values.systemConsts.configMapData | toYaml | nindent 2 }} +{{- .Values.configMapData | toYaml | nindent 2 }} diff --git a/helm/values.yaml b/helm/values.yaml index eb662c2..40f0395 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -55,64 +55,62 @@ env: livenessProbe: {} readinessProbe: {} -systemConsts: - configMapData: - supervisord.conf: |- - [supervisord] - redirect_stderr=true - stopsignal=QUIT - autorestart=true - directory=/root - # - [program:nginx] - priority=10 - command=nginx -c /etc/nginx/nginx.conf -g 'daemon off;' - # - [program:web] - priority=10 - directory=/usr/local/lib/web/backend - command=/usr/local/lib/web/backend/run.py - stdout_logfile=/dev/fd/1 - stdout_logfile_maxbytes=0 - stderr_logfile=/dev/fd/1 - stderr_logfile_maxbytes=0 - # - # - [group:x] - programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc - # - [program:wm] - priority=15 - command=/usr/bin/openbox - environment=DISPLAY=":1",HOME="/root",USER="root" - # - [program:lxpanel] - priority=15 - directory=/home/uvdesk - command=/usr/bin/lxpanel --profile LXDE - user=uvdesk - environment=DISPLAY=":1",HOME="/home/uvdesk",USER="uvdesk" - # - [program:pcmanfm] - priority=15 - directory=/home/uvdesk - command=/usr/bin/pcmanfm --desktop --profile LXDE - user=uvdesk - environment=DISPLAY=":1",HOME="/home/uvdesk",USER="uvdesk" - # - [program:xvfb] - priority=10 - command=/usr/local/bin/xvfb.sh - stopsignal=KILL - # - [program:x11vnc] - priority=20 - command=x11vnc -display :1 -xkb -forever -shared -repeat -capslock -rfbauth /.password2 - # - [program:novnc] - priority=25 - directory=/usr/local/lib/web/frontend/static/novnc - command=bash /usr/local/lib/web/frontend/static/novnc/utils/launch.sh --listen 6081 - stopasgroup=true - # - +configMapData: + supervisord.conf: |- + [supervisord] + redirect_stderr=true + stopsignal=QUIT + autorestart=true + directory=/root + # + [program:nginx] + priority=10 + command=nginx -c /etc/nginx/nginx.conf -g 'daemon off;' + # + [program:web] + priority=10 + directory=/usr/local/lib/web/backend + command=/usr/local/lib/web/backend/run.py + stdout_logfile=/dev/fd/1 + stdout_logfile_maxbytes=0 + stderr_logfile=/dev/fd/1 + stderr_logfile_maxbytes=0 + # + # + [group:x] + programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc + # + [program:wm] + priority=15 + command=/usr/bin/openbox + environment=DISPLAY=":1",HOME="/root",USER="root" + # + [program:lxpanel] + priority=15 + directory=/home/uvdesk + command=/usr/bin/lxpanel --profile LXDE + user=uvdesk + environment=DISPLAY=":1",HOME="/home/uvdesk",USER="uvdesk" + # + [program:pcmanfm] + priority=15 + directory=/home/uvdesk + command=/usr/bin/pcmanfm --desktop --profile LXDE + user=uvdesk + environment=DISPLAY=":1",HOME="/home/uvdesk",USER="uvdesk" + # + [program:xvfb] + priority=10 + command=/usr/local/bin/xvfb.sh + stopsignal=KILL + # + [program:x11vnc] + priority=20 + command=x11vnc -display :1 -xkb -forever -shared -repeat -capslock -rfbauth /.password2 + # + [program:novnc] + priority=25 + directory=/usr/local/lib/web/frontend/static/novnc + command=bash /usr/local/lib/web/frontend/static/novnc/utils/launch.sh --listen 6081 + stopasgroup=true + # \ No newline at end of file