Compare commits

..

3 Commits

Author SHA1 Message Date
b435117808
mta.postfix->global.mta pillar; remove mta profile
Some checks failed
ci/lysergic/push/pipeline Pipeline failed
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>
2023-01-26 20:27:30 +01:00
e93fd5c0a8
Move common to global pillar
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-01-26 20:27:29 +01:00
18e26723dd
Read formulas from central file
- add formulas.yaml file containing list of all enabled formulas
- read formulas from said file in role.salt.master and prepare_minion.py
- add symlink for easier tracking of the file

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-01-26 20:27:29 +01:00

View File

@ -9,10 +9,10 @@ import yaml
roles = roles.get()
grainsfile = '/etc/salt/grains'
idfile = os.path.join('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 = os.path.join('..', 'formulas.yaml')
formulasfile = 'formulas.yaml'
grainsdata = {'roles': roles}
@ -23,14 +23,14 @@ with open(idfile, mode='w') as idfh:
idfh.write('# empty')
with open(formulasfile, mode='r') as formulasfh:
formulas = yaml.load(formulasfh, Loader=FullLoader)
formulas = yaml.load(formulasfh, Loader=yaml.FullLoader)
with open(configfile, mode='w') as configfh:
configfh.write(''''# written by prepare_minion.py
configfh.write('''# written by prepare_minion.py
file_roots:
production:
- /srv/salt
'''
''')
for formula in formulas:
configfh.write(formula)