Issue 245 - Unify SSL configuration for all servers

modules/statsmaster/manifests/init.pp

Index: modules/statsmaster/manifests/init.pp
===================================================================
--- a/modules/statsmaster/manifests/init.pp
+++ b/modules/statsmaster/manifests/init.pp
@@ -1,9 +1,12 @@
-class statsmaster {
+class statsmaster(
+    $domain,
+    $is_default=false
+  ) {
   user {'stats':
     ensure => present,
     home => '/home/stats',
     managehome => true,
   }
 
   file {'/home/stats/.ssh':
     ensure => directory,
@@ -69,42 +72,22 @@ class statsmaster {
   }
 
   file {'/var/www/htpasswd':
     ensure => file,
     mode => 0444,
     source => 'puppet:///modules/private/stats-htpasswd',
   }
 
-  file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key':
-    ensure => file,
-    notify => Service['nginx'],
-    before => Nginx::Hostconfig['stats.adblockplus.org'],
-    mode => 0400,
-    source => 'puppet:///modules/private/adblockplus.org_sslcert.key'
-  }
-
-  file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem':
-    ensure => file,
-    notify => Service['nginx'],
-    before => Nginx::Hostconfig['stats.adblockplus.org'],
-    mode => 0400,
-    source => 'puppet:///modules/private/adblockplus.org_sslcert.pem'
-  }
-
-  nginx::hostconfig{'stats.adblockplus.org':
-    source => 'puppet:///modules/statsmaster/stats.adblockplus.org',
-    enabled => true
-  }
-
-  file {'/etc/logrotate.d/nginx_stats.adblockplus.org':
-    ensure => file,
-    mode => 0444,
-    require => Nginx::Hostconfig['stats.adblockplus.org'],
-    source => 'puppet:///modules/statsmaster/logrotate'
+  nginx::hostconfig{$domain:
+    source => 'puppet:///modules/statsmaster/site.conf',
+    is_default => $is_default,
+    certificate => 'adblockplus.org_sslcert.pem',
+    private_key => 'adblockplus.org_sslcert.key',
+    log => 'access_log_stats'
   }
 
   cron {'updatestats':
     ensure => present,
     require => [
                  Package['pypy'],
                  Package['python-jinja2'],
                  Exec["fetch_sitescripts"]