Enhancing nginx::puppetmaster::disabled

diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index eed6318f03e699a40ceae1c9e86e702a092a41de..b55bfbb4e3f6d649e3796223525541a7787cbea3 100644 (file)
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -44,11 +44,21 @@ class nginx::puppetmaster inherits nginx::base {
 }
 
 class nginx::puppetmaster::disabled inherits nginx::puppetmaster {
+  File["/etc/nginx/nginx.conf", "/etc/nginx/conf.d/puppetmaster.conf",
+       "/etc/nginx", "/etc/nginx/sites-available", "/etc/nginx/sites-enabled"] {
+    ensure => absent,
+  }
+
   Service['nginx'] {
+    enable => false,
     ensure => stopped,
   }
 
   Nginx::Base::Site['puppetmaster'] {
     ensure => absent,
   }
+
+  Package['nginx'] {
+    ensure => absent,
+  }
 }