From 49aef0810a4c953f3aa34af95b00ca9dd9b5f5d0 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 3 Oct 2016 12:22:55 -0400 Subject: Fixed filename export process in scrub.py --- company/ad-templates/sssd.conf.CentOS | 2 +- company/ad-templates/sssd.conf.FreeBSD | 2 +- company/ad-templates/sssd.conf.Ubuntu | 2 +- company/ad-vars/FreeBSD.yml | 2 +- company/fail2ban-files/filter.d/20_bju-blns.filter | 32 ---------------------- .../fail2ban-files/filter.d/20_example-blns.filter | 32 ++++++++++++++++++++++ company/fail2ban-files/filter.d/30_bju-max3.filter | 13 --------- .../fail2ban-files/filter.d/30_example-max3.filter | 13 +++++++++ company/fail2ban-files/jail.d/20_bju-blns.jail | 21 -------------- company/fail2ban-files/jail.d/20_example-blns.jail | 21 ++++++++++++++ company/fail2ban-files/jail.d/30_bju-max3.jail | 21 -------------- company/fail2ban-files/jail.d/30_example-max3.jail | 21 ++++++++++++++ company/pubkeys/bgirton.pubkeys | 3 -- company/pubkeys/bgstack15.pubkeys | 3 ++ company/pubkeys/lcroce.pubkey | 1 - company/pubkeys/user16.pubkey | 1 + company/sudo-files/40_BGIRTON | 2 -- company/sudo-files/40_BGSTACK15 | 2 ++ inc/localize_git.sh | 2 +- inc/scrub.py | 18 ++++++++++-- inc/scrub.txt | 10 +++---- roles/sudo/tests/test.yml | 4 +-- test.yml | 4 +-- 23 files changed, 122 insertions(+), 110 deletions(-) delete mode 100644 company/fail2ban-files/filter.d/20_bju-blns.filter create mode 100644 company/fail2ban-files/filter.d/20_example-blns.filter delete mode 100644 company/fail2ban-files/filter.d/30_bju-max3.filter create mode 100644 company/fail2ban-files/filter.d/30_example-max3.filter delete mode 100644 company/fail2ban-files/jail.d/20_bju-blns.jail create mode 100644 company/fail2ban-files/jail.d/20_example-blns.jail delete mode 100644 company/fail2ban-files/jail.d/30_bju-max3.jail create mode 100644 company/fail2ban-files/jail.d/30_example-max3.jail delete mode 100644 company/pubkeys/bgirton.pubkeys create mode 100644 company/pubkeys/bgstack15.pubkeys delete mode 100644 company/pubkeys/lcroce.pubkey create mode 100644 company/pubkeys/user16.pubkey delete mode 100644 company/sudo-files/40_BGIRTON create mode 100644 company/sudo-files/40_BGSTACK15 diff --git a/company/ad-templates/sssd.conf.CentOS b/company/ad-templates/sssd.conf.CentOS index dafb287..e6ce4b4 100644 --- a/company/ad-templates/sssd.conf.CentOS +++ b/company/ad-templates/sssd.conf.CentOS @@ -36,7 +36,7 @@ use_fully_qualified_names = False fallback_homedir = /home/%d/%u access_provider = ad ad_access_filter = (&(memberOf=CN=Linux-Server-Access_grp,OU=Linux-Access,OU=Accounts-Groups,DC=example,DC=com)(unixHomeDirectory=*)) -simple_allow_users = bgstack15, bgstack15, user16, user16 +simple_allow_users = Bgstack15, bgstack15, User16, user16 case_sensitive = true ad_gpo_access_control = disabled [autofs] diff --git a/company/ad-templates/sssd.conf.FreeBSD b/company/ad-templates/sssd.conf.FreeBSD index 9add0ed..2be88fe 100644 --- a/company/ad-templates/sssd.conf.FreeBSD +++ b/company/ad-templates/sssd.conf.FreeBSD @@ -36,6 +36,6 @@ use_fully_qualified_names = False fallback_homedir = /home/%d/%u access_provider = ad ad_access_filter = (&(memberOf=CN=Linux-Server-Access_grp,OU=Linux-Access,OU=Accounts-Groups,DC=example,DC=com)(unixHomeDirectory=*)) -simple_allow_users = bgstack15, bgstack15, user16, user16 +simple_allow_users = Bgstack15, bgstack15, User16, user16 case_sensitive = true ad_gpo_access_control = disabled diff --git a/company/ad-templates/sssd.conf.Ubuntu b/company/ad-templates/sssd.conf.Ubuntu index 7b7dae3..c47a466 100644 --- a/company/ad-templates/sssd.conf.Ubuntu +++ b/company/ad-templates/sssd.conf.Ubuntu @@ -36,7 +36,7 @@ use_fully_qualified_names = False fallback_homedir = /home/%d/%u access_provider = ad ad_access_filter = (&(memberOf=CN=Linux-Server-Access_grp,OU=Linux-Access,OU=Accounts-Groups,DC=example,DC=com)(unixHomeDirectory=*)) -simple_allow_users = bgstack15, bgstack15, user16, user16 +simple_allow_users = Bgstack15, bgstack15, User16, user16 case_sensitive = true ad_gpo_access_control = disabled [autofs] diff --git a/company/ad-vars/FreeBSD.yml b/company/ad-vars/FreeBSD.yml index 77e2a9c..7777099 100644 --- a/company/ad-vars/FreeBSD.yml +++ b/company/ad-vars/FreeBSD.yml @@ -1,4 +1,4 @@ --- sssd_dir: /usr/local/etc/sssd ad_access_filter: (&(memberOf=CN=Linux-Server-Access_grp,OU=Linux-Access,OU=Accounts-Groups,DC=example,DC=com)(unixHomeDirectory=*)) -simple_allow_users: bgstack15, bgstack15, bgstack15-local +simple_allow_users: Bgstack15, bgstack15, bgstack15-local diff --git a/company/fail2ban-files/filter.d/20_bju-blns.filter b/company/fail2ban-files/filter.d/20_bju-blns.filter deleted file mode 100644 index c39cefa..0000000 --- a/company/fail2ban-files/filter.d/20_bju-blns.filter +++ /dev/null @@ -1,32 +0,0 @@ -# Ansible controlled filename: /etc/fail2ban/filter.d/20_example-blns.filter -# Source: ansible bgstack15-fail2ban/files/example-blns.filter -# Date: 2016-04-19 -# Reference: -# NOTE: This file is managed via Ansible: manual changes will be lost - -[Definition] -failregex = ^.*.*(GET|POST).*/etc/passwd.*$ - ^.*.*(GET|POST).*/etc/group.*$ - ^.*.*(GET|POST).*/etc/hosts.*$ - ^.*.*(GET|POST).*/proc/self/environ.*$ - ^.*.*(GET|POST).*(?i)admin.*admin.*$ - ^.*.*(GET|POST).*(?i)(php|db|pma|web|sql).*admin.*$ - ^.*.*(GET|POST).*(?i)admin.*(php|db|pma|web|sql).*$ - ^.*.*(GET|POST).*(?i)DELETE_comment.*$ - ^.*.*(GET|POST).*(?i)pma/scripts.*setup.*$ - ^.*.*(GET|POST).*(?i)pma([0-9]{4})?/? HTTP.*$ - ^.*.*(GET|POST).*(?i)(database|myadmin|mysql)/? HTTP.*$ - ^.*.*(GET|POST).*(?i)(dbweb|webdb|websql|sqlweb).*$ - ^.*.*(GET|POST).*(?i)(my)?sql.*manager.*$ - ^.*.*(GET|POST).*(?i)wp-(admin|login|signup|config).*$ - ^.*.*(GET|POST).*president/.*wp-cron\.php*$ - ^.*.*(GET|POST).*w00t.*blackhats.*$ - ^.*.*(GET|POST).*\+\+liker.profile_URL\+\+.*$ - ^.*.*(GET|POST).*muieblackcat.*$ - ^.*.*(GET|POST).*(?i)ldlogon.*$ - ^.*.*(GET|POST).*(?i)\.cobalt$ - ^.*.*(GET|POST).*(?i)\.intruvert\/jsp\/admin\/Login\.jsp$ - ^.*.*(GET|POST).*(?i)MSWSMTP\/Common\/Authentication\/Logon\.aspx$ - ^.*.*(GET|POST).*(?i)php\?password=[0-9]*\&re_password=.*\&login=var.*$ - -ignoreregex = diff --git a/company/fail2ban-files/filter.d/20_example-blns.filter b/company/fail2ban-files/filter.d/20_example-blns.filter new file mode 100644 index 0000000..c39cefa --- /dev/null +++ b/company/fail2ban-files/filter.d/20_example-blns.filter @@ -0,0 +1,32 @@ +# Ansible controlled filename: /etc/fail2ban/filter.d/20_example-blns.filter +# Source: ansible bgstack15-fail2ban/files/example-blns.filter +# Date: 2016-04-19 +# Reference: +# NOTE: This file is managed via Ansible: manual changes will be lost + +[Definition] +failregex = ^.*.*(GET|POST).*/etc/passwd.*$ + ^.*.*(GET|POST).*/etc/group.*$ + ^.*.*(GET|POST).*/etc/hosts.*$ + ^.*.*(GET|POST).*/proc/self/environ.*$ + ^.*.*(GET|POST).*(?i)admin.*admin.*$ + ^.*.*(GET|POST).*(?i)(php|db|pma|web|sql).*admin.*$ + ^.*.*(GET|POST).*(?i)admin.*(php|db|pma|web|sql).*$ + ^.*.*(GET|POST).*(?i)DELETE_comment.*$ + ^.*.*(GET|POST).*(?i)pma/scripts.*setup.*$ + ^.*.*(GET|POST).*(?i)pma([0-9]{4})?/? HTTP.*$ + ^.*.*(GET|POST).*(?i)(database|myadmin|mysql)/? HTTP.*$ + ^.*.*(GET|POST).*(?i)(dbweb|webdb|websql|sqlweb).*$ + ^.*.*(GET|POST).*(?i)(my)?sql.*manager.*$ + ^.*.*(GET|POST).*(?i)wp-(admin|login|signup|config).*$ + ^.*.*(GET|POST).*president/.*wp-cron\.php*$ + ^.*.*(GET|POST).*w00t.*blackhats.*$ + ^.*.*(GET|POST).*\+\+liker.profile_URL\+\+.*$ + ^.*.*(GET|POST).*muieblackcat.*$ + ^.*.*(GET|POST).*(?i)ldlogon.*$ + ^.*.*(GET|POST).*(?i)\.cobalt$ + ^.*.*(GET|POST).*(?i)\.intruvert\/jsp\/admin\/Login\.jsp$ + ^.*.*(GET|POST).*(?i)MSWSMTP\/Common\/Authentication\/Logon\.aspx$ + ^.*.*(GET|POST).*(?i)php\?password=[0-9]*\&re_password=.*\&login=var.*$ + +ignoreregex = diff --git a/company/fail2ban-files/filter.d/30_bju-max3.filter b/company/fail2ban-files/filter.d/30_bju-max3.filter deleted file mode 100644 index af692af..0000000 --- a/company/fail2ban-files/filter.d/30_bju-max3.filter +++ /dev/null @@ -1,13 +0,0 @@ -# Ansible controlled filename: /etc/fail2ban/filter.d/30_example-max3.filter -# Source: ansible bgstack15-fail2ban/files/example-max3.filter -# Date: 2016-07-12 -# Reference: example-blns.filter -# NOTE: This file is managed via Ansible: manual changes will be lost - -[Definition] -failregex = ^.*.*(GET|POST).*(?i)\.cobalt$ - ^.*.*(GET|POST).*(?i)\.intruvert\/jsp\/admin\/Login\.jsp$ - ^.*.*(GET|POST).*(?i)MSWSMTP\/Common\/Authentication\/Logon\.aspx$ - ^.*.*(GET|POST).*(?i)php\?password=[0-9]*\&re_password=.*\&login=var.*$ - -ignoreregex = diff --git a/company/fail2ban-files/filter.d/30_example-max3.filter b/company/fail2ban-files/filter.d/30_example-max3.filter new file mode 100644 index 0000000..af692af --- /dev/null +++ b/company/fail2ban-files/filter.d/30_example-max3.filter @@ -0,0 +1,13 @@ +# Ansible controlled filename: /etc/fail2ban/filter.d/30_example-max3.filter +# Source: ansible bgstack15-fail2ban/files/example-max3.filter +# Date: 2016-07-12 +# Reference: example-blns.filter +# NOTE: This file is managed via Ansible: manual changes will be lost + +[Definition] +failregex = ^.*.*(GET|POST).*(?i)\.cobalt$ + ^.*.*(GET|POST).*(?i)\.intruvert\/jsp\/admin\/Login\.jsp$ + ^.*.*(GET|POST).*(?i)MSWSMTP\/Common\/Authentication\/Logon\.aspx$ + ^.*.*(GET|POST).*(?i)php\?password=[0-9]*\&re_password=.*\&login=var.*$ + +ignoreregex = diff --git a/company/fail2ban-files/jail.d/20_bju-blns.jail b/company/fail2ban-files/jail.d/20_bju-blns.jail deleted file mode 100644 index eb1d1c9..0000000 --- a/company/fail2ban-files/jail.d/20_bju-blns.jail +++ /dev/null @@ -1,21 +0,0 @@ -# Ansible controlled filename: /etc/fail2ban/jail.d/20_example-blns.jail -# Source: ansible bgstack15-fail2ban/files/example-blns.jail -# Date: 2016-04-19 -# Reference: -# NOTE: This file is managed via Ansible: manual changes will be lost - -[example-blns] -enabled = true -action = iptables-allports - sendmail[name=exampleblns, dest=linuxadmin@example.com] -filter = 20_example-blns -logpath = /var/log/httpd/access_log - /var/log/httpd/error_log - /var/log/httpd/ssl_access_log - /var/log/httpd/ssl_error_log - /var/log/apache2/access_log - /var/log/apache2/error_log - /var/log/apache2/ssl_access_log - /var/log/apache2/ssl_error_log -maxretry = 1 -bantime = 86400 diff --git a/company/fail2ban-files/jail.d/20_example-blns.jail b/company/fail2ban-files/jail.d/20_example-blns.jail new file mode 100644 index 0000000..eb1d1c9 --- /dev/null +++ b/company/fail2ban-files/jail.d/20_example-blns.jail @@ -0,0 +1,21 @@ +# Ansible controlled filename: /etc/fail2ban/jail.d/20_example-blns.jail +# Source: ansible bgstack15-fail2ban/files/example-blns.jail +# Date: 2016-04-19 +# Reference: +# NOTE: This file is managed via Ansible: manual changes will be lost + +[example-blns] +enabled = true +action = iptables-allports + sendmail[name=exampleblns, dest=linuxadmin@example.com] +filter = 20_example-blns +logpath = /var/log/httpd/access_log + /var/log/httpd/error_log + /var/log/httpd/ssl_access_log + /var/log/httpd/ssl_error_log + /var/log/apache2/access_log + /var/log/apache2/error_log + /var/log/apache2/ssl_access_log + /var/log/apache2/ssl_error_log +maxretry = 1 +bantime = 86400 diff --git a/company/fail2ban-files/jail.d/30_bju-max3.jail b/company/fail2ban-files/jail.d/30_bju-max3.jail deleted file mode 100644 index 6ca7781..0000000 --- a/company/fail2ban-files/jail.d/30_bju-max3.jail +++ /dev/null @@ -1,21 +0,0 @@ -# Ansible controlled filename: /etc/fail2ban/jail.d/30_example-max3.jail -# Source: ansible bgstack15-fail2ban/files/example-max3.jail -# Date: 2016-07-12 -# Reference: example-blns.jail -# NOTE: This file is managed via Ansible: manual changes will be lost - -[example-max3] -enabled = true -action = iptables-allports - sendmail[name=examplemax3, dest=linuxadmin@example.com] -filter = 30_example-max3 -logpath = /var/log/httpd/access_log - /var/log/httpd/error_log - /var/log/httpd/ssl_access_log - /var/log/httpd/ssl_error_log - /var/log/apache2/access_log - /var/log/apache2/error_log - /var/log/apache2/ssl_access_log - /var/log/apache2/ssl_error_log -maxretry = 3 -bantime = 86400 diff --git a/company/fail2ban-files/jail.d/30_example-max3.jail b/company/fail2ban-files/jail.d/30_example-max3.jail new file mode 100644 index 0000000..6ca7781 --- /dev/null +++ b/company/fail2ban-files/jail.d/30_example-max3.jail @@ -0,0 +1,21 @@ +# Ansible controlled filename: /etc/fail2ban/jail.d/30_example-max3.jail +# Source: ansible bgstack15-fail2ban/files/example-max3.jail +# Date: 2016-07-12 +# Reference: example-blns.jail +# NOTE: This file is managed via Ansible: manual changes will be lost + +[example-max3] +enabled = true +action = iptables-allports + sendmail[name=examplemax3, dest=linuxadmin@example.com] +filter = 30_example-max3 +logpath = /var/log/httpd/access_log + /var/log/httpd/error_log + /var/log/httpd/ssl_access_log + /var/log/httpd/ssl_error_log + /var/log/apache2/access_log + /var/log/apache2/error_log + /var/log/apache2/ssl_access_log + /var/log/apache2/ssl_error_log +maxretry = 3 +bantime = 86400 diff --git a/company/pubkeys/bgirton.pubkeys b/company/pubkeys/bgirton.pubkeys deleted file mode 100644 index 85abeb0..0000000 --- a/company/pubkeys/bgirton.pubkeys +++ /dev/null @@ -1,3 +0,0 @@ -# version 3.0 -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDG8xc7BV1xCcKrzQvQwDhAAX6uDne5lSpgCURg4Vx8Au8fsaiFSVlCky+OOQAJipgucG0QBPiL60sNNsY03sKIAh7TMKsoUZuQ5sJM6EpyKGEYaOKFXjaShDFMtdvwGIANh/e86qpVGRkje+p8fvNxbHOXsQpYF+HpAv8u/HbaQQYtdkWaeR6nIO8LXWOapgO7t5pMdRQJa67+4Yyc7IQQM66WMXX5Ik3nGMMHog2PgrpTtaEdKOV2TzSynLBlp3UmOkLa4D0euvMsTwjTmqeORfCMVyVeYwHhZoz4V99L1aYCeI1jDwhD5GEf/DKOhMNVsw7OhqTSfVz3sYGbq0or bgstack15@aluminum.example.com -ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAgURLzjIKMmN0Aq8YZTQp1N/6GMEuEs8WeOx2eg/lEXEFTxIQMMKYXxPDgzp2QLCQuuzgKOXBKw7KtnxtqTkmlAUWMDExSd7U1q/vZnDIubUFzZKbORJHWUOrI4Os/r9GPmnFro8kMCYjvmkUWIO82+JQHFBunICJcGKPJutcbSU= rsa-key-20130722 diff --git a/company/pubkeys/bgstack15.pubkeys b/company/pubkeys/bgstack15.pubkeys new file mode 100644 index 0000000..85abeb0 --- /dev/null +++ b/company/pubkeys/bgstack15.pubkeys @@ -0,0 +1,3 @@ +# version 3.0 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDG8xc7BV1xCcKrzQvQwDhAAX6uDne5lSpgCURg4Vx8Au8fsaiFSVlCky+OOQAJipgucG0QBPiL60sNNsY03sKIAh7TMKsoUZuQ5sJM6EpyKGEYaOKFXjaShDFMtdvwGIANh/e86qpVGRkje+p8fvNxbHOXsQpYF+HpAv8u/HbaQQYtdkWaeR6nIO8LXWOapgO7t5pMdRQJa67+4Yyc7IQQM66WMXX5Ik3nGMMHog2PgrpTtaEdKOV2TzSynLBlp3UmOkLa4D0euvMsTwjTmqeORfCMVyVeYwHhZoz4V99L1aYCeI1jDwhD5GEf/DKOhMNVsw7OhqTSfVz3sYGbq0or bgstack15@aluminum.example.com +ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAgURLzjIKMmN0Aq8YZTQp1N/6GMEuEs8WeOx2eg/lEXEFTxIQMMKYXxPDgzp2QLCQuuzgKOXBKw7KtnxtqTkmlAUWMDExSd7U1q/vZnDIubUFzZKbORJHWUOrI4Os/r9GPmnFro8kMCYjvmkUWIO82+JQHFBunICJcGKPJutcbSU= rsa-key-20130722 diff --git a/company/pubkeys/lcroce.pubkey b/company/pubkeys/lcroce.pubkey deleted file mode 100644 index 8ed442d..0000000 --- a/company/pubkeys/lcroce.pubkey +++ /dev/null @@ -1 +0,0 @@ -FOO 2016-09-22 08:49 this is the contents of user16.pubkey diff --git a/company/pubkeys/user16.pubkey b/company/pubkeys/user16.pubkey new file mode 100644 index 0000000..8ed442d --- /dev/null +++ b/company/pubkeys/user16.pubkey @@ -0,0 +1 @@ +FOO 2016-09-22 08:49 this is the contents of user16.pubkey diff --git a/company/sudo-files/40_BGIRTON b/company/sudo-files/40_BGIRTON deleted file mode 100644 index 5e27584..0000000 --- a/company/sudo-files/40_BGIRTON +++ /dev/null @@ -1,2 +0,0 @@ -User_Alias bgstack15 = bgstack15, bgstack15, bgstack15-local -bgstack15 ALL=(ALL) NOPASSWD: ALL diff --git a/company/sudo-files/40_BGSTACK15 b/company/sudo-files/40_BGSTACK15 new file mode 100644 index 0000000..efd3f9c --- /dev/null +++ b/company/sudo-files/40_BGSTACK15 @@ -0,0 +1,2 @@ +User_Alias BGSTACK15 = Bgstack15, bgstack15, bgstack15-local +BGSTACK15 ALL=(ALL) NOPASSWD: ALL diff --git a/inc/localize_git.sh b/inc/localize_git.sh index 7dd2381..99ae4af 100755 --- a/inc/localize_git.sh +++ b/inc/localize_git.sh @@ -1,2 +1,2 @@ #!/bin/sh -\cp -pRf /home/bgstack15/ansible.clean/.git /etc/ansible +\cp -pRf /home/work/ansible.clean/.git /etc/ansible diff --git a/inc/scrub.py b/inc/scrub.py index a0e9c70..aafc295 100755 --- a/inc/scrub.py +++ b/inc/scrub.py @@ -6,7 +6,8 @@ # Title: Script that Simultaneously Copies and Scrubs a Directory # Purpose: Prepare projects for publication by removing private information like usernames and hostnames # Package: Various -# History: +# History: +# 2016-10-03 working on batch rename files # Usage: # Store this file with any package that gets published. Adjust scrub.txt in local directory. # # First line: source directory Second line: target directory. WILL BE OVERWRITTEN! @@ -21,16 +22,17 @@ # http://stackoverflow.com/questions/6584871/remove-last-character-if-its-a-backslash/6584893#6584893 # http://stackoverflow.com/questions/2212643/python-recursive-folder-read/2212728#2212728 # parallel lists: http://stackoverflow.com/questions/1663807/how-can-i-iterate-through-two-lists-in-parallel-in-python +# file renames http://stackoverflow.com/questions/225735/batch-renaming-of-files-in-a-directory/7917798#7917798 # Improve: # Add option to specify scrub file # Add exclude option to scrub file, such as .git and so on # Accept CLI options like source, destination, even exclusions? -# Also change filenames +# Add flag for performing file renames as well, or file renames only import re, shlex, os, sys, shutil from pathlib import Path # scrubpy version -scrubpyversion = "2016-09-29b" +scrubpyversion = "2016-10-03a" # Define functions @@ -107,3 +109,13 @@ for rootfolder, subdirs, files in os.walk(thisdir): data = data.replace(oldword,newword) changed = data target.write(changed) + +# Execute file renames +# Used "file renames" reference, as well as the structure of directory traversal used earlier, which was from a different source. +for rootfolder, subdirs, files in os.walk(newdir): + for filename in files: + oldpath = os.path.join(rootfolder, filename) + for oldword, newword in zip(oldstrings, newstrings): + if oldword in oldpath: + #print("oldword=" + oldword + "\toldpath=" + oldpath) + os.rename(oldpath, oldpath.replace(oldword,newword)) diff --git a/inc/scrub.txt b/inc/scrub.txt index 13922bb..160433e 100644 --- a/inc/scrub.txt +++ b/inc/scrub.txt @@ -1,12 +1,12 @@ # First line: source directory Second line: target directory. WILL BE OVERWRITTEN! /etc/ansible -/home/bgstack15/ansible.clean +/home/work/ansible.clean # Rest of the lines are "OLD WORD" "NEW WORD" +BGSTACK15 BGSTACK15 +Bgstack15 Bgstack15 bgstack15 bgstack15 -bgstack15 bgstack15 -bgstack15 bgstack15 -user16 user16 -user16 user16 +USER16 USER16 +User16 User16 user16 user16 example example EXAMPLE EXAMPLE diff --git a/roles/sudo/tests/test.yml b/roles/sudo/tests/test.yml index e15f798..f170ffd 100644 --- a/roles/sudo/tests/test.yml +++ b/roles/sudo/tests/test.yml @@ -6,7 +6,7 @@ - sudo vars: sudo_strings: - - { priority: 42, exists: 'false', name: 'admins-do-all', content: 'User_Alias ADMINS = bgstack15, bgstack15, user16, user16' } + - { 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' } + - { exists: 'false', file: '../../../company/sudo-files/40_BGSTACK15' } diff --git a/test.yml b/test.yml index e15f798..f170ffd 100644 --- a/test.yml +++ b/test.yml @@ -6,7 +6,7 @@ - sudo vars: sudo_strings: - - { priority: 42, exists: 'false', name: 'admins-do-all', content: 'User_Alias ADMINS = bgstack15, bgstack15, user16, user16' } + - { 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' } + - { exists: 'false', file: '../../../company/sudo-files/40_BGSTACK15' } -- cgit