Merge branch 'master' of https://git.paulbsd.com/paulbsd/paulbsd-salt
This commit is contained in:
commit
e34631a288
@ -15,7 +15,7 @@ event_return: mysql
|
|||||||
|
|
||||||
external_auth:
|
external_auth:
|
||||||
pam:
|
pam:
|
||||||
paul:
|
bob:
|
||||||
- .*
|
- .*
|
||||||
salt:
|
salt:
|
||||||
- .*
|
- .*
|
||||||
@ -58,7 +58,7 @@ etcd_config:
|
|||||||
etcd.host: 127.0.0.1
|
etcd.host: 127.0.0.1
|
||||||
etcd.port: 2379
|
etcd.port: 2379
|
||||||
|
|
||||||
mysql.host: 'scw02-ams.paulbsd.com'
|
mysql.host: 'sys01.paulbsd.com'
|
||||||
mysql.user: 'salt'
|
mysql.user: 'salt'
|
||||||
mysql.pass: ''
|
mysql.pass: ''
|
||||||
mysql.password: ''
|
mysql.password: ''
|
||||||
|
@ -1,17 +1,8 @@
|
|||||||
scw01-ams:
|
sys01:
|
||||||
host: scw01-ams.paulbsd.com
|
host: sys01.paulbsd.com
|
||||||
user: paul
|
|
||||||
sudo: True
|
|
||||||
|
|
||||||
scw02-ams:
|
|
||||||
host: scw02-ams.paulbsd.com
|
|
||||||
user: paul
|
user: paul
|
||||||
|
|
||||||
lxc01:
|
lxc01:
|
||||||
host: lxc01.paulbsd.com
|
host: lxc01.paulbsd.com
|
||||||
user: paul
|
user: paul
|
||||||
sudo: True
|
sudo: True
|
||||||
|
|
||||||
nuc:
|
|
||||||
host: nuc.paulbsd.com
|
|
||||||
user: paul
|
|
||||||
|
Loading…
Reference in New Issue
Block a user