From 5bb39f2e329fc08be9ff0a630bd73455adf6be40 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Oct 22 2022 12:53:44 +0000
Subject: Merge branch 'hellcp/discourse-maillog' into 'production'


Remove maillog line from postfix maincf config

See merge request infra/salt!582
---

diff --git a/pillar/role/discourse.sls b/pillar/role/discourse.sls
index 7aef678..bbc5118 100644
--- a/pillar/role/discourse.sls
+++ b/pillar/role/discourse.sls
@@ -7,7 +7,6 @@ include:
 profile:
   postfix:
     maincf:
-      maillog_file: /dev/stdout
       smtputf8_enable: 'no'
       compatibility_level: 2
       export_environment: 'TZ LANG'
@@ -15,9 +14,8 @@ profile:
       mydestination: localhost
       mynetworks: '127.0.0.0/8 [::1]/128 [fe80::]/64'
       transport_maps: hash:/etc/postfix/transport
-      smtpd_recipient_restrictions: check_policy_service unix:private/policy
+      smtpd_recipient_restrictions: permit_mynetworks, check_policy_service unix:private/policy
     mastercf:
-      smtp: inet n - n - - smtpd
       discourse: unix - n n - - pipe user=nobody:nogroup argv=/usr/bin/receive-mail ${recipient}
       policy: unix - n n - - spawn user=nobody argv=/usr/bin/discourse-smtp-fast-rejection
     aliases:
@@ -33,6 +31,9 @@ profile:
 
 nginx:
   ng:
+    config:
+      - load_module: /usr/lib64/nginx/modules/ngx_http_brotli_static_module.so
+      - load_module: /usr/lib64/nginx/modules/ngx_http_brotli_filter_module.so
     servers:
       managed:
         forums.opensuse.org.conf:
diff --git a/salt/profile/discourse/files/discourse.conf b/salt/profile/discourse/files/discourse.conf
index 1331b36..9940e52 100644
--- a/salt/profile/discourse/files/discourse.conf
+++ b/salt/profile/discourse/files/discourse.conf
@@ -14,6 +14,9 @@ db_password = '{{ pillar['postgres']['users']['discourse']['password'] }}'
 # hostname running the forum
 hostname = {{ pillar['profile']['discourse']['hostname'] }}
 
+# address of smtp server used to send emails
+smtp_address = localhost
+
 # domain passed to smtp server
 smtp_domain = {{ pillar['profile']['discourse']['smtp_domain'] }}