diff options
| author | B Stack <bgstack15@gmail.com> | 2016-10-03 11:44:27 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2016-10-03 11:44:27 -0400 |
| commit | e324d7d4f98440b1bcd4c7526658543f9973dd32 (patch) | |
| tree | bda7398efa4136df5f113daf0b8029ba171a5c48 /test.yml | |
| parent | added sudo (diff) | |
| parent | major overhaul (diff) | |
| download | ansible01-e324d7d4f98440b1bcd4c7526658543f9973dd32.tar.gz ansible01-e324d7d4f98440b1bcd4c7526658543f9973dd32.tar.bz2 ansible01-e324d7d4f98440b1bcd4c7526658543f9973dd32.zip | |
Merge https://github.com/bgstack15/ansible01
Conflicts:
test.yml
Diffstat (limited to 'test.yml')
| -rw-r--r-- | test.yml | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -5,8 +5,16 @@ roles: - sudo vars: +<<<<<<< HEAD sudo_strings: - { priority: 42, exists: 'false', name: 'admins-do-all', content: 'User_Alias ADMINS = bgstack15, bgstack15, user16, user16' } - { priority: 43, exists: false, name: 'a', content: "ADMINS ALL=(ALL) ALL" } sudo_files: - { exists: 'false', file: '../../../company/sudo-files/40_bgstack15' } +======= + sudo_strings + - { priority: 40, name: 'admins-do-all', content: 'User_Alias ADMINS = bgstack15, bgstack15, user16, user16' } + - { priority: 41, name: 'a', content: 'ADMINS ALL=(ALL) ALL' } + sudo_files + - { file: '../../../company/sudo-files/40_bgstack15' } +>>>>>>> 4db266d0ec2f78079c8ff271cdb2e78230d3b090 |