Issue 245 - Unify SSL configuration for all servers

modules/filterserver/manifests/init.pp

Index: modules/filterserver/manifests/init.pp
===================================================================
--- a/modules/filterserver/manifests/init.pp
+++ b/modules/filterserver/manifests/init.pp
@@ -45,40 +45,23 @@ class filterserver($is_default = false) 
   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;
   }