Issue 245 - Unify SSL configuration for all servers

modules/filterserver/manifests/init.pp

 class filterserver($is_default = false) {
   if !defined(Class['nginx']) {
     class {'nginx':
       worker_processes => 2,
       worker_connections => 4000,
       ssl_session_cache => off,
     }
   }
 
   if !defined(File['/var/www']) {
@@ skipping 32 matching lines @@
   }
 
   file {'/etc/nginx/sites-available/inc.easylist-downloads-txt':
     ensure => absent
   }
 
   file {'/etc/nginx/sites-available/inc.easylist-downloads-tpl':
     ensure => absent
   }
 
-  file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.key':
-    ensure => file,
-    notify => Service['nginx'],
-    before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
-    source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslcert.key'
-  }
-
-  file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.pem':
-    ensure => file,
-    notify => Service['nginx'],
-    before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
-    mode => 0400,
-    source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslcert.pem'
-  }
-
   nginx::hostconfig{'easylist-downloads.adblockplus.org':
-    content => template('filterserver/easylist-downloads.adblockplus.org.erb'),
-    enabled => true
-  }
-
-  file {'/etc/logrotate.d/nginx_easylist-downloads.adblockplus.org':
-    ensure => file,
-    require => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
-    source => 'puppet:///modules/filterserver/logrotate'
+    alt_names => 'easylist-msie.adblockplus.org',
+    source => 'puppet:///modules/filterserver/site.conf',
+    is_default => $is_default,
+    certificate => 'adblockplus.org_sslcert.pem',
+    private_key => 'adblockplus.org_sslcert.key',
+    log => 'access_log_easylist_downloads'
   }
 
   file {'/home/rsync/.ssh':
     ensure => directory,
     require => User['rsync'],
     owner => rsync,
     mode => 0600;
   }
 
   concat {'/home/rsync/.ssh/known_hosts':
@@ skipping 42 matching lines @@
                  File['/home/rsync/.ssh/id_rsa'],
                  User['rsync']
                ],
     command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermaster.adblockplus.org:. /var/www/easylist/',
     environment => ['MAILTO=admins@adblockplus.org,root'],
     user => rsync,
     hour => '*',
     minute => '2-52/10'
   }
 }