Merge branch 'howlermonkey' of https://github.com/DICE-UNC/DE into ho…

…wlermonkey
DICE-UNC · Mar 4, 2016 · 232dd3d · 232dd3d
2 parents 149b11d + 212b1a3
commit 232dd3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/ansible/roles/grouper/tasks/main.yaml b/ansible/roles/grouper/tasks/main.yaml
@@ -8,6 +8,7 @@
   postgresql_user: login_host={{db_host}} login_user={{db_admin}} login_password={{db_admin_password}} state=present
         name={{grouper.db.user}} password={{grouper.db.pass}} role_attr_flags=CREATEDB,NOCREATEROLE,NOCREATEUSER
   sudo: yes
+  ignore_errors: yes
 
 - name: ensure that postgresql db exists
   postgresql_db: login_host={{db_host}} login_user={{db_admin}} login_password={{db_admin_password}}

diff --git a/ansible/roles/iptables/templates/iptables.j2 b/ansible/roles/iptables/templates/iptables.j2
@@ -176,6 +176,11 @@
 -A INPUT -m state --state NEW -m tcp -p tcp -s {{ net.wifi }} --dport 443 -j ACCEPT
 {% endif %}
 
+{% if inventory_hostname in groups['ldap'] %}
+-A INPUT -m state --state NEW -m tcp -p tcp -s 172.0.0.0/8 --dport 389 -j ACCEPT
+-A INPUT -m state --state NEW -m tcp -p tcp -s 152.54.0.0/16 --dport 389 -j ACCEPT
+{% endif %}
+
 -A INPUT -j REJECT --reject-with icmp-host-prohibited
 -A FORWARD -j REJECT --reject-with icmp-host-prohibited
 COMMIT
diff --git a/tools/sharkbait/resources/grouper.client.properties b/tools/sharkbait/resources/grouper.client.properties
@@ -13,4 +13,4 @@
 ## LDAP connection settings
 ########################################
 
-grouperClient.config.hierarchy = classpath:grouper.client.base.properties, classpath:grouper.client.properties, file:/etc/grouper/client.properties
+grouperClient.config.hierarchy = classpath:grouper.client.base.properties, classpath:grouper.client.properties