From f69434c074dc1d53700733ffb5ad974479d33b88 Mon Sep 17 00:00:00 2001
From: legonzaur <legonzaur@live.fr>
Date: Wed, 16 Apr 2025 23:07:19 +0200
Subject: [PATCH] remove Caddy, add documentation

---
 README.md             | 30 ++++++++++++++++++++++++++++--
 synapse-configmap.yml | 15 ---------------
 synapse.kube          |  3 +--
 synapse.yml           | 25 -------------------------
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 2111ed8..1b0b2c8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,31 @@
 # matrix-synapse-quadlets
 
-add 'net.ipv4.ip_unprivileged_port_start=80' to /etc/sysctl.conf
+## How to install (from [podman documentation](https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html))
 
-sysctl net.ipv4.ip_unprivileged_port_start=80
+Podman rootful unit search path
+
+Quadlet files for the root user can be placed in the following directories ordered in precedence. Meaning duplicate named quadlets found under /run take precedence over ones in /etc, as well as those in /usr:
+
+Temporary quadlets, usually used for testing:
+
+- /run/containers/systemd/
+
+System administrator’s defined quadlets:
+
+- /etc/containers/systemd/
+
+Distribution defined quadlets:
+
+- /usr/share/containers/systemd/
+
+Podman rootless unit search path
+
+Quadlet files for non-root users can be placed in the following directories:
+
+- $XDG_RUNTIME_DIR/containers/systemd/
+
+- $XDG_CONFIG_HOME/containers/systemd/ or ~/.config/containers/systemd/
+
+- /etc/containers/systemd/users/$(UID)
+
+- /etc/containers/systemd/users/
diff --git a/synapse-configmap.yml b/synapse-configmap.yml
index f3e9873..b985bd2 100644
--- a/synapse-configmap.yml
+++ b/synapse-configmap.yml
@@ -32,18 +32,3 @@ data:
     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 6cb7a7d..5e0ab17 100644
--- a/synapse.kube
+++ b/synapse.kube
@@ -7,8 +7,7 @@ Yaml=synapse.yml
 
 Network=synapse.network
 
-PublishPort=80:80
-PublishPort=443:443
+PublishPort=8008:8008
 ConfigMap=synapse-configmap.yml
 
 [Install]
diff --git a/synapse.yml b/synapse.yml
index f998f2b..5f08bf8 100644
--- a/synapse.yml
+++ b/synapse.yml
@@ -40,19 +40,6 @@ spec:
       storage: 20Gi
 
 ---
-# apiVersion: v1
-# kind: PersistentVolumeClaim
-# metadata:
-#   name: caddy-data
-#   labels:
-#     app: synapse
-# spec:
-#   accessModes:
-#     - ReadWriteOnce
-#   resources:
-#     requests:
-#       storage: 1Gi
-# ---
 apiVersion: v1
 kind: Pod
 metadata:
@@ -96,15 +83,6 @@ 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:
@@ -118,6 +96,3 @@ spec:
     - name: synapse-media-pvc
       persistentVolumeClaim:
         claimName: synapse-media
-    # - name: caddy-data-pvc
-    #   persistentVolumeClaim:
-    #     claimName: caddy-data