Paulo Tada · Lucas Kanashiro · Lucas Kanashiro · Paulo Tada · Paulo Tada · Paulo Tada
Showing 20 changed files Show diff stats
Rakefile
Vagrantfile
config/dev/config.yaml
config/lappis/config.yaml
config/local/config.yaml
cookbooks/basics/recipes/default.rb
cookbooks/colab/files/default/noosfero_profile.py
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/sentry_client.py.erb
cookbooks/gitlab/recipes/default.rb
cookbooks/mezuro/recipes/kalibro_configurations.rb
cookbooks/mezuro/recipes/kalibro_processor.rb
cookbooks/mezuro/recipes/prezento.rb
cookbooks/mezuro/recipes/repo.rb
cookbooks/rsyslog/recipes/default.rb
cookbooks/rsyslog/recipes/server.rb
roles/email_server.rb
roles/monitoring_server.rb
roles/reverse_proxy_server.rb
roles/server.rb
@@ -65,12 +65,6 @@ $nodes.each do |node|
   node.data['firewall'] = firewall
 end
-# In the absence of a dedicated munin master, reverseproxy will do that.
-if !config['munin_master']
-  config['munin_master'] = ips['reverseproxy']
-  $nodes.find { |node| node.hostname == 'reverseproxy' }.data['run_list'] << 'role[monitoring_server]'
-end
-
 task :console do
   require 'pry'
   binding.pry
@@ -61,7 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
-  config.vm.define 'reverseproxy', autostart: false do |reverseproxy|
+  config.vm.define 'reverseproxy' do |reverseproxy|
     reverseproxy.vm.provider "virtualbox" do |vm, override|
       override.vm.network 'private_network', ip: ips['reverseproxy'] if ips
     end
+rpm_repository: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/epel-7-$basearch/
+rpm_gpgkey: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/pubkey.gpg
 admins:
   - ["Paulo Meirelles", "paulo@softwarelivre.org"]
+site_url: https://dev.softwarepublico.gov.br
 external_hostname: dev.softwarepublico.gov.br
 monitor_external_hostname: status.dev.softwarepublico.gov.br
-external_ip: 189.9.151.16
 alternative_hostnames:
   - www.dev.softwarepublico.gov.br
-site_url: https://dev.softwarepublico.gov.br
+external_ip: 189.9.151.16
+alt_ssh_port: 55555
 colab_from_address: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>'
 server_email: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>'
 email_subject_prefix: '[spb|dev]'
@@ -15,9 +18,9 @@ from_address: noreply@dev.softwarepublico.gov.br
 relay_hostname: relay.dev.softwarepublico.gov.br
 relay_ip: 189.9.151.44
 external_outgoing_mail_relay: 189.9.150.53
-alt_ssh_port: 55555
 external_outgoing_mail_domain: serpro.gov.br
 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
 google_analytics_id: 'UA-64206731-2'
+munin_master: 10.18.0.21
 dev_backup_frequency: true
 disable_send_emails: true
+rpm_repository: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/epel-7-$basearch/
+rpm_gpgkey: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/pubkey.gpg
 admins:
   - ["Paulo Meirelles", "paulo@softwarelivre.org"]
 site_url: https://softwarepublico.lappis
 external_hostname: softwarepublico.lappis
 monitor_external_hostname: status.softwarepublico.lappis
 external_ip: 10.0.0.54
+alt_ssh_port: 5555
 colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
 server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
-email_subject_prefix: '[spb]'
+email_subject_prefix: '[spb|local]'
 lists_hostname: listas.softwarepublico.lappis
 lists_admin: paulo@softwarelivre.org
 relay_hostname: relay.softwarepublico.lappis
 relay_ip: 10.0.0.51
-alt_ssh_port: 5555
 from_address: noreply@softwarepublico.lappis
-# define less frequent backup for dev envs
 dev_backup_frequency: true
 disable_send_emails: true
+rpm_repository: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/epel-7-$basearch/
+rpm_gpgkey: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/pubkey.gpg
 admins:
   - ["Paulo Meirelles", "paulo@softwarelivre.org"]
 site_url: https://softwarepublico.dev
@@ -8,6 +10,7 @@ alternative_hostnames:
   - beta.softwarepublico.dev
   - portal.softwarepublico.dev
 external_ip: 10.10.10.6
