Skip to content

Commit

Permalink
chore: ovh
Browse files Browse the repository at this point in the history
  • Loading branch information
matmut7 committed Mar 21, 2024
1 parent 5e4af5c commit 16a10ab
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 45 deletions.
3 changes: 1 addition & 2 deletions .kontinuous/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ repositoryName: egapro

dependencies:
fabrique:
import: SocialGouv/kontinuous/plugins/fabrique
extends:
- name: buildkit-service
- name: ovh
4 changes: 2 additions & 2 deletions .kontinuous/env/preprod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ app:
MAILER_SMTP_HOST: maildev
MAILER_SMTP_PORT: "1025"
MAILER_SMTP_SSL: "False"
# EMAIL_LOGIN: "True"
# EMAIL_LOGIN: "True"
autoscale:
enabled: true
resources:
Expand All @@ -34,4 +34,4 @@ app:
memory: 1G

maildev: {}
pgweb: {}
pgweb: {}
80 changes: 39 additions & 41 deletions .kontinuous/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ x-secure-headers: &headers >-

more_set_headers "X-Content-Type-Options: nosniff";

more_set_headers "Referrer-Policy: no-referrer, strict-origin-when-cross-origin";
more_set_headers "Referrer-Policy: no-referrer,
strict-origin-when-cross-origin";

more_set_headers
"Permissions-Policy:
fullscreen=(),
display-capture=(),
camera=(),
microphone=(),
web-share=(),
geolocation=()"
more_set_headers "Permissions-Policy: fullscreen=(), display-capture=(),
camera=(), microphone=(), web-share=(), geolocation=()"

more_set_headers "Cross-Origin-Embedder-Policy: credentialless";

more_set_headers "Cross-Origin-Resource-Policy: cross-origin";

more_set_headers "Cross-Origin-Opener-Policy: same-origin";

global:
pgSecretName: pg-app
pgDatabase: egapro
pgUser: egapro

app:
~chart: app
~needs: [build-app]
Expand Down Expand Up @@ -114,6 +114,9 @@ api:
EGAPRO_DBSSL: "$(PGSSLMODE)"
EGAPRO_SENTRY_DSN: "https://[email protected]/22"

pg:
~chart: pg

files:
~chart: app
image: ghcr.io/socialgouv/docker/nginx:7.0.1
Expand All @@ -130,35 +133,37 @@ files:
mountPath: /usr/share/nginx/html
sidecars:
- name: scheduler
~tpl~image: "{{ $.Values.global.registry }}/{{ $.Values.global.imageProject }}/{{ $.Values.global.imageRepository }}/api:{{ $.Values.global.imageTag }}"
~tpl~image:
"{{ $.Values.global.registry }}/{{ $.Values.global.imageProject }}/{{
$.Values.global.imageRepository }}/api:{{ $.Values.global.imageTag }}"
extraSpec:
envFrom:
- secretRef:
~tpl~name: "{{ .Values.global.pgSecretName }}"
- secretRef:
name: "staff"
- secretRef:
name: "egapro-secret"
- secretRef:
~tpl~name: "{{ .Values.global.pgSecretName }}"
- secretRef:
name: "staff"
- secretRef:
name: "egapro-secret"
env:
- name: EGAPRO_DBHOST
value: "$(PGHOST)"
- name: EGAPRO_DBNAME
value: "$(PGDATABASE)"
- name: EGAPRO_DBPORT
value: "$(PGPORT)"
- name: EGAPRO_DBUSER
value: "$(PGUSER)"
- name: EGAPRO_DBPASS
value: "$(PGPASSWORD)"
- name: EGAPRO_DBSSL
value: "$(PGSSLMODE)"
- name: EGAPRO_SENTRY_DSN
value: "https://[email protected]/22"
- name: SCHEDULER
value: "True"
- name: EGAPRO_DBHOST
value: "$(PGHOST)"
- name: EGAPRO_DBNAME
value: "$(PGDATABASE)"
- name: EGAPRO_DBPORT
value: "$(PGPORT)"
- name: EGAPRO_DBUSER
value: "$(PGUSER)"
- name: EGAPRO_DBPASS
value: "$(PGPASSWORD)"
- name: EGAPRO_DBSSL
value: "$(PGSSLMODE)"
- name: EGAPRO_SENTRY_DSN
value: "https://[email protected]/22"
- name: SCHEDULER
value: "True"
volumeMounts:
- name: files
mountPath: /mnt/files
- name: files
mountPath: /mnt/files

project:
whitelist:
Expand Down Expand Up @@ -210,10 +215,3 @@ jobs:
with:
imagePackage: nginx
context: packages/nginx

deactivate:
jobs-deactivate:
runs:
deactivate:
with:
db: true

0 comments on commit 16a10ab

Please sign in to comment.