bin/prepare_minion.py

@@ -28,7 +28,6 @@ file_roots:
     - /srv/salt
     - /srv/formulas/salt-formula
     - /srv/formulas/users-formula
-    - /srv/formulas/postfix-formula
 ''')
 
 os.symlink(mypwd + '/salt', '/srv/salt')

pillar/common.sls

@@ -1,8 +1,12 @@
 include:
   - role.salt.common
   - role.salt.minion
-  - common.{{ grains['os'] | lower }}
 
 managed_header_pound: |
   ### This file is managed via https://git.com.de/LibertaCasa/salt
   ### Manual changes will be overwritten
+
+{%- if grains['os'] == 'SUSE' %}
+zypper:
+  refreshdb_force: False
+{%- endif %}

pillar/common/postfix.sls

@@ -1,26 +0,0 @@
-postfix:
-  master_config:
-    services:
-      smtp:
-        enable: False
-  config:
-    # to-do: set via site config
-    relayhost: zz0.email
-    myhostname: {{ grains['fqdn'] }}
-    inet_interfaces: loopback-only
-    # to-do: support relay via IPv6
-    inet_protocols: ipv4
-    alias_maps: lmdb:/etc/aliases
-    smtpd_use_tls: 'no'
-    smtp_use_tls: 'yes'
-    smtp_tls_security_level: encrypt
-    smtp_tls_wrappermode: 'yes'
-
-  aliases:
-    use_file: false
-    present:
-      admins: 'georg, pratyush'
-      georg: georg@lysergic.dev
-      pratyush: pratyush@lysergic.dev
-      root: 'system, \root'
-      system: system@lysergic.dev

pillar/common/suse.sls

@@ -1,6 +0,0 @@
-include:
-  - .postfix
-
-zypper:
-  refreshdb_force: False
-

pillar/role/salt/master.sls

@@ -1,4 +1,4 @@
-{%- set formulas = ['salt', 'users', 'postfix'] -%}
+{%- set formulas = ['salt', 'users'] -%}
 
 salt:
   interface: ${'secret_salt:master:interface'}

salt/common/postfix.sls

@@ -1,3 +0,0 @@
-include:
-  - postfix
-  - postfix.config

salt/common/suse.sls

@@ -3,7 +3,6 @@ include:
   - profile.zypp
   - profile.node_exporter
   - users
-  - .postfix
 
 {#- to-do: move this to some formula or macro -#}
 {%- set osfullname = grains['osfullname'] -%}