diff options
| -rw-r--r-- | platform.rb | 18 | ||||
| -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 | 3 |
4 files changed, 23 insertions, 4 deletions
diff --git a/platform.rb b/platform.rb index 270dd25a..35017559 100644 --- a/platform.rb +++ b/platform.rb @@ -5,7 +5,7 @@ Leap::Platform.define do self.version = "0.5.4.1" - self.compatible_cli = "1.5.8".."1.99" + self.compatible_cli = "1.6.0".."1.99" # # the facter facts that should be gathered @@ -13,7 +13,16 @@ Leap::Platform.define do self.facts = ["ec2_local_ipv4", "ec2_public_ipv4"] # + # absolute paths on the destination server + # + self.hiera_path = '/etc/leap/hiera.yaml' + self.leap_dir = '/srv/leap' + self.files_dir = '/srv/leap/files' + self.init_path = '/srv/leap/initialized' + + # # the named paths for this platform + # (relative to the provider directory) # self.paths = { # directories @@ -43,6 +52,11 @@ Leap::Platform.define do :soledad_service_json_template => 'files/service-definitions/#{arg}/soledad-service.json.erb', :smtp_service_json_template => 'files/service-definitions/#{arg}/smtp-service.json.erb', + # custom puppet + :custom_puppet_dir => 'files/puppet', + :custom_puppet_modules_dir => 'files/puppet/modules', + :custom_puppet_manifests_dir => 'files/puppet/manifests', + # output files :facts => 'facts.json', :user_ssh => 'users/#{arg}/#{arg}_ssh.pub', @@ -85,5 +99,7 @@ Leap::Platform.define do self.monitor_username = 'monitor' self.reserved_usernames = ['monitor'] + + self.default_puppet_tags = ['leap_base','leap_service'] end 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 743964ee..9ef0f76a 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -44,7 +44,7 @@ "digest": "SHA256", "life_span": "10y", "server_certificates": { - "bit_size": 2048, + "bit_size": 4096, "digest": "SHA256", "life_span": "1y" }, @@ -56,7 +56,6 @@ "unlimited_prefix": "UNLIMITED" } }, - "hiera_sync_destination": "/etc/leap", "client_version": { "min": "0.5", "max": null |