mta.postfix->global.mta pillar; remove mta profile

This is more a MTA configuration for system email on all hosts instead of
a dedicated email server role.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

bin/prepare_minion.py

@@ -5,13 +5,17 @@ import roles
 import os
 import yaml
 import socket
+import yaml
 
 roles = roles.get()
 grainsfile = '/etc/salt/grains'
-idfile = 'pillar/id/' + socket.gethostname() + '.sls'
+idfile = os.path.join('pillar/id/', socket.gethostname() + '.sls')
 configfile = '/etc/salt/minion.d/local.conf'
 mypwd = os.getcwd()
+formulasfile = 'formulas.yaml'
+formulasdir = '/srv/formulas'
 
+configdata = {'file_roots': {'production': ['/srv/salt']}}
 grainsdata = {'roles': roles}
 
 with open(grainsfile, mode='w') as grainsfh:
@@ -20,16 +24,16 @@ with open(grainsfile, mode='w') as grainsfh:
 with open(idfile, mode='w') as idfh:
 	idfh.write('# empty')
 
-# to-do: include formulas automatically, maybe from some YAML file?
+with open(formulasfile, mode='r') as formulasfh:
+    formulas = yaml.load(formulasfh, Loader=yaml.FullLoader)
+
+for formula in formulas:
+    formula = os.path.join('/srv/formulas/', formula + '-formula')
+    configdata['file_roots']['production'].append(formula)
+
 with open(configfile, mode='w') as configfh:
-    configfh.write('''# written by prepare_minion.py
+    configfh.write('# written by prepare_minion.py\n')
-file_roots:
+    yaml.dump(configdata, configfh)
-  production:
-    - /srv/salt
-    - /srv/formulas/salt-formula
-    - /srv/formulas/users-formula
-    - /srv/formulas/postfix-formula
-''')
 
 os.symlink(mypwd + '/salt', '/srv/salt')
 os.symlink(mypwd + '/pillar', '/srv/pillar')

formulas.yaml

@@ -0,0 +1 @@
+pillar/formulas.yaml

pillar/formulas.yaml

@@ -0,0 +1,3 @@
+- postfix
+- salt
+- users

pillar/global/init.sls

@@ -1,7 +1,7 @@
 include:
   - role.salt.common
   - role.salt.minion
-  - role.mta.postfix
+  - .mta
 
 managed_header_pound: |
   ### This file is managed via https://git.com.de/LibertaCasa/salt

pillar/role/salt/master.sls

@@ -1,4 +1,4 @@
-{%- set formulas = ['salt', 'users', 'postfix'] -%}
+{%- import_yaml 'formulas.yaml' as formulas -%}
 
 include:
   - role.salt.common

pillar/top.sls

@@ -3,7 +3,7 @@
 
 {{ saltenv }}:
   '*':
-    - common
+    - global
   'id:{{ id }}':
     - match: grain
     - ignore_missing: True

salt/common/suse.sls

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

salt/role/mta/postfix.sls

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