Issue 245 - Unify SSL configuration for all servers

modules/trac/manifests/init.pp

Index: modules/trac/manifests/init.pp
===================================================================
--- a/modules/trac/manifests/init.pp
+++ b/modules/trac/manifests/init.pp
@@ -2,39 +2,22 @@ class trac(
     $domain,
     $is_default = false) inherits private::trac {
   package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']:
     ensure => present
   }
 
   include nginx, spawn-fcgi
 
-  file {'/etc/nginx/adblockplus.org_sslcert.key':
-    ensure => file,
-    owner => root,
-    mode => 0644,
-    notify => Service['nginx'],
-    before => Nginx::Hostconfig[$domain],
-    require => Package['nginx'],
-    source => 'puppet:///modules/private/adblockplus.org_sslcert.key'
-  }
-
-  file {'/etc/nginx/adblockplus.org_sslcert.pem':
-    ensure => file,
-    owner => root,
-    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('trac/site.erb'),
-    enabled => true
+    source => 'puppet:///modules/trac/site.conf',
+    is_default => $is_default,
+    certificate => 'adblockplus.org_sslcert.pem',
+    private_key => 'adblockplus.org_sslcert.key',
+    log => 'access_log_trac'
   }
 
   user {'trac':
     ensure => present,
     comment => 'User of the trac installation',
     home => '/home/trac',
     managehome => true
   }