Commit 6dfb986f authored by Mark Harding's avatar Mark Harding

(chore): configs for ssr

No related merge requests found
Pipeline #108995502 passed with stage
in 1 minute
......@@ -55,7 +55,7 @@ data:
listen 80;
listen [::]:80 default ipv6only=on;
index index.php index.html;
index index.html;
server_name _;
root /var/www/Minds/front/dist;
......@@ -75,8 +75,16 @@ data:
sendfile off;
location / {
try_files $uri $uri/ @rewrite;
port_in_redirect off;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-NginX-Proxy true;
proxy_pass http://127.0.0.1:4200/;
proxy_redirect off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_redirect off;
proxy_set_header X-Forwarded-Proto $scheme;
}
location ~ ^(/api|/fs|/icon|/carousel) {
......@@ -343,7 +351,8 @@ data:
// Legacy stripe configuration
$CONFIG->set('payments', [
'stripe' => [
'api_key' => '',
'api_key' => '{{ .Values.stripe.secret_key }}',
'public_key' => '{{ .Values.stripe.public_key }}',
'transfers' => [
'source_type' => 'bank_account'
]
......
......@@ -67,18 +67,28 @@ spec:
- name: nginx-config
mountPath: /etc/nginx/nginx.conf
subPath: nginx.conf
- name: {{ .Chart.Name }}-front
image: "{{ .Values.front.image.repository }}:{{ .Values.front.image.tag }}"
imagePullPolicy: {{ .Values.front.image.pullPolicy }}
ports:
- name: ssr
containerPort: 4200
protocol: TCP
volumeMounts:
- name: front
mountPath: /var/www/Minds/front
initContainers:
- name: {{ .Chart.Name }}-front-init
image: "{{ .Values.frontInit.image.repository }}:{{ .Values.frontInit.image.tag }}"
imagePullPolicy: {{ .Values.frontInit.image.pullPolicy }}
image: "{{ .Values.front.image.repository }}:{{ .Values.front.image.tag }}"
imagePullPolicy: {{ .Values.front.image.pullPolicy }}
command: [
"sh",
"-c",
"cp -r dist /var/www/Minds/front/dist"
"cp -r /dist /var/www/Minds/front/dist"
]
volumeMounts:
- name: front
mountPath: /var/www/Minds/front
mountPath: /var/www/Minds/front
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
......
......@@ -52,8 +52,8 @@ runners:
replicas: 1
resources:
limits:
memory: 512Mi
cpu: 200m
memory: 2Gi
cpu: 1000m
dispatchers:
notifications:
replicas: 1
......@@ -90,9 +90,9 @@ runners:
transcode:
replicas: 1
frontInit:
front:
image:
repository: registry.gitlab.com/minds/front/front-init
repository: registry.gitlab.com/minds/front/server
tag: latest
pullPolicy: Always
......@@ -214,6 +214,14 @@ encryptionKeys:
private:
public:
email:
smtp:
host:
auth: true
username:
password:
port: 465
transcode:
free_threshold: '2'
hd_price: '1'
......@@ -317,3 +325,7 @@ email:
email_confirmation:
signing_key: 'changeme'
expiration: 172800
stripe:
public_key: ''
secret_key: ''
Please register or to comment