Merge branch 'main' into production

README.md

@@ -26,9 +26,10 @@ This will generate a default configuration file for your server.
 ```
 
 8. Authenticate Docker with our Gitlab Container Registry to be able to pull our [custom sygnal image](https://gitlab.holi.team/app/holi-chat-server/container_registry)
-You will need to create a personalized [gitlab access token](https://gitlab.holi.team/app/holi-chat-server/-/settings/access_tokens) with _read_registry_ rights
+   You will need to create a personalized [gitlab access token](https://gitlab.holi.team/-/user_settings/personal_access_tokens) with _read_registry_ rights
+
+9.
 
-9. 
 ```
 docker login gitlab.holi.team:5050
 ```
@@ -39,14 +40,16 @@ docker login gitlab.holi.team:5050
 docker compose up -d
 ```
 
-This will start the server in the background and you can access the application by navigating to [https://local.chat.holi.social](https://local.chat.holi.social) in your web browser.
+This will start the server in the background and you can access the application by navigating to [http://local.chat.holi.social:8008](http://local.chat.holi.social:8008) in your web browser.
 
 11. Execute the create-synapse-admin-user.sh command with URL http://127.0.0.1:8008 and secret set in .envrc.local HOLI_CHAT_REGISTRATION_SHARED_SECRET for holi-chat-integration to work properly.
 
 12. Starting an element client
 
-You can run a local element web client like this: 
+You can run a local element web client like this:
+
 ```
 docker run -p 81:80 vectorim/element-web
 ```
+
 Since the chat server does use a self signed SSL certificate, you first need to open localhost:8448 and trust the cert. You can then open localhost:81 in your browser and change the server you want to connect to to `local.chat.holi.social`.

data/homeserver.yaml.template

@@ -20,6 +20,9 @@ database:
     cp_min: 5
     cp_max: 10
     cp_reconnect: true
+    keepalives_idle: 10 # seconds of inactivity after which TCP should send a keepalive message to the server
+    keepalives_interval: 10 # the number of seconds after which a TCP keepalive message that is not acknowledged by the server should be retransmitted    
+    keepalives_count: 3 # the number of TCP keepalives that can be lost before the client's connection to the server is considered dead
 oidc_providers:
   - idp_id: ory
     idp_name: "holi"