*: Simplify kube.PersistentVolumeClaims
Change-Id: I0a3e44de9f1c4db146fd1e493741f5fe381da3ae
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1768
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/app/matrix/lib/matrix.libsonnet b/app/matrix/lib/matrix.libsonnet
index 2b95345..b8a21f9 100644
--- a/app/matrix/lib/matrix.libsonnet
+++ b/app/matrix/lib/matrix.libsonnet
@@ -97,15 +97,8 @@
dataVolume: kube.PersistentVolumeClaim("synapse-data-waw3") {
metadata+: app.metadata("synapse-data"),
- spec+: {
- storageClassName: cfg.storageClassName,
- accessModes: [ "ReadWriteOnce" ],
- resources: {
- requests: {
- storage: "50Gi",
- },
- },
- },
+ storage: "50Gi",
+ storageClass: cfg.storageClassName,
},
// homeserver.yaml that will be used to run synapse (in synapseConfigMap).
@@ -266,15 +259,15 @@
// Standard nginx.conf, made to work when running as unprivileged user.
"nginx.conf": |||
worker_processes auto;
-
+
error_log /tmp/nginx_error.log warn;
pid /tmp/nginx.pid;
-
+
events {
worker_connections 1024;
}
-
-
+
+
http {
client_body_temp_path /tmp/nginx_client_temp;
proxy_temp_path /tmp/nginx_proxy_temp;
@@ -290,16 +283,16 @@
access_log /tmp/nginx_access.log main;
sendfile on;
keepalive_timeout 65;
-
+
server {
listen 8080;
server_name localhost;
-
+
location / {
root /usr/share/nginx/html;
index index.html index.htm;
}
-
+
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;