From b14ceb03bf9bfc77f43f1848400c868a2ab2208f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 6 Feb 2014 23:38:00 -0800
Subject: added support for monitor ssh keys (requires latest leap_cli)

---
 platform.rb                         | 10 ++++++++--
 provider_base/services/monitor.json |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/platform.rb b/platform.rb
index 60b0d9a5..62fb0215 100644
--- a/platform.rb
+++ b/platform.rb
@@ -3,8 +3,8 @@
 #
 
 Leap::Platform.define do
-  self.version = "0.2.4"
-  self.compatible_cli = "1.2.4".."1.99"
+  self.version = "0.3.0"
+  self.compatible_cli = "1.3.0".."1.99"
 
   #
   # the facter facts that should be gathered
@@ -43,6 +43,8 @@ Leap::Platform.define do
     :user_pgp         => 'users/#{arg}/#{arg}_pgp.pub',
     :known_hosts      => 'files/ssh/known_hosts',
     :authorized_keys  => 'files/ssh/authorized_keys',
+    :monitor_pub_key  => 'files/ssh/monitor_ssh.pub',
+    :monitor_priv_key => 'files/ssh/monitor_ssh',
     :ca_key           => 'files/ca/ca.key',
     :ca_cert          => 'files/ca/ca.crt',
     :client_ca_key    => 'files/ca/client_ca.key',
@@ -73,5 +75,9 @@ Leap::Platform.define do
   self.node_files = [
     :node_config, :hiera, :node_x509_cert, :node_x509_key, :node_ssh_pub_key
   ]
+
+  self.monitor_username = 'monitor'
+
+  self.reserved_usernames = ['monitor']
 end
 
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index c3e2b954..b6886603 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -2,5 +2,11 @@
   "nagios": {
     "nagiosadmin_pw": "= secret :nagios_admin_password",
     "hosts": "= nodes_like_me.pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
+  },
+  "ssh": {
+    "monitor": {
+      "username": "= Leap::Platform.monitor_username",
+      "private_key": "= file(:monitor_priv_key)"
+    }
   }
 }
-- 
cgit v1.2.3


From b9fa9cfc83d552faafe41ebba183fb06f45f6ca5 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 7 Feb 2014 00:01:42 -0800
Subject: monitor nodes get all nodes listed in /etc/hosts

---
 platform.rb                         | 2 +-
 provider_base/services/monitor.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform.rb b/platform.rb
index 62fb0215..ee87789a 100644
--- a/platform.rb
+++ b/platform.rb
@@ -4,7 +4,7 @@
 
 Leap::Platform.define do
   self.version = "0.3.0"
-  self.compatible_cli = "1.3.0".."1.99"
+  self.compatible_cli = "1.3.1".."1.99"
 
   #
   # the facter facts that should be gathered
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index b6886603..cf117869 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -3,6 +3,7 @@
     "nagiosadmin_pw": "= secret :nagios_admin_password",
     "hosts": "= nodes_like_me.pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
   },
+  "hosts": "= hosts_file(nodes_like_me[:services => '!monitor'])",
   "ssh": {
     "monitor": {
       "username": "= Leap::Platform.monitor_username",
-- 
cgit v1.2.3