summaryrefslogtreecommitdiffstats
path: root/pillar/role/salt
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-28 00:07:49 +0100
committerGeorg Pfuetzenreuter2023-01-28 00:17:39 +0100
commita831a25701b015f222069258d957c14661da5514 (patch)
treef67abedad9b7932c85d8f76baab866edb1b47048 /pillar/role/salt
parentf4b253a1cf9c97b88ea412e265c94042774029df (diff)
downloadsalt-a831a25701b015f222069258d957c14661da5514.tar.gz
salt-a831a25701b015f222069258d957c14661da5514.tar.bz2
salt-a831a25701b015f222069258d957c14661da5514.zip
salt.master: switch to CherryPy
Tornado does not support all the features. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Diffstat (limited to 'pillar/role/salt')
-rw-r--r--pillar/role/salt/master.sls6
1 files changed, 3 insertions, 3 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
index 6e39421..058992b 100644
--- a/pillar/role/salt/master.sls
+++ b/pillar/role/salt/master.sls
@@ -63,10 +63,10 @@ salt:
syndic_user: ${'secret_salt:master:syndic_user'}
cache.redis.unix_socket_path: ${'secret_salt:master:cache.redis.unix_socket_path'}
cache.redis.password: ${'secret_salt:master:cache.redis.password'}
- rest_tornado:
+ rest_cherrypy:
port: 4550
- ssl_crt: ${'secret_salt:master:rest_tornado:ssl_crt'}
- ssl_key: ${'secret_salt:master:rest_tornado:ssl_key'}
+ ssl_crt: ${'secret_salt:master:rest_cherrypy:ssl_crt'}
+ ssl_key: ${'secret_salt:master:rest_cherrypy:ssl_key'}
auth.ldap.server: ${'secret_salt:master:auth.ldap.server'}
auth.ldap.port: ${'secret_salt:master:auth.ldap.port'}
auth.ldap.tls: True