diff options
author | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
commit | 9198af78956972a01aaf85e19753c5c9e62ea018 (patch) | |
tree | 7c2c4901c92528b2fababb0e4283d5bec6cd1aef /puppet/modules/site_static/manifests/init.pp | |
parent | 6100b6ded99241f10e7fb12c13a0820fda084912 (diff) | |
parent | f991e8a4c877cff1d274fd1cac26488f8c3fda84 (diff) |
Merge tag '0.5.2'
tagging 0.5.2 release
Diffstat (limited to 'puppet/modules/site_static/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp index 4f6d895f..6e347d35 100644 --- a/puppet/modules/site_static/manifests/init.pp +++ b/puppet/modules/site_static/manifests/init.pp @@ -3,6 +3,39 @@ class site_static { $static = hiera('static') $domains = $static['domains'] $formats = $static['formats'] + $bootstrap = $static['bootstrap_files'] + + if $bootstrap['enabled'] { + $bootstrap_domain = $bootstrap['domain'] + $bootstrap_client = $bootstrap['client_version'] + file { '/srv/leap/provider.json': + content => $bootstrap['provider_json'], + owner => 'www-data', + group => 'www-data', + mode => '0444'; + } + # It is important to always touch provider.json: the client needs to check x-min-client-version header, + # but this is only sent when the file has been modified (otherwise 304 is sent by apache). The problem + # is that changing min client version won't alter the content of provider.json, so we must touch it. + exec { '/bin/touch /srv/leap/provider.json': + require => File['/srv/leap/provider.json']; + } + } + + class { '::apache': no_default_site => true, ssl => true } + include site_apache::module::headers + include site_apache::module::alias + include site_apache::module::expires + include site_apache::module::removeip + include site_apache::module::rewrite + + if (member($formats, 'rack')) { + include site_apt::preferences::passenger + class { 'passenger': + use_munin => false, + require => Class['site_apt::preferences::passenger'] + } + } if (member($formats, 'amber')) { include site_config::ruby::dev |