From d1527470d38cfbd439c4da83c73ef68b02e9de9a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 13 Apr 2024 12:37:41 +0200 Subject: [PATCH] Use new synapse host --- Makefile | 1 + deploy/flake.lock | 14 ++++++------- flake.lock | 6 +++--- flakes/flake.lock | 4 ++-- systems/eldiron/websites/immae/matrix/client | 4 ++-- systems/eldiron/websites/immae/matrix/server | 2 +- systems/eldiron/websites/immae/production.nix | 1 + systems/eldiron/websites/tools/default.nix | 2 +- systems/zoldene/logging.nix | 21 +++++++++++++++++++ 9 files changed, 39 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index d9c1892..d4b4154 100644 --- 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 03d18d6..c766b08 100644 --- 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 11828ec..f22d393 100644 --- 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 2453924..17264a4 100644 --- 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 89136a0..8bb3d2f 100644 --- 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 449155a..8314aa1 100644 --- 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 2ed4a7d..9e8cc5d 100644 --- 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" Alias /patches ${patchesDir} diff --git a/systems/eldiron/websites/tools/default.nix b/systems/eldiron/websites/tools/default.nix index b396d44..b591190 100644 --- 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 a0f8c9d..2b6e331 100644 --- 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; -- 2.41.0