+alt_ssh_port: 5555
 colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.dev>'
 server_email: '"Portal do Software Publico" <noreply@softwarepublico.dev>'
 email_subject_prefix: '[spb]'
@@ -15,7 +18,6 @@ lists_hostname: listas.softwarepublico.dev
 lists_admin: paulo@softwarelivre.org
 relay_hostname: relay.softwarepublico.dev
 relay_ip: 10.10.10.3
-alt_ssh_port: 5555
 from_address: noreply@softwarepublico.dev
 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
 colab_http_workers: 1
@@ -65,7 +65,6 @@ package &#39;tmux&#39;
 package 'less'
 package 'htop'
 package 'ntp'
-package 'screen'
 cookbook_file '/usr/local/bin/is-a-container' do
   owner   'root'
@@ -0,0 +1,5 @@
+from colab.widgets.widget_manager import WidgetManager
+
+from colab_noosfero.widgets.profile.profile import NoosferoProfileWidget
+
+WidgetManager.register_widget('profile', NoosferoProfileWidget())
@@ -168,18 +168,15 @@ template &#39;/etc/colab/plugins.d/spb.py&#39; do
   notifies :restart, 'service[colab]'
 end
-template '/etc/colab/plugins.d/sentry_client.py' do
+template '/etc/colab/plugins.d/mezuro.py' do
   owner 'root'
   group 'colab'
   mode 0640
   notifies :restart, 'service[colab]'
 end
-template '/etc/colab/plugins.d/mezuro.py' do
-  owner 'root'
-  group 'colab'
-  mode 0640
-  notifies :restart, 'service[colab]'
+file '/etc/colab/plugins.d/sentry_client.py' do
+  action :delete
 end
 execute 'colab-admin migrate'
@@ -209,6 +206,14 @@ cookbook_file &#39;/etc/colab/widgets.d/gitlab_profile.py&#39; do
   notifies :restart, 'service[colab]'
 end
+cookbook_file '/etc/colab/widgets.d/noosfero_profile.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+
+  notifies :restart, 'service[colab]'
+end
+
 # Static files
 directory '/var/lib/colab/assets/spb/' do
   owner  'root'
@@ -1,4 +0,0 @@
-
-name = "raven.contrib.django.raven_compat"
-
-middlewares = ['raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware']
@@ -120,9 +120,14 @@ execute &#39;change-gitlab-assets-owner&#39; do
   only_if 'ls -l /var/lib/gitlab-assets | grep root'
 end
+# TODO: the ignore_failure prevents the recipe to stop running when a exit non 0 happens
+#   The precompile-assets runs into a bug that happens when it runs the FIRST time
+#   This means that when runs into a new and clean machine it will crash
+#   This bug is related to gitlab 7.6.* it should fix on gitlab 8.*
 execute 'precompile-assets' do
   user 'git'
   cwd '/usr/lib/gitlab'
+  ignore_failure true
   command 'bundle exec rake assets:precompile RAILS_ENV=production'
   action :nothing
 end
 include_recipe 'mezuro::service'
+include_recipe 'mezuro::repo'
-# TODO: remove before define main repo
-execute 'download:mezuro' do
-  command 'wget https://bintray.com/mezurometrics/rpm/rpm -O bintray-mezurometrics-rpm.repo'
-  cwd '/etc/yum.repos.d'
-  user 'root'
+package 'kalibro-configurations' do
+  action :upgrade
 end
-package 'kalibro-configurations'
-
 template '/etc/mezuro/kalibro-configurations/database.yml' do
   source 'kalibro_configurations/database.yml.erb'
   owner 'kalibro_configurations'
 include_recipe 'mezuro::service'
+include_recipe 'mezuro::repo'
-execute 'download:mezuro' do
-  command 'wget https://bintray.com/mezurometrics/rpm/rpm -O bintray-mezurometrics-rpm.repo'
-  cwd '/etc/yum.repos.d'
-  user 'root'
+package 'kalibro-processor' do
+  action :upgrade
 end
-package 'kalibro-processor'
-
 template '/etc/mezuro/kalibro-processor/database.yml' do
   source 'kalibro_processor/database.yml.erb'
   owner 'kalibro_processor'
 include_recipe 'mezuro::service'
