Download as
Browse Code »

Commit 45e692fcf9c175fc97a92a2e29f991824ce6164d

Authored by Paulo Tada
1 parent 23abc6b0
Exists in mezuro_spb

Redoing all mezuro configurations

Showing 7 changed files with 23 additions and 17 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @45e692f
... ... @@ -173,7 +173,6 @@ template '/etc/colab/plugins.d/mezuro.py' do
173 173 owner 'root'
174 174 group 'colab'
175 175 mode 0640
176   - action :delete
177 176 notifies :restart, 'service[colab]'
178 177 end
179 178  
... ...
cookbooks/colab/templates/mezuro.py.erb
  Diff comments   View file @45e692f
... ... @@ -5,7 +5,7 @@ name = 'colab_mezuro'
5 5 verbose_name = 'Mezuro Plugin'
6 6  
7 7 upstream = 'http://<%= node['peers']['integration'] %>:84/mezuro/'
8   -#middlewares = []
  8 +middlewares = []
9 9 extra = {'processor_address' : 'http://<%= node['peers']['mezuro'] %>:82' ,
10 10 'configurations_address' : 'http://<%= node['peers']['mezuro'] %>:83'}
11 11  
... ... @@ -14,19 +14,19 @@ urls = {
14 14 'prefix': '^mezuro/',
15 15 }
16 16  
17   -#menu_title = _('Code Quality')
  17 +menu_title = _('Code Quality')
18 18  
19 19 url = colab_url_factory('mezuro')
20 20  
21   -#menu_urls = (
22   -# url(display=_('Projects'), viewname='mezuro',
23   -# kwargs={'path': 'projects'}, auth=False),
24   -# url(display=_('Repositories'), viewname='mezuro',
25   -# kwargs={'path': 'repositories'}, auth=False),
26   -# url(display=_('Configurations'), viewname='mezuro',
27   -# kwargs={'path': 'kalibro_configurations'}, auth=False),
28   -# url(display=_('Reading Groups'), viewname='mezuro',
29   -# kwargs={'path': 'reading_groups'}, auth=False),
30   -#)
  21 +menu_urls = (
  22 + url(display=_('Projects'), viewname='mezuro',
  23 + kwargs={'path': 'projects'}, auth=False),
  24 + url(display=_('Repositories'), viewname='mezuro',
  25 + kwargs={'path': 'repositories'}, auth=False),
  26 + url(display=_('Configurations'), viewname='mezuro',
  27 + kwargs={'path': 'kalibro_configurations'}, auth=False),
  28 + url(display=_('Reading Groups'), viewname='mezuro',
  29 + kwargs={'path': 'reading_groups'}, auth=False),
  30 +)
31 31  
32 32 change_header = True
... ...
cookbooks/firewall/templates/host-database/iptables-filter.erb
  Diff comments   View file @45e692f
... ... @@ -2,6 +2,7 @@
2 2 # Allow access to PostgreSQL
3 3 -A INPUT -s <%= node['peers']['integration'] %> -p tcp -m state --state NEW --dport 5432 -j ACCEPT
4 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
5 6  
6 7 # Allow access to Redis
7 8 -A INPUT -s <%= node['peers']['integration'] %> -p tcp -m state --state NEW --dport 6379 -j ACCEPT
... ...
cookbooks/postgresql/templates/centos/pg_hba.conf.erb
  Diff comments   View file @45e692f
... ... @@ -12,7 +12,7 @@ host gitlab gitlab &lt;%= node[&#39;peers&#39;][&#39;integration&#39;] %&gt;/32 trust
12 12 host noosfero noosfero <%= node['peers']['social'] %>/32 trust
13 13 host noosfero colab <%= node['peers']['integration'] %>/32 trust
14 14  
15   -#host kalibro_processor kalibro_processor <%= node['peers']['mezuro'] %>/32 trust
16   -#host kalibro_configurations kalibro_configurations <%= node['peers']['mezuro'] %>/32 trust
17   -#host prezento prezento <%= node['peers']['integration'] %>/32 trust
  15 +host kalibro_processor kalibro_processor <%= node['peers']['mezuro'] %>/32 trust
  16 +host kalibro_configurations kalibro_configurations <%= node['peers']['mezuro'] %>/32 trust
  17 +host prezento prezento <%= node['peers']['integration'] %>/32 trust
18 18  
... ...
nodes.yaml
  Diff comments   View file @45e692f
... ... @@ -14,6 +14,10 @@ database:
14 14 run_list:
15 15 - role[server]
16 16 - role[database_server]
  17 +mezuro:
  18 + run_list:
  19 + - role[server]
  20 + - role[mezuro_server]
17 21 monitor:
18 22 run_list:
19 23 - role[server]
... ...
roles/database_server.rb
  Diff comments   View file @45e692f
... ... @@ -5,5 +5,6 @@ run_list *[
5 5 'recipe[redis]',
6 6 'recipe[postgresql::colab]', # must come before the other apps
7 7 'recipe[postgresql::noosfero]',
8   - 'recipe[postgresql::gitlab]'
  8 + 'recipe[postgresql::gitlab]',
  9 + 'recipe[postgresql::mezuro]'
9 10 ]
... ...
roles/integration_server.rb
  Diff comments   View file @45e692f
... ... @@ -13,4 +13,5 @@ run_list *[
13 13 'recipe[colab]',
14 14 'recipe[colab::nginx]',
15 15 'recipe[backup]',
  16 + 'recipe[mezuro::prezento]'
16 17 ]
... ...