Issue 245 - Unify SSL configuration for all servers

modules/web/manifests/server.pp

 class web::server(
     $vhost,
     $repository,
     $is_default = false,
     $aliases = undef,
     $custom_config = undef,
     $multiplexer_locations = undef) {
   File {
     owner  => 'root',
     group  => 'root',
     mode   => 0644,
   }
 
   Cron {
     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
     package {['python-flup', 'python-mysqldb']:}
 
@@ skipping 39 matching lines @@
     mode => 755,
   }
 
   cron {'update_repo':
     ensure => present,
     command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.cms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}",
     user => www,
     minute  => '*/10',
   }
 }