diff --git a/infra/helm/all/templates/database.yml b/infra/helm/all/templates/database.yml index 5d8f389591..387e32842b 100644 --- a/infra/helm/all/templates/database.yml +++ b/infra/helm/all/templates/database.yml @@ -26,8 +26,6 @@ spec: image: {{ .Values.image.registry }}/phraseanet-db:{{ .Values.image.tag.phraseanet }} imagePullPolicy: Always terminationMessagePolicy: FallbackToLogsOnError - resources: -{{ toYaml .Values.mysql.resources | indent 12 }} env: - name: MYSQL_ROOT_PASSWORD value: {{ .Values.mysql.root_password }} diff --git a/infra/helm/all/templates/phraseanet.yml b/infra/helm/all/templates/phraseanet.yml index 03a1abd9e0..e02ea0fa49 100644 --- a/infra/helm/all/templates/phraseanet.yml +++ b/infra/helm/all/templates/phraseanet.yml @@ -104,6 +104,8 @@ spec: value: "/var/alchemy/Phraseanet/datas/download" - name: PHRASEANET_LAZARET_DIR value: "/var/alchemy/Phraseanet/datas/lazaret" + - name: "PHRASEANET_WORKER_TMP" + value: "/var/alchemy/Phraseanet/tmp/worker" - name: PHRASEANET_CAPTION_DIR value: "/var/alchemy/Phraseanet/tmp/caption" - name: PHRASEANET_FFMPEG_TIMEOUT diff --git a/infra/helm/all/templates/rabbitmq.yml b/infra/helm/all/templates/rabbitmq.yml index 2878d69193..bc31e81e95 100644 --- a/infra/helm/all/templates/rabbitmq.yml +++ b/infra/helm/all/templates/rabbitmq.yml @@ -18,10 +18,9 @@ spec: - name: rabbitmq image: rabbitmq:3-management terminationMessagePolicy: FallbackToLogsOnError - resources: -{{ toYaml .Values.rabbitmq.resources | indent 12 }} env: - name: RABBITMQ_DEFAULT_USER value: {{ .Values.rabbitmq.default_user }} - name: RABBITMQ_DEFAULT_PASS value: {{ .Values.rabbitmq.default_pass }} + diff --git a/infra/helm/all/values.yaml b/infra/helm/all/values.yaml index 671a8119bd..dec0025c04 100644 --- a/infra/helm/all/values.yaml +++ b/infra/helm/all/values.yaml @@ -7,7 +7,7 @@ image: elasticsearch : 4.1.3 mysql: - root_password: + root_password: phraseanet max_allowed_packet: 16M pvc_name: phraseanet-database resources: @@ -46,7 +46,7 @@ elasticsearch: rabbitmq: default_user: rabbit - default_pass: + default_pass: rabbit resources: requests: cpu: "50m" @@ -66,14 +66,16 @@ php: ingress: enabled: false + hostname: phraseanet + tls: false app: hostname: localhost - phraseanet_admin_account_email: support@alchemy.fr - phraseaenet_admin_account_password: phraseanet + phraseanet_admin_account_email: admin@alchemy.fr + phraseanet_admin_account_password: phraseanet phraseanet_db_host: db phraseanet_db_user: root - phraseanet_db_password: root + phraseanet_db_password: phraseanet install_db_template: DublinCore install_appbox: ab_master install_databox: db_databox1 diff --git a/infra/helm/myvalues.yaml b/infra/helm/myvalues.yaml index aa334e6de1..7fc9c1c853 100644 --- a/infra/helm/myvalues.yaml +++ b/infra/helm/myvalues.yaml @@ -7,7 +7,7 @@ image: elasticsearch : 4.1.3 mysql: - root_password: + root_password: phraseanet max_allowed_packet: 16M pvc_name: phraseanet-database resources: @@ -30,7 +30,7 @@ elasticsearch: rabbitmq: default_user: rabbit - default_pass: + default_pass: rabbit resources: requests: cpu: "50m" @@ -50,14 +50,16 @@ php: ingress: enabled: false + hostname: phraseanet + tls: false app: hostname: localhost - phraseanet_admin_account_email: support@alchemy.fr - phraseaenet_admin_account_password: phraseanet + phraseanet_admin_account_email: admin@alchemy.fr + phraseanet_admin_account_password: phraseanet phraseanet_db_host: db phraseanet_db_user: root - phraseanet_db_password: root + phraseanet_db_password: phraseanet install_db_template: DublinCore install_appbox: ab_master install_databox: db_databox1