diff options
| author | elijah <elijah@riseup.net> | 2014-10-21 15:14:23 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-10-21 15:14:23 -0700 |
| commit | 51a1e1c6db33ed2868ec74728f854237e3dfd86a (patch) | |
| tree | 7da1bdf6f26249cdb027cc5fd0071fce285adbf5 /provider_base | |
| parent | 4faf77c2527312b85d836600c01c0d2d9f0b460e (diff) | |
update platform to take advantage of new platform.rb. requires leap_cli 1.6
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/common.json | 4 | ||||
| -rw-r--r-- | provider_base/lib/macros/files.rb | 2 | ||||
| -rw-r--r-- | provider_base/provider.json | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index 87af2152..649db0d9 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -46,5 +46,9 @@ "stunnel": { "clients": {}, "servers": {} + }, + "platform": { + "version": "= Leap::Platform.version.to_s", + "major_version": "= Leap::Platform.major_version" } } diff --git a/provider_base/lib/macros/files.rb b/provider_base/lib/macros/files.rb index 0a491325..b3ba4a06 100644 --- a/provider_base/lib/macros/files.rb +++ b/provider_base/lib/macros/files.rb @@ -71,7 +71,7 @@ module LeapCli end relative_path = Path.relative_path(actual_path) @node.file_paths << relative_path - @node.manager.provider.hiera_sync_destination + '/' + relative_path + File.join(Leap::Platform.files_dir, relative_path) end end diff --git a/provider_base/provider.json b/provider_base/provider.json index 4f71c7d5..9ef0f76a 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -56,7 +56,6 @@ "unlimited_prefix": "UNLIMITED" } }, - "hiera_sync_destination": "/etc/leap", "client_version": { "min": "0.5", "max": null |