Commit 37b9ba48883fad7ffbad54abfff2d093317162dd
1 parent
be81285d
Exists in
master
and in
2 other branches
Removing workaround and update configs
Workaround: it's was using the reverseproxy as monitor Updating configs of dev, lappis and local
Showing
5 changed files
with
14 additions
and
14 deletions
Show diff stats
Rakefile
... | ... | @@ -65,12 +65,6 @@ $nodes.each do |node| |
65 | 65 | node.data['firewall'] = firewall |
66 | 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 | 68 | task :console do |
75 | 69 | require 'pry' |
76 | 70 | binding.pry | ... | ... |
Vagrantfile
... | ... | @@ -61,7 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| |
61 | 61 | end |
62 | 62 | end |
63 | 63 | |
64 | - config.vm.define 'reverseproxy', autostart: false do |reverseproxy| | |
64 | + config.vm.define 'reverseproxy' do |reverseproxy| | |
65 | 65 | reverseproxy.vm.provider "virtualbox" do |vm, override| |
66 | 66 | override.vm.network 'private_network', ip: ips['reverseproxy'] if ips |
67 | 67 | end | ... | ... |
config/dev/config.yaml
1 | +rpm_repository: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/epel-7-$basearch/ | |
2 | +rpm_gpgkey: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/pubkey.gpg | |
1 | 3 | admins: |
2 | 4 | - ["Paulo Meirelles", "paulo@softwarelivre.org"] |
5 | +site_url: https://dev.softwarepublico.gov.br | |
3 | 6 | external_hostname: dev.softwarepublico.gov.br |
4 | 7 | monitor_external_hostname: status.dev.softwarepublico.gov.br |
5 | -external_ip: 189.9.151.16 | |
6 | 8 | alternative_hostnames: |
7 | 9 | - www.dev.softwarepublico.gov.br |
8 | -site_url: https://dev.softwarepublico.gov.br | |
10 | +external_ip: 189.9.151.16 | |
11 | +alt_ssh_port: 55555 | |
9 | 12 | colab_from_address: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>' |
10 | 13 | server_email: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>' |
11 | 14 | email_subject_prefix: '[spb|dev]' |
... | ... | @@ -15,9 +18,9 @@ from_address: noreply@dev.softwarepublico.gov.br |
15 | 18 | relay_hostname: relay.dev.softwarepublico.gov.br |
16 | 19 | relay_ip: 189.9.151.44 |
17 | 20 | external_outgoing_mail_relay: 189.9.150.53 |
18 | -alt_ssh_port: 55555 | |
19 | 21 | external_outgoing_mail_domain: serpro.gov.br |
20 | 22 | raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19 |
21 | 23 | google_analytics_id: 'UA-64206731-2' |
24 | +munin_master: 10.18.0.21 | |
22 | 25 | dev_backup_frequency: true |
23 | 26 | disable_send_emails: true | ... | ... |
config/lappis/config.yaml
1 | +rpm_repository: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/epel-7-$basearch/ | |
2 | +rpm_gpgkey: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/pubkey.gpg | |
1 | 3 | admins: |
2 | 4 | - ["Paulo Meirelles", "paulo@softwarelivre.org"] |
3 | 5 | site_url: https://softwarepublico.lappis |
4 | 6 | external_hostname: softwarepublico.lappis |
5 | 7 | monitor_external_hostname: status.softwarepublico.lappis |
6 | 8 | external_ip: 10.0.0.54 |
9 | +alt_ssh_port: 5555 | |
7 | 10 | colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>' |
8 | 11 | server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>' |
9 | -email_subject_prefix: '[spb]' | |
12 | +email_subject_prefix: '[spb|local]' | |
10 | 13 | lists_hostname: listas.softwarepublico.lappis |
11 | 14 | lists_admin: paulo@softwarelivre.org |
12 | 15 | relay_hostname: relay.softwarepublico.lappis |
13 | 16 | relay_ip: 10.0.0.51 |
14 | -alt_ssh_port: 5555 | |
15 | 17 | from_address: noreply@softwarepublico.lappis |
16 | -# define less frequent backup for dev envs | |
17 | 18 | dev_backup_frequency: true |
18 | 19 | disable_send_emails: true | ... | ... |
config/local/config.yaml
1 | +rpm_repository: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/epel-7-$basearch/ | |
2 | +rpm_gpgkey: https://copr-be.cloud.fedoraproject.org/results/softwarepublico/v5/pubkey.gpg | |
1 | 3 | admins: |
2 | 4 | - ["Paulo Meirelles", "paulo@softwarelivre.org"] |
3 | 5 | site_url: https://softwarepublico.dev |
... | ... | @@ -8,6 +10,7 @@ alternative_hostnames: |
8 | 10 | - beta.softwarepublico.dev |
9 | 11 | - portal.softwarepublico.dev |
10 | 12 | external_ip: 10.10.10.6 |
13 | +alt_ssh_port: 5555 | |
11 | 14 | colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.dev>' |
12 | 15 | server_email: '"Portal do Software Publico" <noreply@softwarepublico.dev>' |
13 | 16 | email_subject_prefix: '[spb]' |
... | ... | @@ -15,7 +18,6 @@ lists_hostname: listas.softwarepublico.dev |
15 | 18 | lists_admin: paulo@softwarelivre.org |
16 | 19 | relay_hostname: relay.softwarepublico.dev |
17 | 20 | relay_ip: 10.10.10.3 |
18 | -alt_ssh_port: 5555 | |
19 | 21 | from_address: noreply@softwarepublico.dev |
20 | 22 | raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19 |
21 | 23 | colab_http_workers: 1 | ... | ... |