Use new synapse host

diff --git a/Makefile b/Makefile
index d9c1892735ac6bd5ff7831b2297454b4a6361e90..d4b41540bb297597492498ce77dab2b7d4af224f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ ssh:
 ssh-zoldene-decrypt:
        $(MAKE) ssh-decrypt TARGET=$(@:ssh-%-decrypt=%)
 ssh-decrypt:
+       until ping -c1 $(TARGET); do :; done
        ./scripts/with_env bash -c 'ssh -p 2222 -i $$SSH_IDENTITY_FILE root@$(TARGET) $(SSH_ARGS)'
 
 .PHONY: debug $(addprefix debug-,$(nodes))

diff --git a/deploy/flake.lock b/deploy/flake.lock
index 03d18d6b90bab007e087bfc5b849f8dd335037e6..c766b089eb7511cf6851f8beb5693ad5dd830aed 100644 (file)
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2783,7 +2783,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-d0pFztjW1zKsfockL6q1bvRvkDN9A257733dxU3nhmQ=",
+        "narHash": "sha256-N8FlN9eUGGmz7MevjaGC7Y07AEebJGRzcESmOW87/0Q=",
         "path": "../flakes",
         "type": "path"
       },
@@ -3903,7 +3903,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Fm13ywWMQlFSAxCWxI+lexO1IetZ1NPrqmBssLMLHpA=",
+        "narHash": "sha256-OvT4dJGxdFBUgwjTu6FzejI/euWYXWsX1vD952B8934=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3974,7 +3974,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-M3GhXYoHnWpmutLwY4HSpS9+6gNyLG/DWzErI5BKjNI=",
+        "narHash": "sha256-Q+U6JxtY67jVPjuzfwrjSGmIM73kIRrjKm0ihbUxPGQ=",
         "path": "../systems/zoldene",
         "type": "path"
       },
@@ -8888,11 +8888,11 @@
         "nixpkgs": "nixpkgs_106"
       },
       "locked": {
-        "lastModified": 1709824287,
-        "narHash": "sha256-pco5zdRz/nN5v6olGD1vTl+ryq0KMK5cbaruisR/qUY=",
+        "lastModified": 1713004475,
+        "narHash": "sha256-zXj5DiaeAiLGIFcgMyQTtICXg4kgIiiYcTbnDIocY38=",
         "ref": "master",
-        "rev": "9b6bd6cf504abac4d8e794f38b8e2efbf015686f",
-        "revCount": 726,
+        "rev": "8fd3e35df106a494e3195708e8cba076f2c94acb",
+        "revCount": 728,
         "type": "git",
         "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets"
       },

diff --git a/flake.lock b/flake.lock
index 11828ec21eee1d6cd1ac7b369dad7f4cd53c0987..f22d39372d88caecb2919f42d92d8ee915abd7cb 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -2664,7 +2664,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-d0pFztjW1zKsfockL6q1bvRvkDN9A257733dxU3nhmQ=",
+        "narHash": "sha256-N8FlN9eUGGmz7MevjaGC7Y07AEebJGRzcESmOW87/0Q=",
         "path": "./flakes",
         "type": "path"
       },
@@ -3919,7 +3919,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Fm13ywWMQlFSAxCWxI+lexO1IetZ1NPrqmBssLMLHpA=",
+        "narHash": "sha256-OvT4dJGxdFBUgwjTu6FzejI/euWYXWsX1vD952B8934=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3990,7 +3990,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-M3GhXYoHnWpmutLwY4HSpS9+6gNyLG/DWzErI5BKjNI=",
+        "narHash": "sha256-Q+U6JxtY67jVPjuzfwrjSGmIM73kIRrjKm0ihbUxPGQ=",
         "path": "../systems/zoldene",
         "type": "path"
       },

diff --git a/flakes/flake.lock b/flakes/flake.lock
index 24539242007b6340ab641ea74be20f8f42c53a75..17264a4857347e45a551c4423a3977344cf3a70e 100644 (file)
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3824,7 +3824,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Fm13ywWMQlFSAxCWxI+lexO1IetZ1NPrqmBssLMLHpA=",
+        "narHash": "sha256-OvT4dJGxdFBUgwjTu6FzejI/euWYXWsX1vD952B8934=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3895,7 +3895,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-M3GhXYoHnWpmutLwY4HSpS9+6gNyLG/DWzErI5BKjNI=",
+        "narHash": "sha256-Q+U6JxtY67jVPjuzfwrjSGmIM73kIRrjKm0ihbUxPGQ=",
         "path": "../systems/zoldene",
         "type": "path"
       },

