diff options
| -rw-r--r-- | platform.rb | 9 | ||||
| -rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/platform.rb b/platform.rb index bb77b0d9..82c25f8f 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', diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp index ce79c00f..35ecabf8 100644 --- a/puppet/modules/site_static/manifests/init.pp +++ b/puppet/modules/site_static/manifests/init.pp @@ -33,6 +33,7 @@ class site_static { include site_apache::module::expires include site_apache::module::removeip include site_apache::module::rewrite + apache::config::include{ 'ssl_common.inc': } if (member($formats, 'rack')) { include site_apt::preferences::passenger |