Merge pull request #34 from netmanagers/master

alvagante · alvagante · commit 0ac12470218c · 2013-09-09T23:19:02.000-07:00
Modify nginx::resource::* to manage different distros
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -147,7 +147,7 @@
 #   Specified keepalive timeout. Default is 65(ms).
 #
 # [*client_max_body_size*]
-#   Specified the max body size of client. Default is 10mb. 
+#   Specified the max body size of client. Default is 10mb.
 #   Increase this param if your nginx is an upload server.
 #
 # [*service_status*]
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -18,7 +18,7 @@
   $worker_connections = 1024
   $keepalive_timeout = 65
   $client_max_body_size = '10m'
-  
+
   ### Application related parameters
 
   $package = $::operatingsystem ? {
diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -44,7 +44,7 @@
   $template_proxy     = 'nginx/vhost/vhost_location_proxy.erb',
   $template_directory = 'nginx/vhost/vhost_location_directory.erb',
   $template_redirect  = 'nginx/vhost/vhost_location_redirect.erb',
-  $location
+  $location           = $title,
 ) {
   File {
     owner  => 'root',
@@ -59,16 +59,21 @@
     default  => file,
   }
 
+  $file_real = $::operatingsystem ? {
+    /(?i:Debian|Ubuntu|Mint)/ => "${nginx::config_dir}/sites-available/${vhost}.conf",
+    default                   => "${nginx::config_dir}/conf.d/${vhost}.conf",
+  }
+
   # Use proxy template if $proxy is defined, otherwise use directory template.
   if ($proxy != undef) {
-    $content_real     = template("${template_proxy}")
-    $content_ssl_real = template("${template_ssl_proxy}")
+    $content_real     = template($template_proxy)
+    $content_ssl_real = template($template_ssl_proxy)
   } else {
     if ($redirect != undef) {
-      $content_real = template("${template_redirect}")
+      $content_real = template($template_redirect)
     } else {
-      $content_real     = template("${template_directory}")
-      $content_ssl_real = template("${template_directory}")
+      $content_real     = template($template_directory)
+      $content_ssl_real = template($template_directory)
     }
   }
 
@@ -91,10 +96,10 @@
 
   ## Create stubs for vHost File Fragment Pattern
   concat::fragment { "${vhost}+${location}+50.tmp":
-    ensure  => $ensure,
+    ensure  => $ensure_real,
     order   => '50',
     content => $content_real,
-    target  => "${nginx::config_dir}/sites-available/${vhost}.conf",
+    target  => $file_real,
   }
 
   if ($mixin_ssl) {
@@ -103,7 +108,7 @@
       ensure  => $ssl,
       order   => '80',
       content => $content_ssl_real,
-      target  => "${nginx::config_dir}/sites-available/${vhost}.conf",
+      target  => $file_real,
     }
   }
 }
diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
@@ -20,22 +20,24 @@
 #    ],
 #  }
 define nginx::resource::upstream (
+  $members,
   $ensure            = 'present',
   $template_upstream = 'nginx/conf.d/upstream.erb',
-  $members
 ) {
   File {
     owner => 'root',
     group => 'root',
     mode  => '0644',
   }
 
+  $real_file = $ensure ? {
+    'absent' => absent,
+    default  => 'file',
+  }
+
   file { "${nginx::config_dir}/conf.d/${name}-upstream.conf":
-    ensure   => $ensure ? {
-      'absent' => absent,
-      default  => 'file',
-    },
-    content  => template("${template_upstream}"),
+    ensure   => $real_file,
+    content  => template($template_upstream),
     notify   => $nginx::manage_service_autorestart,
   }
 }
diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -33,7 +33,7 @@
 #    ssl_key  => '/tmp/server.pem',
 #  }
 define nginx::resource::vhost(
-  $ensure              = 'present',
+  $ensure              = present,
   $listen_ip           = '*',
   $listen_port         = '80',
   $ipv6_enable         = false,
@@ -63,21 +63,41 @@
     mode    => '0644',
     require => Package['nginx']
   }
+
+  include nginx
   include concat::setup
-  concat { "${nginx::config_dir}/sites-available/${name}.conf":
-  }
 
