diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-17 18:28:27 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-17 18:28:27 -0200 |
| commit | c0d9ca41b09094b1973c5cf9f13838aec5b7af99 (patch) | |
| tree | b93b36707541046f0573af9c444712a5296eb8da | |
| parent | 243b7801f4167bd00ae25ec3937696c7c8bedcb9 (diff) | |
| download | puppet-nginx-c0d9ca41b09094b1973c5cf9f13838aec5b7af99.tar.gz puppet-nginx-c0d9ca41b09094b1973c5cf9f13838aec5b7af99.tar.bz2 | |
Fixing definitions
| -rw-r--r-- | manifests/init.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 941fa4f..0eca3f9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -38,7 +38,7 @@ class nginx::base { enable => true, ensure => running, hasrestart => true, - require => [ File["/etc/nginx/sites-enabled/$domain"], Package["nginx"] ], + require => Package["nginx"], } define site($site = $domain, $ensure = present) { @@ -95,8 +95,8 @@ class nginx inherits nginx::base { } Service["nginx"] { - require => [ File["/etc/nginx/sites-enabled/$domain"], - Package["nginx"], + require => [ Package["nginx"], + File["/etc/nginx/sites-enabled/$domain"], File["/etc/ssl/private/cert.pem"], File["/etc/ssl/certs/cert.crt"] ], } @@ -115,7 +115,7 @@ class nginx::puppetmaster inherits nginx::base { $puppetmaster_servers = [ "127.0.0.1:18140" ]) { file { "/etc/nginx/sites-available/$name": - content => "puppetmaster.erb", + content => template("nginx/puppetmaster.erb"), owner => "root", group => "root", mode => 0644, |