summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp18
1 files changed, 17 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 893fdff..3aebd01 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,7 +57,17 @@ class nginx::base {
}
'template': {
file { "/etc/nginx/sites-available/$name":
- source => content("nginx/$name.erb"),
+ content => template("nginx/$name.erb"),
+ owner => "root",
+ group => "root",
+ mode => 0644,
+ ensure => $ensure,
+ notify => Service["nginx"],
+ require => File["/etc/nginx/sites-available"],
+ }
+ }
+ 'none': {
+ file { "/etc/nginx/sites-available/$name":
owner => "root",
group => "root",
mode => 0644,
@@ -145,6 +155,12 @@ class nginx::puppetmaster inherits nginx::base {
require => File['/etc/nginx/conf.d/puppetmaster.conf'],
}
+ # We don't want nginx to listen at port 80
+ site { "default":
+ source => 'none',
+ ensure => absent,
+ }
+
file { "/etc/nginx/nginx.conf":
content => template("nginx/nginx.conf.erb"),
owner => "root",