From 302ba98944a8c8040f4b9f363393e0a1d692ee90 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 13 Aug 2015 11:36:25 -0300 Subject: [PATCH] fix monitoring management --- monitoring/.ssh_config | 3 --- monitoring/Rakefile | 12 +++++++++++- monitoring/cookbooks | 1 - monitoring/ips.yaml | 1 - monitoring/roles | 1 - monitoring/ssh_config | 3 +++ 6 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 monitoring/.ssh_config delete mode 120000 monitoring/cookbooks delete mode 120000 monitoring/ips.yaml delete mode 120000 monitoring/roles create mode 100644 monitoring/ssh_config diff --git a/monitoring/.ssh_config b/monitoring/.ssh_config deleted file mode 100644 index 98eda86..0000000 --- a/monitoring/.ssh_config +++ /dev/null @@ -1,3 +0,0 @@ -Host status.softwarepublico.gov.br - HostName 189.9.151.77 - ProxyCommand ssh lappis.unb.br nc %h %p diff --git a/monitoring/Rakefile b/monitoring/Rakefile index f1158e4..6cee833 100644 --- a/monitoring/Rakefile +++ b/monitoring/Rakefile @@ -1,5 +1,15 @@ +basedir = File.expand_path(File.dirname(__FILE__)) + +Dir.chdir File.join(basedir, '..') + +ENV['CHAKE_NODES'] = File.join(basedir, 'nodes.yaml') +ENV['CHAKE_RSYNC_OPTIONS'] = '--exclude .vagrant/ --exclude docs/_build' +ENV['CHAKE_TMPDIR'] = 'tmp/chake.monitoring' +ENV['CHAKE_SSH_CONFIG'] = File.join(basedir, 'ssh_config') + require 'chake' +ips = YAML.load_file('config/prod/ips.yaml') $nodes.each do |node| - node.data['peers'] = YAML.load_file('ips.yaml') + node.data['peers'] = ips end diff --git a/monitoring/cookbooks b/monitoring/cookbooks deleted file mode 120000 index 695bcea..0000000 --- a/monitoring/cookbooks +++ /dev/null @@ -1 +0,0 @@ -../cookbooks \ No newline at end of file diff --git a/monitoring/ips.yaml b/monitoring/ips.yaml deleted file mode 120000 index 2c65472..0000000 --- a/monitoring/ips.yaml +++ /dev/null @@ -1 +0,0 @@ -../config/prod/ips.yaml \ No newline at end of file diff --git a/monitoring/roles b/monitoring/roles deleted file mode 120000 index d8c4472..0000000 --- a/monitoring/roles +++ /dev/null @@ -1 +0,0 @@ -../roles \ No newline at end of file diff --git a/monitoring/ssh_config b/monitoring/ssh_config new file mode 100644 index 0000000..98513d0 --- /dev/null +++ b/monitoring/ssh_config @@ -0,0 +1,3 @@ +Host status.softwarepublico.gov.br + User spb + HostName 189.9.151.77 -- libgit2 0.21.2