diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-26 16:22:34 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-26 16:22:34 -0200 |
commit | 29016ba83e0b651a12fe4beeafd55b2ab5f58e28 (patch) | |
tree | ac282a96ca2ae93bb14c082ebddbffe6032d9b0c /manifests/base.pp | |
parent | a8c51500710892d097ebe4e86cfe0cc72f31a3f2 (diff) | |
download | puppet-nginx-29016ba83e0b651a12fe4beeafd55b2ab5f58e28.tar.gz puppet-nginx-29016ba83e0b651a12fe4beeafd55b2ab5f58e28.tar.bz2 |
Adds nginx::cache and moves nginx::base::site to nginx::site
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index d47d1fa..7febb79 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -10,11 +10,6 @@ class nginx::base { group => "root", } - # Caching - file { '/var/cache/nginx': - ensure => directory, - } - service { "nginx": enable => true, ensure => running, @@ -22,56 +17,6 @@ class nginx::base { require => [ Package["nginx"], File['/var/cache/nginx'] ], } - define site($ensure = present, $source = 'file') { - # Proxy config file - case $source { - 'file': { - file { "/etc/nginx/sites-available/$name": - source => "puppet:///modules/site_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": - 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, - ensure => $ensure, - notify => Service["nginx"], - require => File["/etc/nginx/sites-available"], - } - } - } - - $link = $ensure ? { - present => "/etc/nginx/sites-available/$name", - default => absent, - } - - # Symlink to enable proxy configuration - file { "/etc/nginx/sites-enabled/$name": - ensure => $link, - require => File["/etc/nginx/sites-enabled"], - notify => Service["nginx"], - } - } - # Main configuration file { "/etc/nginx/nginx.conf": content => template("nginx/nginx.conf.erb"), |