Merge branch 'master' of git.9iron.club:salt/ansible into master

This commit is contained in:
Salt 2020-09-04 07:28:34 -05:00
commit b489ce7ed9
2 changed files with 18 additions and 13 deletions

View File

@ -15,6 +15,17 @@ all:
ssl_protocol: "all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1" ssl_protocol: "all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1"
ssl_cipher_suite: "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256" ssl_cipher_suite: "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256"
user_username: salt user_username: salt
user_password: !vault |
$ANSIBLE_VAULT;1.1;AES256
37666131343936663962386535343939373161343337383436613961303637376136633736353533
3366623536646563383563373265313134663464396231370a303033353661336436386561366139
30393536393634653566646636366436656435623534626266343632313336336336346131383361
3366343932383930350a383637646261373135376138633533306530306339316235353262356135
34626466363266616265653064333365663663306330666632343864373335626265323230633331
33623431633665353964623437636231623366383733626266353162633762373035376638663936
62383065653836366431316461663862393130653761643937376565366435646665313961663534
64303363653631653433343361616635373966326433663466636164613062343561333036613937
35616666633737356331653632323639373330396433366639326466373639313630
children: children:
# Phones # Phones
phone: phone:
@ -23,6 +34,13 @@ all:
ansible_pull_time: "*-*-* 03:00:00" ansible_pull_time: "*-*-* 03:00:00"
aws: aws:
backup_bucket: 9iron-backups-home backup_bucket: 9iron-backups-home
user_password: !vault |
$ANSIBLE_VAULT;1.1;AES256
36643631633432623362613839616530623536653838646162656530336233366262393935363038
3134333763333034303632323265623662366665386563330a623166646364386630373766636330
38643134353035636238653032373837386637353135623034333031616262356135333362393332
3331343631366430660a626461663166646436656265653139633831633231613061313838376264
3962
zerotier_network_id: !vault | zerotier_network_id: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
35646131343239623265663562343333383362366633386462646465643163353866643633636135 35646131343239623265663562343333383362366633386462646465643163353866643633636135

View File

@ -12,19 +12,6 @@
- role: awscreds - role: awscreds
tags: [ common, dns ] tags: [ common, dns ]
- role: base-user - role: base-user
vars:
user_username: salt
user_password: !vault |
$ANSIBLE_VAULT;1.1;AES256
37666131343936663962386535343939373161343337383436613961303637376136633736353533
3366623536646563383563373265313134663464396231370a303033353661336436386561366139
30393536393634653566646636366436656435623534626266343632313336336336346131383361
3366343932383930350a383637646261373135376138633533306530306339316235353262356135
34626466363266616265653064333365663663306330666632343864373335626265323230633331
33623431633665353964623437636231623366383733626266353162633762373035376638663936
62383065653836366431316461663862393130653761643937376565366435646665313961663534
64303363653631653433343361616635373966326433663466636164613062343561333036613937
35616666633737356331653632323639373330396433366639326466373639313630
tags: [ common, user ] tags: [ common, user ]
- hosts: 9iron.club - hosts: 9iron.club
roles: roles: