Cleanup

diff --git a/manifests/init.pp b/manifests/init.pp
index 7d28fa1eeea4b3510e68914edf2b8fda5e03c14d..894cb5eb8eb3c8fcfd5e0ee012f23daa4dd517ee 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,25 +41,40 @@ class nginx::base {
     require    => Package["nginx"],
   }
 
-  define site($site = $domain, $ensure = present) {
+  define site($ensure = present, $source = 'file') {
     # Proxy config file
-    file { "/etc/nginx/sites-available/$site":
-      source  => "puppet://$server/files/etc/nginx/$site",
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      ensure  => $ensure,
-      notify  => Service["nginx"],
-      require => File["/etc/nginx/sites-available"],
+    case $source {
+      'file': {
+        file { "/etc/nginx/sites-available/$name":
+          source  => "puppet://$server/files/etc/nginx/$name",
+          owner   => "root",
+          group   => "root",
+          mode    => 0644,
+          ensure  => $ensure,
+          notify  => Service["nginx"],
+          require => File["/etc/nginx/sites-available"],
+        }
+      }
+      'template': {
+        file { "/etc/nginx/sites-available/$name":
+          source  => content("nginx/$name.erb"),
+          owner   => "root",
+          group   => "root",
+          mode    => 0644,
+          ensure  => $ensure,
+          notify  => Service["nginx"],
+          require => File["/etc/nginx/sites-available"],
+        }
+      }
     }
 
     $link = $ensure ? {
-      present => "/etc/nginx/sites-available/$site",
+      present => "/etc/nginx/sites-available/$name",
       default => absent,
     }
   
     # Symlink to enable proxy configuration
-    file { "/etc/nginx/sites-enabled/$site":
+    file { "/etc/nginx/sites-enabled/$name":
       ensure  => $link,
       require => File["/etc/nginx/sites-enabled"],
       notify  => Service["nginx"],
@@ -124,21 +139,10 @@ class nginx::puppetmaster inherits nginx::base {
       notify  => Service["nginx"],
     }
 
-    file { "/etc/nginx/sites-available/$name":
-      content => template("nginx/puppetmaster.erb"),
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
+    site { "puppetmaster":
       ensure  => present,
-      notify  => Service["nginx"],
-      require => File["/etc/nginx/sites-available"],
-    }
-
-    # Symlink to enable proxy configuration
-    file { "/etc/nginx/sites-enabled/$name":
-      ensure  => "/etc/nginx/sites-available/$name",
-      require => File["/etc/nginx/sites-enabled"],
-      notify  => Service["nginx"],
+      source  => 'template',
+      require => File['/etc/nginx/conf.d/puppetmaster.conf'],
     }
   }
 }

diff --git a/templates/puppetmaster.conf.erb b/templates/puppetmaster.conf.erb
index e74c39d55e80fc80ffaa5be8e3ded9a24fdfe29c..9671bb30ee8480c05d6df14dcc7122ec7c3e526c 100644 (file)
--- a/templates/puppetmaster.conf.erb
+++ b/templates/puppetmaster.conf.erb
@@ -4,8 +4,8 @@
 # service in Puppet.
 
 ssl                     on;
-ssl_certificate         /var/lib/puppet/ssl/certs/puppetmaster.example.com.pem;
-ssl_certificate_key     /var/lib/puppet/ssl/private_keys/puppetmaster.example.com.pem;
+ssl_certificate         /var/lib/puppet/ssl/certs/puppet.<%= domain %>.pem;
+ssl_certificate_key     /var/lib/puppet/ssl/private_keys/puppet.<%= domain %>.pem;
 ssl_client_certificate  /var/lib/puppet/ssl/certs/ca.pem;
 ssl_ciphers             SSLv2:-LOW:-EXPORT:RC4+RSA;
 ssl_session_cache       shared:SSL:8m;