diff options
| -rw-r--r-- | platform.rb | 2 | ||||
| -rw-r--r-- | provider_base/provider.json | 4 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 3 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 22 |
4 files changed, 13 insertions, 18 deletions
diff --git a/platform.rb b/platform.rb index 9921f3a2..32b8fd19 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ Leap::Platform.define do self.version = "0.2.3" - self.compatible_cli = "1.1.3".."1.99" + self.compatible_cli = "1.1.4".."1.99" # # the facter facts that should be gathered diff --git a/provider_base/provider.json b/provider_base/provider.json index b6a7af21..84ef640e 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -38,12 +38,12 @@ "digest": "SHA256", "life_span": "10y", "server_certificates": { - "bit_size": 2024, + "bit_size": 2048, "digest": "SHA256", "life_span": "1y" }, "client_certificates": { - "bit_size": 2024, + "bit_size": 2048, "digest": "SHA256", "life_span": "2m", "limited_prefix": "LIMITED", diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 93396ec7..55331274 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -19,7 +19,8 @@ "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" }, "haproxy": { - "local_ports": "= stunnel.couch_client.field(:accept_port)" + "local_ports": "= stunnel.couch_client.field(:accept_port)", + "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)" }, "definition_files": { "provider": "= file :provider_json_template", diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 103a0faf..1071ea1d 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -31,13 +31,6 @@ class site_webapp { require => [ Group['leap-webapp'] ]; } - file { '/srv/leap/webapp': - ensure => directory, - owner => 'leap-webapp', - group => 'leap-webapp', - require => User['leap-webapp']; - } - vcsrepo { '/srv/leap/webapp': ensure => present, force => true, @@ -128,14 +121,15 @@ class site_webapp { source => $webapp['head_scss']; '/srv/leap/webapp/public/img': - ensure => directory, + ensure => directory, recurse => true, - purge => true, - force => true, - owner => leap-webapp, - group => leap-webapp, - mode => '0644', - source => $webapp['img_dir']; + purge => true, + force => true, + owner => leap-webapp, + group => leap-webapp, + mode => '0644', + require => Vcsrepo['/srv/leap/webapp'], + source => $webapp['img_dir']; } file { |