diff --git a/README.md b/README.md index 5655d41..2111ed8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # matrix-synapse-quadlets +add 'net.ipv4.ip_unprivileged_port_start=80' to /etc/sysctl.conf + +sysctl net.ipv4.ip_unprivileged_port_start=80 diff --git a/synapse-configmap.yml b/synapse-configmap.yml index 25dd771..018ed81 100644 --- a/synapse-configmap.yml +++ b/synapse-configmap.yml @@ -4,7 +4,7 @@ metadata: name: synapse-config data: homeserver.yaml: | - server_name: "test.legonzaur.fr" + server_name: "matrix.k0rb4k.net" pid_file: /data/homeserver.pid listeners: - port: 8008 @@ -23,12 +23,28 @@ data: host: postgres cp_min: 5 cp_max: 10 - log_config: "/data/test.legonzaur.fr.log.config" + log_config: "/data/matrix.k0rb4k.net.log.config" media_store_path: /data/media_store registration_shared_secret: "8bn6seIG;1#0p9d~Y~d17*~mehlG-@DDJ~W8Yg9r4B,77*D;Uy" report_stats: true macaroon_secret_key: "@.fx9y+rL_JSE0;7PPYrBuI&,sa;mXHLeFywLgWlDSg;3faNCx" form_secret: "qu6DRGb.1H*Pe:tE4r+E~ZvND.UKiIusz~TwOMz,TLVUpX#9vi" - signing_key_path: "/data/test.legonzaur.fr.signing.key" + signing_key_path: "/data/matrix.k0rb4k.net.signing.key" trusted_key_servers: - server_name: "matrix.org" + Caddyfile: | + + http://localhost { + reverse_proxy /_matrix/* localhost:8008 + reverse_proxy /_synapse/client/* localhost:8008 + } + + + http://matrix.k0rb4k.net { + reverse_proxy /_matrix/* localhost:8008 + reverse_proxy /_synapse/client/* localhost:8008 + } + + http://k0rb4k.net:8448 { + reverse_proxy /_matrix/* localhost:8008 + } diff --git a/synapse.kube b/synapse.kube index 5e0ab17..6cb7a7d 100644 --- a/synapse.kube +++ b/synapse.kube @@ -7,7 +7,8 @@ Yaml=synapse.yml Network=synapse.network -PublishPort=8008:8008 +PublishPort=80:80 +PublishPort=443:443 ConfigMap=synapse-configmap.yml [Install] diff --git a/synapse.yml b/synapse.yml index 5beb603..6208069 100644 --- a/synapse.yml +++ b/synapse.yml @@ -41,6 +41,19 @@ spec: --- apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: caddy-data + labels: + app: synapse +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 kind: Pod metadata: name: synapse @@ -54,7 +67,7 @@ spec: mountPath: /data env: - name: SYNAPSE_SERVER_NAME - value: test.legonzaur.fr + value: matrix.k0rb4k.net - name: SYNAPSE_REPORT_STATS value: no containers: @@ -83,6 +96,15 @@ spec: port: 8008 initialDelaySeconds: 15 periodSeconds: 10 + - name: caddy + image: docker.io/caddy:2-alpine + volumeMounts: + - name: caddy-data-pvc + mountPath: /data + - name: synapse-config + mountPath: /etc/caddy/Caddyfile + readOnly: true + subPath: Caddyfile volumes: - name: synapse-config configMap: @@ -96,3 +118,6 @@ spec: - name: synapse-media-pvc persistentVolumeClaim: claimName: synapse-media + - name: caddy-data-pvc + persistentVolumeClaim: + claimName: caddy-data