diff options
| author | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
| commit | 70b1c648b94e6c007b9241a4661f33881e74485f (patch) | |
| tree | 999e5dc1f386fc3894889c1cf263094cc748fd41 /platform.rb | |
| parent | b429b30bda4dafc78cb02f6ece5d82f08e35de1f (diff) | |
| parent | 2761fa77394d5a2857812de840e49172d0e486fb (diff) | |
Merge branch 'develop'
Diffstat (limited to 'platform.rb')
| -rw-r--r-- | platform.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/platform.rb b/platform.rb index bb77b0d9..0c3de2a0 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ # Leap::Platform.define do - self.version = "0.7" + self.version = "0.7.1" self.compatible_cli = "1.7.0".."1.7.99" # @@ -75,8 +75,11 @@ Leap::Platform.define do :commercial_key => 'files/cert/#{arg}.key', :commercial_csr => 'files/cert/#{arg}.csr', :commercial_cert => 'files/cert/#{arg}.crt', - :commercial_ca_cert => 'files/cert/commercial_ca.crt', - :vagrantfile => 'test/Vagrantfile', + :commercial_ca_cert => 'files/cert/commercial_ca.crt', + :vagrantfile => 'test/Vagrantfile', + :static_web_provider_json => 'files/web/bootstrap/#{arg}/provider.json', + :static_web_htaccess => 'files/web/bootstrap/#{arg}/htaccess', + :static_web_readme => 'files/web/bootstrap/README', # node output files :hiera => 'hiera/#{arg}.yaml', @@ -102,7 +105,7 @@ Leap::Platform.define do self.monitor_username = 'monitor' - self.reserved_usernames = ['monitor'] + self.reserved_usernames = ['monitor', 'root'] self.default_puppet_tags = ['leap_base','leap_service'] end |