etherpad: cleanup for production

This commit is contained in:
Nico Schottelius 2021-06-20 13:08:37 +02:00
parent 47776f0658
commit 6f72fb1321
6 changed files with 12 additions and 33 deletions

View file

@ -170,7 +170,7 @@
"dbType": "dirty", "dbType": "dirty",
"dbSettings": { "dbSettings": {
"filename": "var/dirty.db" "filename": "/data/dirty.db"
}, },
/* /*

View file

@ -1,2 +0,0 @@
nginx-certbot-helm-1624126293-aservice.default.svc.c2.k8s.ooo
nginx-certbot-helm-1624126293-aservice ClusterIP 2a0a:e5c0:13:e2::f808 <none> 80/TCP,443/TCP 2m13s

View file

@ -1,16 +0,0 @@
server {
listen *:80;
listen [::]:80;
server_name _;
# Forward for certbot
location /.well-known/acme-challenge/ {
root /usr/share/nginx/html;
}
# Everything else -> ssl
location / {
return 301 https://$host$request_uri;
}
}

View file

@ -23,18 +23,10 @@ spec:
- name: etherpadconfig - name: etherpadconfig
mountPath: "/opt/etherpad-lite/settings.json" mountPath: "/opt/etherpad-lite/settings.json"
subPath: settings.json subPath: settings.json
- name: nginx
image: nginx:1.21.0-alpine
ports:
- containerPort: 80
- containerPort: 443
volumeMounts:
- name: nginx-config
mountPath: "/etc/nginx/conf.d/"
- name: etcletsencrypt - name: etcletsencrypt
mountPath: "/etc/letsencrypt" mountPath: "/etc/letsencrypt"
- name: webroot - name: data
mountPath: "/usr/share/nginx/html" mountPath: "/data"
volumes: volumes:
- name: nginx-config - name: nginx-config
configMap: configMap:
@ -42,9 +34,9 @@ spec:
- name: etcletsencrypt - name: etcletsencrypt
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Release.Name }}-letsencrypt-certs claimName: {{ .Release.Name }}-letsencrypt-certs
- name: webroot - name: data
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Release.Name }}-webroot claimName: {{ .Release.Name }}-data
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@ -85,7 +77,7 @@ spec:
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
name: {{ .Release.Name }}-webroot name: {{ .Release.Name }}-data
spec: spec:
accessModes: accessModes:
- ReadWriteMany - ReadWriteMany
@ -115,6 +107,10 @@ spec:
value: "{{ .Release.Name }}-{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" value: "{{ .Release.Name }}-{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
- name: EMAIL - name: EMAIL
value: "{{ .Values.email }}" value: "{{ .Values.email }}"
{{ if eq .Values.letsencryptStaging "no" }}
- name: STAGING
value: "no"
{{ end }}
volumeMounts: volumeMounts:
- name: etcletsencrypt - name: etcletsencrypt
mountPath: "/etc/letsencrypt" mountPath: "/etc/letsencrypt"

View file

@ -1,3 +1,4 @@
serviceName: aservice serviceName: pad
clusterDomain: c2.k8s.ooo clusterDomain: c2.k8s.ooo
email: technik@ungleich.ch email: technik@ungleich.ch
letsencryptStaging: "no"