Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- jabba@JabbaBookPro:~/git/puppet/modules/ldap_crons/templates/groups [master*]> git diff
- diff --git a/modules/ldap_crons/templates/groups/generate_groups_config.py.erb b/modules/ldap_crons/templates/groups/generate_groups_config.py.erb
- index b367420504..0136987a80 100755
- --- a/modules/ldap_crons/templates/groups/generate_groups_config.py.erb
- +++ b/modules/ldap_crons/templates/groups/generate_groups_config.py.erb
- @@ -224,98 +224,89 @@ LDAP_GROUPS = [
- 'search_filter': '(&(objectClass=mozComPerson)(workdayEmployeeType=Contractor)(workdayCompany=Mozilla Foundation)(|(workdayLocation=Austria Remote)(WorkdayLocation=Belgium Remote)(workdayLocation=Berlin Office)(workdayLocation=Czech Replublic Remote)(workdayLocation=Estonia)(workdayLocation=Finland Remote)(workdayLocation=France Remote)(workdayLocation=Germany Remote)(workdayLocation=Greece Remote)(workdayLocation=Ireland Remote)(workdayLocation=Italy Remote)(workdayLocation=London Office)(workdayLocation=Netherlands Remote)(workdayLocation=Norway Remote)(workdayLocation=Poland Remote)(workdayLocation=Regional Paris Office)(workdayLocation=Romania Remote)(workdayLocation=Slovenia Remote)(workdayLocation=Spain Remote)(workdayLocation=Sweden Remote)(workdayLocation=Switzerland Remote)(workdayLocation=United Kingdom Remote)))'
- },
- {
- 'name': 'cn=fr-all@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['fr-all@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(|(workdayCompany=Mz Denmark ApS)(workdayCompany=Mozilla Foundation))(|(workdayLocation=Regional Paris Office)(workdayLocation=France Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=fr-moco@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['fr-moco@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(workdayCompany=Mz Denmark ApS)(|(workdayLocation=Regional Paris Office)(workdayLocation=France Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=fr-mofo@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['fr-mofo@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(workdayCompany=Mozilla Foundation)(|(workdayLocation=Regional Paris Office)(workdayLocation=France Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=uk-all@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['uk-all@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(|(workdayCompany=Mz Denmark ApS)(workdayCompany=Mozilla Foundation))(|(workdayLocation=London Office)(workdayLocation=United Kingdom Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=uk-moco@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['uk-moco@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(workdayCompany=Mz Denmark ApS)(|(workdayLocation=London Office)(workdayLocation=United Kingdom Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=uk-mofo@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['uk-mofo@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(workdayCompany=Mozilla Foundation)(|(workdayLocation=London Office)(workdayLocation=United Kingdom Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=de-all@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['de-all@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(|(workdayCompany=Mz Denmark GmbH)(workdayCompany=Mozilla Foundation))(|(workdayLocation=Berlin Office)(workdayLocation=Germany Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=de-moco@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['de-moco@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(workdayCompany=Mz Denmark GmbH)(|(workdayLocation=Berlin Office)(workdayLocation=Germany Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=de-mofo@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'dc=mozilla',
- 'mail': ['de-mofo@mozilla.com'],
- 'search_filter': '(&(objectClass=mozComPerson)(workdayCompany=Mozilla Foundation)(|(workdayLocation=Berlin Office)(workdayLocation=Germany Remote)))',
- 'always_add_exceptions': [
- - 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla',
- - 'mail=hshah@mozilla.com,o=com,dc=mozilla'
- + 'mail=mkoppitz@mozilla.com,o=com,dc=mozilla'
- ]
- },
- {
- 'name': 'cn=fx-all@mozilla.com,ou=distribution_lists,dc=mozilla',
- 'base': 'o=com,dc=mozilla',
- 'mail': ['fx-all@mozilla.com'],
- 'search_filter': '(&(workdayCostCenter=5*)(!(employeeType=DISABLED)))',
- 'always_add_exceptions': [
Add Comment
Please, Sign In to add comment