Issue 245 - Unify SSL configuration for all servers

modules/web/manifests/server.pp

Index: modules/web/manifests/server.pp
===================================================================
--- a/modules/web/manifests/server.pp
+++ b/modules/web/manifests/server.pp
@@ -15,32 +15,22 @@ class web::server(
     environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescripts'],
   }
 
   include nginx
 
   package {['python-jinja2', 'python-markdown']:}
 
   nginx::hostconfig {$vhost:
-    content => template('web/site.erb'),
-    enabled => true,
-  }
-
-  file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key':
-    ensure => file,
-    mode => 0400,
-    require => Nginx::Hostconfig[$vhost],
-    source => 'puppet:///modules/private/adblockplus.org_sslcert.key',
-  }
-
-  file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem':
-    ensure => file,
-    mode => 0400,
-    require => Nginx::Hostconfig[$vhost],
-    source => 'puppet:///modules/private/adblockplus.org_sslcert.pem',
+    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',
+    log => "access_log_$vhost"
   }
 
   class {'sitescripts':
     sitescriptsini_source => 'puppet:///modules/web/sitescripts',
   }
 
   if $multiplexer_locations != undef {
     include spawn-fcgi