Commit 23abc6b0c52898220ea7c1f2c9c39cafe8468825

Authored by Paulo Tada
1 parent 22acd375
Exists in master and in 1 other branch mezuro_spb

Removing mezuro from firewall cookbook and database role

cookbooks/firewall/templates/host-database/iptables-filter.erb
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 # Allow access to PostgreSQL 2 # Allow access to PostgreSQL
3 -A INPUT -s <%= node['peers']['integration'] %> -p tcp -m state --state NEW --dport 5432 -j ACCEPT 3 -A INPUT -s <%= node['peers']['integration'] %> -p tcp -m state --state NEW --dport 5432 -j ACCEPT
4 -A INPUT -s <%= node['peers']['social'] %> -p tcp -m state --state NEW --dport 5432 -j ACCEPT 4 -A INPUT -s <%= node['peers']['social'] %> -p tcp -m state --state NEW --dport 5432 -j ACCEPT
5 -#-A INPUT -s <%= node['peers']['mezuro'] %> -p tcp -m state --state NEW --dport 5432 -j ACCEPT  
6 5
7 # Allow access to Redis 6 # Allow access to Redis
8 -A INPUT -s <%= node['peers']['integration'] %> -p tcp -m state --state NEW --dport 6379 -j ACCEPT 7 -A INPUT -s <%= node['peers']['integration'] %> -p tcp -m state --state NEW --dport 6379 -j ACCEPT
roles/database_server.rb
@@ -5,6 +5,5 @@ run_list *[ @@ -5,6 +5,5 @@ run_list *[
5 'recipe[redis]', 5 'recipe[redis]',
6 'recipe[postgresql::colab]', # must come before the other apps 6 'recipe[postgresql::colab]', # must come before the other apps
7 'recipe[postgresql::noosfero]', 7 'recipe[postgresql::noosfero]',
8 - 'recipe[postgresql::gitlab]',  
9 - 'recipe[postgresql::mezuro]', 8 + 'recipe[postgresql::gitlab]'
10 ] 9 ]
roles/integration_server.rb
@@ -13,5 +13,4 @@ run_list *[ @@ -13,5 +13,4 @@ run_list *[
13 'recipe[colab]', 13 'recipe[colab]',
14 'recipe[colab::nginx]', 14 'recipe[colab::nginx]',
15 'recipe[backup]', 15 'recipe[backup]',
16 - #'recipe[mezuro::prezento]'  
17 ] 16 ]