From fc082470fa945dd5a394057cbea8ea55831b9fad Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 7 Aug 2015 14:08:09 -0700
Subject: set platform version 0.8, pin to leap_cli 1.8

---
 platform.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'platform.rb')

diff --git a/platform.rb b/platform.rb
index 0c3de2a0..61f0dd05 100644
--- a/platform.rb
+++ b/platform.rb
@@ -4,8 +4,8 @@
 #
 
 Leap::Platform.define do
-  self.version = "0.7.1"
-  self.compatible_cli = "1.7.0".."1.7.99"
+  self.version = "0.8"
+  self.compatible_cli = "1.8".."1.99"
 
   #
   # the facter facts that should be gathered
-- 
cgit v1.2.3


From 8fc9f0da2f755ad8b225d4b0557c6179236ca7f4 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 26 Jan 2016 12:27:39 -0800
Subject: set value for platform.hiera_dir, but in a way that will not bomb out
 if using older leap_cli.

---
 platform.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'platform.rb')

diff --git a/platform.rb b/platform.rb
index 61f0dd05..51ddd98f 100644
--- a/platform.rb
+++ b/platform.rb
@@ -15,6 +15,7 @@ Leap::Platform.define do
   #
   # absolute paths on the destination server
   #
+  self.hiera_dir  = '/etc/leap' if self.respond_to?(:hiera_dir)
   self.hiera_path = '/etc/leap/hiera.yaml'
   self.leap_dir   = '/srv/leap'
   self.files_dir  = '/srv/leap/files'
-- 
cgit v1.2.3


From 685642e8bfdaff16a4f02bd40b5d2aef15b68d94 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sat, 13 Feb 2016 23:48:48 -0800
Subject: get dkim working, closes #5924

---
 platform.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'platform.rb')

diff --git a/platform.rb b/platform.rb
index 51ddd98f..8433416e 100644
--- a/platform.rb
+++ b/platform.rb
@@ -76,6 +76,9 @@ Leap::Platform.define do
     :commercial_key   => 'files/cert/#{arg}.key',
     :commercial_csr   => 'files/cert/#{arg}.csr',
     :commercial_cert  => 'files/cert/#{arg}.crt',
+    :dkim_priv_key    => 'files/mx/dkim.key',
+    :dkim_pub_key     => 'files/mx/dkim.pub',
+
     :commercial_ca_cert       => 'files/cert/commercial_ca.crt',
     :vagrantfile              => 'test/Vagrantfile',
     :static_web_provider_json => 'files/web/bootstrap/#{arg}/provider.json',
-- 
cgit v1.2.3


From 8eec2d89983934868c9be07d55825cbe3bdcdaaf Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 2 Feb 2016 17:58:44 -0800
Subject: added templates for `leap node add`, so that new nodes can get
 default values set in their initial .json file.

---
 platform.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'platform.rb')

diff --git a/platform.rb b/platform.rb
index 8433416e..323ba4ea 100644
--- a/platform.rb
+++ b/platform.rb
@@ -31,6 +31,7 @@ Leap::Platform.define do
     :files_dir        => 'files',
     :nodes_dir        => 'nodes',
     :services_dir     => 'services',
+    :templates_dir    => 'templates',
     :tags_dir         => 'tags',
     :node_files_dir   => 'files/nodes/#{arg}',
 
@@ -41,6 +42,7 @@ Leap::Platform.define do
     :node_config      => 'nodes/#{arg}.json',
     :service_config   => 'services/#{arg}.json',
     :tag_config       => 'tags/#{arg}.json',
+    :template_config  => 'templates/#{arg}.json',
 
     # input config files, environmentally scoped
     :provider_env_config  => 'provider.#{arg}.json',
-- 
cgit v1.2.3


From e4f786e229c101cb60626ce23e671c5258466724 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 8 Apr 2016 12:41:45 -0700
Subject: partials - add support for leap_cli's inheritable service partials
 (requires latest develop branch leap_cli)

---
 platform.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'platform.rb')

diff --git a/platform.rb b/platform.rb
index 323ba4ea..1e19a2a9 100644
--- a/platform.rb
+++ b/platform.rb
@@ -38,13 +38,14 @@ Leap::Platform.define do
     # input config files
     :common_config    => 'common.json',
     :provider_config  => 'provider.json',
-    :secrets_config   => 'secrets.json',
-    :node_config      => 'nodes/#{arg}.json',
     :service_config   => 'services/#{arg}.json',
     :tag_config       => 'tags/#{arg}.json',
     :template_config  => 'templates/#{arg}.json',
+    :secrets_config   => 'secrets.json',
+    :node_config      => 'nodes/#{arg}.json',
 
     # input config files, environmentally scoped
+    :common_env_config    => 'commmon.#{arg}.json',
     :provider_env_config  => 'provider.#{arg}.json',
     :service_env_config   => 'services/#{arg[0]}.#{arg[1]}.json',
     :tag_env_config       => 'tags/#{arg[0]}.#{arg[1]}.json',
-- 
cgit v1.2.3