hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix rabbitmq - database - on fpm ans worker startup

Browse Source
This commit is contained in:
Moctar
2021-04-30 14:08:57 +02:00
parent 3f72882913
commit a74a6e9a19
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
infra/helm/all/templates/database.yml
View File

@@ -26,8 +26,6 @@ spec:
image: {{ .Values.image.registry }}/phraseanet-db:{{ .Values.image.tag.phraseanet }} image: {{ .Values.image.registry }}/phraseanet-db:{{ .Values.image.tag.phraseanet }}
imagePullPolicy: Always imagePullPolicy: Always
terminationMessagePolicy: FallbackToLogsOnError terminationMessagePolicy: FallbackToLogsOnError
resources:
{{ toYaml .Values.mysql.resources | indent 12 }}
env: env:
- name: MYSQL_ROOT_PASSWORD - name: MYSQL_ROOT_PASSWORD
value: {{ .Values.mysql.root_password }} value: {{ .Values.mysql.root_password }}

2
infra/helm/all/templates/phraseanet.yml
View File

@@ -104,6 +104,8 @@ spec:
value: "/var/alchemy/Phraseanet/datas/download" value: "/var/alchemy/Phraseanet/datas/download"
- name: PHRASEANET_LAZARET_DIR - name: PHRASEANET_LAZARET_DIR
value: "/var/alchemy/Phraseanet/datas/lazaret" value: "/var/alchemy/Phraseanet/datas/lazaret"
- name: "PHRASEANET_WORKER_TMP"
value: "/var/alchemy/Phraseanet/tmp/worker"
- name: PHRASEANET_CAPTION_DIR - name: PHRASEANET_CAPTION_DIR
value: "/var/alchemy/Phraseanet/tmp/caption" value: "/var/alchemy/Phraseanet/tmp/caption"
- name: PHRASEANET_FFMPEG_TIMEOUT - name: PHRASEANET_FFMPEG_TIMEOUT

3
infra/helm/all/templates/rabbitmq.yml
View File

@@ -18,10 +18,9 @@ spec:
- name: rabbitmq - name: rabbitmq
image: rabbitmq:3-management image: rabbitmq:3-management
terminationMessagePolicy: FallbackToLogsOnError terminationMessagePolicy: FallbackToLogsOnError
resources:
{{ toYaml .Values.rabbitmq.resources | indent 12 }}
env: env:
- name: RABBITMQ_DEFAULT_USER - name: RABBITMQ_DEFAULT_USER
value: {{ .Values.rabbitmq.default_user }} value: {{ .Values.rabbitmq.default_user }}
- name: RABBITMQ_DEFAULT_PASS - name: RABBITMQ_DEFAULT_PASS
value: {{ .Values.rabbitmq.default_pass }} value: {{ .Values.rabbitmq.default_pass }}

12
infra/helm/all/values.yaml
View File

@@ -7,7 +7,7 @@ image:
elasticsearch : 4.1.3 elasticsearch : 4.1.3
mysql: mysql:
root_password: root_password: phraseanet
max_allowed_packet: 16M max_allowed_packet: 16M
pvc_name: phraseanet-database pvc_name: phraseanet-database
resources: resources:
@@ -46,7 +46,7 @@ elasticsearch:
rabbitmq: rabbitmq:
default_user: rabbit default_user: rabbit
default_pass: default_pass: rabbit
resources: resources:
requests: requests:
cpu: "50m" cpu: "50m"
@@ -66,14 +66,16 @@ php:
ingress: ingress:
enabled: false enabled: false
hostname: phraseanet
tls: false
app: app:
hostname: localhost hostname: localhost
phraseanet_admin_account_email: support@alchemy.fr phraseanet_admin_account_email: admin@alchemy.fr
phraseaenet_admin_account_password: phraseanet phraseanet_admin_account_password: phraseanet
phraseanet_db_host: db phraseanet_db_host: db
phraseanet_db_user: root phraseanet_db_user: root
phraseanet_db_password: root phraseanet_db_password: phraseanet
install_db_template: DublinCore install_db_template: DublinCore
install_appbox: ab_master install_appbox: ab_master
install_databox: db_databox1 install_databox: db_databox1

12
infra/helm/myvalues.yaml
View File

@@ -7,7 +7,7 @@ image:
elasticsearch : 4.1.3 elasticsearch : 4.1.3
mysql: mysql:
root_password: root_password: phraseanet
max_allowed_packet: 16M max_allowed_packet: 16M
pvc_name: phraseanet-database pvc_name: phraseanet-database
resources: resources:
@@ -30,7 +30,7 @@ elasticsearch:
rabbitmq: rabbitmq:
default_user: rabbit default_user: rabbit
default_pass: default_pass: rabbit
resources: resources:
requests: requests:
cpu: "50m" cpu: "50m"
@@ -50,14 +50,16 @@ php:
ingress: ingress:
enabled: false enabled: false
hostname: phraseanet
tls: false
app: app:
hostname: localhost hostname: localhost
phraseanet_admin_account_email: support@alchemy.fr phraseanet_admin_account_email: admin@alchemy.fr
phraseaenet_admin_account_password: phraseanet phraseanet_admin_account_password: phraseanet
phraseanet_db_host: db phraseanet_db_host: db
phraseanet_db_user: root phraseanet_db_user: root
phraseanet_db_password: root phraseanet_db_password: phraseanet
install_db_template: DublinCore install_db_template: DublinCore
install_appbox: ab_master install_appbox: ab_master
install_databox: db_databox1 install_databox: db_databox1