diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-04-13 12:37:41 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-04-13 12:44:13 +0200 |
commit | d1527470d38cfbd439c4da83c73ef68b02e9de9a (patch) | |
tree | 7d131bf5985251f7e82f050e0feb6c23227bab05 /systems | |
parent | 90d0d66c5e4a0108b0a90f90d66a712b66527c27 (diff) | |
download | Nix-d1527470d38cfbd439c4da83c73ef68b02e9de9a.tar.gz Nix-d1527470d38cfbd439c4da83c73ef68b02e9de9a.tar.zst Nix-d1527470d38cfbd439c4da83c73ef68b02e9de9a.zip |
Use new synapse host
Diffstat (limited to 'systems')
-rw-r--r-- | systems/eldiron/websites/immae/matrix/client | 4 | ||||
-rw-r--r-- | systems/eldiron/websites/immae/matrix/server | 2 | ||||
-rw-r--r-- | systems/eldiron/websites/immae/production.nix | 1 | ||||
-rw-r--r-- | systems/eldiron/websites/tools/default.nix | 2 | ||||
-rw-r--r-- | systems/zoldene/logging.nix | 21 |
5 files changed, 26 insertions, 4 deletions
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 @@ | |||
1 | { | 1 | { |
2 | "m.homeserver": { | 2 | "m.homeserver": { |
3 | "base_url": "https://immae.ems.host" | 3 | "base_url": "https://synapse.immae.eu" |
4 | }, | 4 | }, |
5 | "m.identity_server": { | 5 | "m.identity_server": { |
6 | "base_url": "https://vector.im" | 6 | "base_url": "https://vector.im" |
7 | }, | 7 | }, |
8 | "org.matrix.msc3575.proxy": { | 8 | "org.matrix.msc3575.proxy": { |
9 | "url": "https://immae.ems.host" | 9 | "url": "https://synapse.immae.eu" |
10 | } | 10 | } |
11 | } | 11 | } |
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 @@ | |||
1 | { | 1 | { |
2 | "m.server": "immae.ems.host:443" | 2 | "m.server": "synapse.immae.eu:443" |
3 | } | 3 | } |
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 { | |||
56 | AllowOverride None | 56 | AllowOverride None |
57 | Require all granted | 57 | Require all granted |
58 | Header always set Access-Control-Allow-Origin "*" | 58 | Header always set Access-Control-Allow-Origin "*" |
59 | Header always set Cache-Control "max-age=3600, public" | ||
59 | </Directory> | 60 | </Directory> |
60 | 61 | ||
61 | Alias /patches ${patchesDir} | 62 | 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 | |||
79 | matrix = pkgs.element-web.override { | 79 | matrix = pkgs.element-web.override { |
80 | conf = { | 80 | conf = { |
81 | default_server_config."m.homeserver" = { | 81 | default_server_config."m.homeserver" = { |
82 | base_url = "https://immae.ems.host"; | 82 | base_url = "https://synapse.immae.eu"; |
83 | server_name = "immae.eu"; | 83 | server_name = "immae.eu"; |
84 | }; | 84 | }; |
85 | default_server_config."m.identity_server" = { | 85 | 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 | |||
@@ -54,6 +54,12 @@ in | |||
54 | mode = "0755"; | 54 | mode = "0755"; |
55 | } | 55 | } |
56 | { | 56 | { |
57 | directory = "/var/lib/postgresql/${psqlVersion}"; | ||
58 | user = config.users.users.postgres.name; | ||
59 | group = config.users.users.postgres.group; | ||
60 | mode = "0755"; | ||
61 | } | ||
62 | { | ||
57 | directory = "/var/lib/fluentbit"; | 63 | directory = "/var/lib/fluentbit"; |
58 | user = config.users.users.fluentbit.name; | 64 | user = config.users.users.fluentbit.name; |
59 | group = config.users.users.fluentbit.group; | 65 | group = config.users.users.fluentbit.group; |
@@ -110,6 +116,21 @@ in | |||
110 | ]; | 116 | ]; |
111 | }; | 117 | }; |
112 | }; | 118 | }; |
119 | systemd.services.postgresql.after = [ | ||
120 | "var-lib-postgresql.mount" | ||
121 | "var-lib-postgresql-16.mount" | ||
122 | "persist-zfast-var-lib-postgresql.mount" | ||
123 | "persist-zfast-var-lib-postgresql-16.mount" | ||
124 | ]; | ||
125 | systemd.services.postgresql.unitConfig = { | ||
126 | BindsTo = [ | ||
127 | "var-lib-postgresql.mount" | ||
128 | "var-lib-postgresql-16.mount" | ||
129 | "persist-zfast-var-lib-postgresql.mount" | ||
130 | "persist-zfast-var-lib-postgresql-16.mount" | ||
131 | ]; | ||
132 | }; | ||
133 | |||
113 | services.postgresql = { | 134 | services.postgresql = { |
114 | enable = true; | 135 | enable = true; |
115 | package = pkgs.postgresql_16; | 136 | package = pkgs.postgresql_16; |