-  file { "${nginx::config_dir}/sites-enabled/${name}.conf":
-    ensure  => $ensure ? {
-      'absent' => absent,
-       default  => 'link',
-    },
-    target => "${nginx::config_dir}/sites-available/${name}.conf",
+  # Some OS specific settings:
+  # On Debian/Ubuntu manages sites-enabled
+  case $::operatingsystem {
+    ubuntu,debian,mint: {
+      $file_real = "${nginx::config_dir}/sites-available/${name}.conf"
+
+      $manage_file = $ensure ? {
+        present => link,
+        absent  => absent,
+      }
+
+      file { "${nginx::config_dir}/sites-enabled/${name}.conf":
+        ensure  => $manage_file,
+        target  => $file_real,
+        require => [Package['nginx'], File[$file_real], ],
+        notify  => Service['nginx'],
+      }
+    }
+    redhat,centos,scientific,fedora: {
+      $file_real = "${nginx::config_dir}/conf.d/${name}.conf"
+      # include nginx::redhat
+    }
+    default: { }
   }
 
+
+  concat { $file_real: }
+
   # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
   # and support does not exist for it in the kernel.
-  if ($ipv6_enable == 'true') and ($ipaddress6)  {
+  if ($ipv6_enable == true) and ($ipaddress6)  {
     warning('nginx: IPv6 support is not enabled or configured properly')
   }
 
@@ -91,11 +111,11 @@
   # Use the File Fragment Pattern to construct the configuration files.
   # Create the base configuration file reference.
   concat::fragment { "${name}+01.tmp":
-    order   => '01',
-    content => template("${template_header}"),
     ensure  => $ensure,
+    order   => '01',
+    content => template($template_header),
     notify  => $nginx::manage_service_autorestart,
-    target  => "${nginx::config_dir}/sites-available/${name}.conf",
+    target  => $file_real,
   }
 
   # Create the default location reference for the vHost
@@ -116,26 +136,26 @@
 
   # Create a proper file close stub.
   concat::fragment { "${name}+69.tmp":
-    order   => '69',
-    content => template("${template_footer}"),
     ensure  => $ensure,
+    order   => '69',
+    content => template($template_footer),
     notify  => $nginx::manage_service_autorestart,
-    target  => "${nginx::config_dir}/sites-available/${name}.conf",
+    target  => $file_real,
   }
 
   # Create SSL File Stubs if SSL is enabled
   concat::fragment { "${name}+70-ssl.tmp":
-    order   => '70',
-    content => template("${template_ssl_header}"),
     ensure  => $ssl,
+    order   => '70',
+    content => template($template_ssl_header),
     notify  => $nginx::manage_service_autorestart,
-    target  => "${nginx::config_dir}/sites-available/${name}.conf",
+    target  => $file_real,
   }
   concat::fragment { "${name}+99-ssl.tmp":
-    order   => '99',
-    content => template("${template_footer}"),
     ensure  => $ssl,
+    order   => '99',
+    content => template($template_footer),
     notify  => $nginx::manage_service_autorestart,
-    target  => "${nginx::config_dir}/sites-available/${name}.conf",
+    target  => $file_real,
   }
 }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -37,12 +37,12 @@
   include nginx::params
 
   $real_owner = $owner ? {
-    ''      => "${nginx::config_file_owner}",
+    ''      => $nginx::config_file_owner,
     default => $owner,
   }
 
   $real_groupowner = $groupowner ? {
-    ''      => "${nginx::config_file_group}",
+    ''      => $nginx::config_file_group,
     default => $groupowner,
   }
 
@@ -58,15 +58,17 @@
   }
 
   # Some OS specific settings:
-  # On Debian/Ubuntu manages sites-enabled 
+  # On Debian/Ubuntu manages sites-enabled
   case $::operatingsystem {
     ubuntu,debian,mint: {
-      file { "NginxVHostEnabled_$name":
+      $manage_file = $enable ? {
+        true  => "${nginx::vdir}/${priority}-${name}.conf",
+        false => absent,
+      }
+
+      file { "NginxVHostEnabled_${name}":
+        ensure  => $manage_file,
         path    => "/etc/nginx/sites-enabled/${priority}-${name}.conf",
-        ensure  => $enable ? {
-          true  => "${nginx::vdir}/${priority}-${name}.conf",
-          false => absent,
-        },
         require => Package['nginx'],
         notify  => Service['nginx'],
       }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@`
`147`	`147`	`# Specified keepalive timeout. Default is 65(ms).`
`148`	`148`	`#`
`149`	`149`	`# [client_max_body_size]`
`150`		`-# Specified the max body size of client. Default is 10mb.`
	`150`	`+# Specified the max body size of client. Default is 10mb.`
`151`	`151`	`# Increase this param if your nginx is an upload server.`
`152`	`152`	`#`
`153`	`153`	`# [service_status]`