diff --git a/systems/eldiron/websites/immae/matrix/client b/systems/eldiron/websites/immae/matrix/client
index 89136a078cebe8954d387b2b3cccc72a5bc0d309..8bb3d2f2910376a009b76fdff3e14022f45af9eb 100644 (file)
--- a/systems/eldiron/websites/immae/matrix/client
+++ b/systems/eldiron/websites/immae/matrix/client
@@ -1,11 +1,11 @@
 {
     "m.homeserver": {
-        "base_url": "https://immae.ems.host"
+        "base_url": "https://synapse.immae.eu"
     },
     "m.identity_server": {
         "base_url": "https://vector.im"
     },
     "org.matrix.msc3575.proxy": {
-        "url": "https://immae.ems.host"
+        "url": "https://synapse.immae.eu"
     }
 }

diff --git a/systems/eldiron/websites/immae/matrix/server b/systems/eldiron/websites/immae/matrix/server
index 449155a358dcac2e1b94cf1e7e47d76cc264009f..8314aa1b8cf9f1a23f430ba11c056bbfe4a09b1c 100644 (file)
--- a/systems/eldiron/websites/immae/matrix/server
+++ b/systems/eldiron/websites/immae/matrix/server
@@ -1,3 +1,3 @@
 {
-    "m.server": "immae.ems.host:443"
+    "m.server": "synapse.immae.eu:443"
 }

diff --git a/systems/eldiron/websites/immae/production.nix b/systems/eldiron/websites/immae/production.nix
index 2ed4a7d748a96b6f3eeda91a595a890df3696205..9e8cc5d4034754e9d7f8fa413d84c3eabc0a9a94 100644 (file)
--- a/systems/eldiron/websites/immae/production.nix
+++ b/systems/eldiron/websites/immae/production.nix
@@ -56,6 +56,7 @@ in {
           AllowOverride None
           Require all granted
           Header always set Access-Control-Allow-Origin "*"
+          Header always set Cache-Control "max-age=3600, public"
         </Directory>
 
         Alias /patches ${patchesDir}

diff --git a/systems/eldiron/websites/tools/default.nix b/systems/eldiron/websites/tools/default.nix
index b396d44e611c239c275dd4a25cff0b9d870d6d32..b5911905d1a6e5a2a2a456f985a12fc0d494a41a 100644 (file)
--- a/systems/eldiron/websites/tools/default.nix
+++ b/systems/eldiron/websites/tools/default.nix
@@ -79,7 +79,7 @@ let
   matrix = pkgs.element-web.override {
     conf = {
       default_server_config."m.homeserver" = {
-        base_url = "https://immae.ems.host";
+        base_url = "https://synapse.immae.eu";
         server_name = "immae.eu";
       };
       default_server_config."m.identity_server" = {

diff --git a/systems/zoldene/logging.nix b/systems/zoldene/logging.nix
index a0f8c9dc83ab8a09fc97d9256db77a6a1ea5a68a..2b6e331126a09d3b2507c6b46391e79a2be5d8c3 100644 (file)
--- a/systems/zoldene/logging.nix
+++ b/systems/zoldene/logging.nix
@@ -53,6 +53,12 @@ in
       group = config.users.users.postgres.group;
       mode = "0755";
     }
+    {
+      directory = "/var/lib/postgresql/${psqlVersion}";
+      user = config.users.users.postgres.name;
+      group = config.users.users.postgres.group;
+      mode = "0755";
+    }
     {
       directory = "/var/lib/fluentbit";
       user = config.users.users.fluentbit.name;
@@ -110,6 +116,21 @@ in
       ];
     };
   };
+  systemd.services.postgresql.after = [
+    "var-lib-postgresql.mount"
+    "var-lib-postgresql-16.mount"
+    "persist-zfast-var-lib-postgresql.mount"
+    "persist-zfast-var-lib-postgresql-16.mount"
+  ];
+  systemd.services.postgresql.unitConfig = {
+    BindsTo = [
+      "var-lib-postgresql.mount"
+      "var-lib-postgresql-16.mount"
+      "persist-zfast-var-lib-postgresql.mount"
+      "persist-zfast-var-lib-postgresql-16.mount"
+    ];
+  };
+
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_16;