Compare commits

..

3 Commits

Author SHA1 Message Date
f949c0aba0
mta.postfix->global.mta pillar; remove mta profile
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
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:54:09 +01:00
56a1e11ef6
Move common to global pillar
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-01-26 20:54:09 +01:00
d627582075
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:54:09 +01:00

View File

@ -13,7 +13,9 @@ 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:
@ -25,14 +27,13 @@ with open(idfile, mode='w') as idfh:
with open(formulasfile, mode='r') as formulasfh:
formulas = yaml.load(formulasfh, Loader=yaml.FullLoader)
with open(configfile, mode='w') as configfh:
configfh.write('''# written by prepare_minion.py
file_roots:
production:
- /srv/salt
''')
for formula in formulas:
configfh.write(formula)
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\n')
yaml.dump(configdata, configfh)
os.symlink(mypwd + '/salt', '/srv/salt')
os.symlink(mypwd + '/pillar', '/srv/pillar')