diff options
Diffstat (limited to 'hosts')
-rw-r--r-- | hosts/surtr/email/default.nix | 6 | ||||
-rw-r--r-- | hosts/surtr/postgresql/default.nix | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix index 87c42fbd..ca5d2755 100644 --- a/hosts/surtr/email/default.nix +++ b/hosts/surtr/email/default.nix | |||
@@ -275,6 +275,12 @@ in { | |||
275 | postscreen_access_list = ""; | 275 | postscreen_access_list = ""; |
276 | postscreen_denylist_action = "drop"; | 276 | postscreen_denylist_action = "drop"; |
277 | postscreen_greet_action = "enforce"; | 277 | postscreen_greet_action = "enforce"; |
278 | |||
279 | sender_bcc_maps = ''pgsql:${pkgs.writeText "virtual_mailbox_maps.cf" '' | ||
280 | hosts = postgresql:///email | ||
281 | dbname = email | ||
282 | query = SELECT value FROM sender_bcc_maps WHERE key = '%s' | ||
283 | ''}''; | ||
278 | }; | 284 | }; |
279 | masterConfig = { | 285 | masterConfig = { |
280 | "465" = { | 286 | "465" = { |
diff --git a/hosts/surtr/postgresql/default.nix b/hosts/surtr/postgresql/default.nix index e29da0b8..2908435d 100644 --- a/hosts/surtr/postgresql/default.nix +++ b/hosts/surtr/postgresql/default.nix | |||
@@ -314,6 +314,18 @@ in { | |||
314 | CREATE UNIQUE INDEX relay_unique ON relay_access (mailbox, domain); | 314 | CREATE UNIQUE INDEX relay_unique ON relay_access (mailbox, domain); |
315 | 315 | ||
316 | COMMIT; | 316 | COMMIT; |
317 | |||
318 | BEGIN; | ||
319 | SELECT _v.register_patch('015-sender_bcc', ARRAY[], null); | ||
320 | |||
321 | CREATE TABLE sender_bcc_maps ( | ||
322 | id uuid PRIMARY KEY NOT NULL DEFAULT gen_random_uuid(), | ||
323 | key text NOT NULL CONSTRAINT key_not_empty CHECK (key <> '''), | ||
324 | value text NOT NULL CONSTRAINT value_not_empty CHECK (value <> '''), | ||
325 | CONSTRAINT key_unique UNIQUE (key) | ||
326 | ); | ||
327 | |||
328 | COMMIT; | ||
317 | ''} | 329 | ''} |
318 | 330 | ||
319 | psql etebase postgres -eXf ${pkgs.writeText "etebase.sql" '' | 331 | psql etebase postgres -eXf ${pkgs.writeText "etebase.sql" '' |