add support for client-side collection of facter facts.

5 files changed, 7 insertions, 6 deletions

diff --git a/platform.rb b/platform.rb
index 18b5e291..19563ae8 100644
--- a/platform.rb
+++ b/platform.rb
@@ -3,8 +3,8 @@
 #
 
 Leap::Platform.define do
-  self.version = "1.0.0"
-  self.compatible_cli = "1.0".."1.99"
+  self.version = "1.1.0"
+  self.compatible_cli = "1.1".."1.99"
 
   #
   # the facter facts that should be gathered
@@ -38,6 +38,7 @@ Leap::Platform.define do
     :smtp_service_json_template    => 'files/service-definitions/#{arg}/smtp-service.json.erb',
 
     # output files
+    :facts            => 'facts.json',
     :user_ssh         => 'users/#{arg}/#{arg}_ssh.pub',
     :user_pgp         => 'users/#{arg}/#{arg}_pgp.pub',
     :known_hosts      => 'files/ssh/known_hosts',
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb
index 5552c423..8dbf7365 100644
--- a/provider_base/files/service-definitions/provider.json.erb
+++ b/provider_base/files/service-definitions/provider.json.erb
@@ -20,5 +20,5 @@
   hsh['ca_cert_uri'] = 'https://' + domain.full_suffix + '/ca.crt'
   hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert)
 
-  generate_json hsh
+  JSON.sorted_generate hsh
 %>
\ No newline at end of file
diff --git a/provider_base/files/service-definitions/v1/eip-service.json.erb b/provider_base/files/service-definitions/v1/eip-service.json.erb
index 9ee489de..feaea25b 100644
--- a/provider_base/files/service-definitions/v1/eip-service.json.erb
+++ b/provider_base/files/service-definitions/v1/eip-service.json.erb
@@ -44,5 +44,5 @@
     "auth" => "SHA1",
     "cipher" => "AES-128-CBC"
   }
-  generate_json hsh
+  JSON.sorted_generate hsh
 %>
\ No newline at end of file
diff --git a/provider_base/files/service-definitions/v1/smtp-service.json.erb b/provider_base/files/service-definitions/v1/smtp-service.json.erb
index 68d4bbab..60129f5f 100644
--- a/provider_base/files/service-definitions/v1/smtp-service.json.erb
+++ b/provider_base/files/service-definitions/v1/smtp-service.json.erb
@@ -25,5 +25,5 @@
   end
   hsh["hosts"] = hosts
   hsh["locations"] = locations
-  generate_json hsh
+  JSON.sorted_generate hsh
 %>
\ No newline at end of file
diff --git a/provider_base/files/service-definitions/v1/soledad-service.json.erb b/provider_base/files/service-definitions/v1/soledad-service.json.erb
index 4d345930..0cd1c927 100644
--- a/provider_base/files/service-definitions/v1/soledad-service.json.erb
+++ b/provider_base/files/service-definitions/v1/soledad-service.json.erb
@@ -25,5 +25,5 @@
   end
   hsh["hosts"] = hosts
   hsh["locations"] = locations
-  generate_json hsh
+  JSON.sorted_generate hsh
 %>
\ No newline at end of file