+include_recipe 'mezuro::repo'
-# change this to COPR repo when gets ready
-execute 'download:mezuro' do
-  command 'wget https://bintray.com/mezurometrics/rpm/rpm -O bintray-mezurometrics-rpm.repo'
-  cwd '/etc/yum.repos.d'
-  user 'root'
+package 'prezento-spb' do
+  action :upgrade
 end
-package 'prezento-spb'
-
 template '/etc/mezuro/prezento/database.yml' do
   source 'prezento/database.yml.erb'
   owner 'prezento'
@@ -0,0 +1,8 @@
+# Getting the mezuro RPM's packages
+package 'wget'
+
+execute 'download:mezuro' do
+  command 'wget https://bintray.com/mezurometrics/rpm/rpm -O bintray-mezurometrics-rpm.repo'
+  cwd '/etc/yum.repos.d'
+  user 'root'
+end
-package 'rsyslog-mysql' do
-  action [:install, :upgrade]
-end
 package 'rsyslog' do
   action [:install, :upgrade]
 end
-SPB_LOG='/var/log/spb.log'
-
-file SPB_LOG do
-  owner 'root'
-  group 'root'
-  mode 0644
-end
-
 template "/etc/rsyslog.d/spb_log.conf" do
   owner 'root'
   group 'root'
@@ -24,12 +13,3 @@ service &#39;rsyslog&#39; do
   action [:enable, :restart]
 end
-execute 'allowing-spb-log' do
-  command 'semanage fcontext -a -t httpd_sys_rw_content_t '+SPB_LOG
-  user 'root'
-end
-
-execute 'enable-spb-log' do
-  command 'restorecon -v '+SPB_LOG
-  user 'root'
-end
@@ -0,0 +1,21 @@
+package 'rsyslog-mysql' do
+  action [:install, :upgrade]
+end
+
+SPB_LOG='/var/log/spb.log'
+
+file SPB_LOG do
+  owner 'root'
+  group 'root'
+  mode 0644
+end
+
+execute 'allowing-spb-log' do
+  command 'semanage fcontext -a -t httpd_sys_rw_content_t ' + SPB_LOG
+  user 'root'
+end
+
+execute 'enable-spb-log' do
+  command 'restorecon -v ' + SPB_LOG
+  user 'root'
+end
 name 'email_server'
 description 'E-mail server'
-run_list 'recipe[email::relay]'
+run_list *[
+  'recipe[email::relay]',
+]
 name 'monitoring_server'
 description 'Monitoring server'
-run_list 'recipe[munin]', 'recipe[rsyslog]', 'recipe[loganalyzer]'
+run_list *[
+  'recipe[munin]',
+  'recipe[rsyslog]',
+  'recipe[rsyslog::server]',
+  'recipe[loganalyzer]'
+]
 name 'database_server'
 description 'Reverse proxy server'
-run_list 'recipe[basics::nginx]', 'recipe[reverse_proxy]', 'recipe[reverse_proxy::mailman]', 'recipe[reverse_proxy::documentation]'
+run_list *[
+  'recipe[basics::nginx]',
+  'recipe[reverse_proxy]',
+  'recipe[reverse_proxy::mailman]',
+  'recipe[reverse_proxy::documentation]'
+]
 name 'server'
 description 'Common configuration for all servers'
-run_list 'recipe[basics]', 'recipe[firewall]', 'recipe[email::client]', 'recipe[munin::node]', 'recipe[rsyslog]'
+run_list *[
+  'recipe[basics]',
+  'recipe[firewall]',
+  'recipe[email::client]',
+  'recipe[munin::node]',
+  'recipe[rsyslog]'
+]
	@@ -65,12 +65,6 @@ $nodes.each do \|node\|		@@ -65,12 +65,6 @@ $nodes.each do \|node\|
65	node.data['firewall'] = firewall	65	node.data['firewall'] = firewall
66	end	66	end
67		67
68	-# In the absence of a dedicated munin master, reverseproxy will do that.
69	-if !config['munin_master']
70	- config['munin_master'] = ips['reverseproxy']
71	- $nodes.find { \|node\| node.hostname == 'reverseproxy' }.data['run_list'] << 'role[monitoring_server]'
72	-end
73	-
74	task :console do	68	task :console do
75	require 'pry'	69	require 'pry'
76	binding.pry	70	binding.pry
	@@ -61,7 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|		@@ -61,7 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
