Issue 245 - Unify SSL configuration for all servers

modules/discourse/manifests/init.pp

Index: modules/discourse/manifests/init.pp
===================================================================
--- a/modules/discourse/manifests/init.pp
+++ b/modules/discourse/manifests/init.pp
@@ -273,36 +273,20 @@ class discourse(
     command => 'bundle exec sidekiq'
   }
 
   class {'nginx':
     worker_processes => 1,
     worker_connections => 500
   }
 
-  file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key':
-    ensure => file,
-    notify => Service['nginx'],
-    before => Nginx::Hostconfig['intraforum.adblockplus.org'],
-    require => Package['nginx'],
-    source => 'puppet:///modules/private/adblockplus.org_sslcert.key'
-  }
-
-  file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem':
-    ensure => file,
-    mode => 0400,
-    notify => Service['nginx'],
-    before => Nginx::Hostconfig[$domain],
-    require => Package['nginx'],
-    source => 'puppet:///modules/private/adblockplus.org_sslcert.pem'
-  }
-
   nginx::hostconfig{$domain:
-    content => template('discourse/site.erb'),
-    enabled => true
-  }
-
-  file {"/etc/logrotate.d/nginx_$domain":
-    ensure => file,
-    require => Nginx::Hostconfig[$domain],
-    source => 'puppet:///modules/discourse/logrotate'
+    source => 'puppet:///modules/discourse/site.conf',
+    global_config => '
+      upstream discourse {
+        server localhost:3000;
+      }',
+    is_default => $is_default,
+    certificate => 'adblockplus.org_sslcert.pem',
+    private_key => 'adblockplus.org_sslcert.key',
+    log => 'access_log_intraforum'
   }
 }