Compare commits

..

No commits in common. "570522176a64ae79171689eb3d0858f6338c3662" and "950b3085463d50814d3b343604460939e7ead7a4" have entirely different histories.

2 changed files with 0 additions and 16 deletions

View File

@ -63,18 +63,3 @@ salt:
syndic_user: ${'secret_salt:master:syndic_user'} syndic_user: ${'secret_salt:master:syndic_user'}
cache.redis.unix_socket_path: ${'secret_salt:master:cache.redis.unix_socket_path'} cache.redis.unix_socket_path: ${'secret_salt:master:cache.redis.unix_socket_path'}
cache.redis.password: ${'secret_salt:master:cache.redis.password'} cache.redis.password: ${'secret_salt:master:cache.redis.password'}
rest_tornado:
port: 4550
ssl_crt: ${'secret_salt:master:rest_tornado:ssl_crt'}
ssl_key: ${'secret_salt:master:rest_tornado:ssl_key'}
auth.ldap.server: ${'secret_salt:master:auth.ldap.server'}
auth.ldap.port: ${'secret_salt:master:auth.ldap.port'}
auth.ldap.tls: True
auth.ldap.scope: 0
auth.ldap.accountattributename: ${'secret_salt:master:auth.ldap.accountattributename'}
auth.ldap.groupou: ${'secret_salt:master:auth.ldap.groupou'}
auth.ldap.groupclass: ${'secret_salt:master:auth.ldap.groupclass'}
auth.ldap.basedn: ${'secret_salt:master:auth.ldap.basedn'}
auth.ldap.binddn: ${'secret_salt:master:auth.ldap.binddn'}
auth.ldap.bindpw: ${'secret_salt:master:auth.ldap.bindpw'}
auth.ldap.filter: ${'secret_salt:master:auth.ldap.filter'}

View File

@ -1,3 +1,2 @@
include: include:
- profile.salt.master - profile.salt.master
- salt.api