diff options
author | varac <varacanero@zeromail.org> | 2014-02-12 12:54:20 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-02-12 12:54:20 +0100 |
commit | 245ad19a443434196b897c9a2310e7507e925fcd (patch) | |
tree | cca6f9e0476dc7ad31a1c28a923d05f2d03e887e /platform.rb | |
parent | 6255e58bf9ff3489bf2707bc2be9759ec5c7db68 (diff) | |
parent | 0b3e87cd6916d4ca4404fd2b375d21468d17f343 (diff) |
Merge remote-tracking branch 'elijah/feature/known_hosts' into 0.6
Conflicts:
provider_base/services/monitor.json
Diffstat (limited to 'platform.rb')
-rw-r--r-- | platform.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/platform.rb b/platform.rb index 60b0d9a5..54590f4b 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.4.0" + self.compatible_cli = "1.4.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 |