| Index: modules/web/manifests/server.pp |
| =================================================================== |
| --- a/modules/web/manifests/server.pp |
| +++ b/modules/web/manifests/server.pp |
| @@ -1,11 +1,13 @@ |
| class web::server( |
| $vhost, |
| $repository, |
| + $certificate, |
| + $private_key, |
| $is_default = false, |
| $aliases = undef, |
| $custom_config = undef, |
| $multiplexer_locations = undef) { |
| File { |
| owner => 'root', |
| group => 'root', |
| mode => 0644, |
| @@ -18,18 +20,18 @@ class web::server( |
| include nginx |
| package {['python-jinja2', 'python-markdown']:} |
| nginx::hostconfig {$vhost: |
| content => template('web/site.conf.erb'), |
| global_config => template('web/global.conf.erb'), |
| is_default => $is_default, |
| - certificate => 'adblockplus.org_sslcert.pem', |
| - private_key => 'adblockplus.org_sslcert.key', |
| + certificate => $certificate, |
| + private_key => $private_key, |
| log => "access_log_$vhost" |
| } |
| class {'sitescripts': |
| sitescriptsini_source => 'puppet:///modules/web/sitescripts', |
| } |
| if $multiplexer_locations != undef { |