61	end	61	end
62	end	62	end
63		63
64	- config.vm.define 'reverseproxy', autostart: false do \|reverseproxy\|	64	+ config.vm.define 'reverseproxy' do \|reverseproxy\|
65	reverseproxy.vm.provider "virtualbox" do \|vm, override\|	65	reverseproxy.vm.provider "virtualbox" do \|vm, override\|
66	override.vm.network 'private_network', ip: ips['reverseproxy'] if ips	66	override.vm.network 'private_network', ip: ips['reverseproxy'] if ips
67	end	67	end
	@@ -65,7 +65,6 @@ package 'tmux'		@@ -65,7 +65,6 @@ package 'tmux'
65	package 'less'	65	package 'less'
66	package 'htop'	66	package 'htop'
67	package 'ntp'	67	package 'ntp'
68	-package 'screen'
69		68
70	cookbook_file '/usr/local/bin/is-a-container' do	69	cookbook_file '/usr/local/bin/is-a-container' do
71	owner 'root'	70	owner 'root'
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+from colab.widgets.widget_manager import WidgetManager
	2	+
	3	+from colab_noosfero.widgets.profile.profile import NoosferoProfileWidget
	4	+
	5	+WidgetManager.register_widget('profile', NoosferoProfileWidget())
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-
2	-name = "raven.contrib.django.raven_compat"
3	-
4	-middlewares = ['raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware']
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+# Getting the mezuro RPM's packages
	2	+package 'wget'
	3	+
	4	+execute 'download:mezuro' do
	5	+ command 'wget https://bintray.com/mezurometrics/rpm/rpm -O bintray-mezurometrics-rpm.repo'
	6	+ cwd '/etc/yum.repos.d'
	7	+ user 'root'
	8	+end
1	-package 'rsyslog-mysql' do
2	- action [:install, :upgrade]
3	-end
4	package 'rsyslog' do	1	package 'rsyslog' do
5	action [:install, :upgrade]	2	action [:install, :upgrade]
6	end	3	end
7		4
8	-SPB_LOG='/var/log/spb.log'
9	-
10	-file SPB_LOG do
11	- owner 'root'
12	- group 'root'
13	- mode 0644
14	-end
15	-
16	template "/etc/rsyslog.d/spb_log.conf" do	5	template "/etc/rsyslog.d/spb_log.conf" do
17	owner 'root'	6	owner 'root'
18	group 'root'	7	group 'root'
	@@ -24,12 +13,3 @@ service 'rsyslog' do		@@ -24,12 +13,3 @@ service 'rsyslog' do
24	action [:enable, :restart]	13	action [:enable, :restart]
25	end	14	end
26		15
27	-execute 'allowing-spb-log' do
28	- command 'semanage fcontext -a -t httpd_sys_rw_content_t '+SPB_LOG
29	- user 'root'
30	-end
31	-
32	-execute 'enable-spb-log' do
33	- command 'restorecon -v '+SPB_LOG
34	- user 'root'
35	-end
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+package 'rsyslog-mysql' do
	2	+ action [:install, :upgrade]
	3	+end
	4	+
	5	+SPB_LOG='/var/log/spb.log'
	6	+
	7	+file SPB_LOG do
	8	+ owner 'root'
	9	+ group 'root'
	10	+ mode 0644
	11	+end
	12	+
	13	+execute 'allowing-spb-log' do
	14	+ command 'semanage fcontext -a -t httpd_sys_rw_content_t ' + SPB_LOG
	15	+ user 'root'
	16	+end
	17	+
	18	+execute 'enable-spb-log' do
	19	+ command 'restorecon -v ' + SPB_LOG
	20	+ user 'root'
	21	+end
1	name 'email_server'	1	name 'email_server'
2	description 'E-mail server'	2	description 'E-mail server'
3	-run_list 'recipe[email::relay]'	3	+run_list *[
		4	+ 'recipe[email::relay]',
		5	+]
1	name 'monitoring_server'	1	name 'monitoring_server'
2	description 'Monitoring server'	2	description 'Monitoring server'
3	-run_list 'recipe[munin]', 'recipe[rsyslog]', 'recipe[loganalyzer]'	3	+run_list *[
		4	+ 'recipe[munin]',
		5	+ 'recipe[rsyslog]',
		6	+ 'recipe[rsyslog::server]',
		7	+ 'recipe[loganalyzer]'
		8	+]