Merge pull request #167 from 3flex/concat

Switch to using concat{} instead of lots of file{} magic.

.gitignore

@@ -4,4 +4,5 @@ pkg/
 .librarian/
 .tmp/
 pkg/
+Gemfile.lock
 spec/fixtures/

.nodeset.yml

@@ -29,7 +29,3 @@ sets:
     nodes:
       "main.foo.vm":
         prefab: 'ubuntu-server-12042-x64'
-  'sles-11sp1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'sles-11sp1-x64'

Gemfile

@@ -9,6 +9,6 @@ group :rake do
   gem 'puppet-blacksmith'
   gem 'librarian-puppet-maestrodev'
   gem 'rspec-system-puppet',     :require => false
-  gem 'serverspec',              :require => false
+  gem 'serverspec',   '~> 0.11.0', :require => false
   gem 'rspec-system-serverspec', :require => false
 end

Modulefile

@@ -9,3 +9,4 @@ project_page 'http://github.com/jfryman/puppet-nginx'
 
 dependency 'puppetlabs/stdlib', '>= 0.1.6'
 dependency 'puppetlabs/apt', '>= 1.0.0'
+dependency 'puppetlabs/concat', '>= 1.0.0'

Puppetfile

@@ -2,3 +2,4 @@ forge 'http://forge.puppetlabs.com'
 
 mod 'puppetlabs/stdlib', '>=0.1.6'
 mod 'puppetlabs/apt', '>=1.0.0'
+mod 'puppetlabs/concat', '>=1.0.0'

Puppetfile.lock

@@ -3,9 +3,11 @@ FORGE
   specs:
     puppetlabs/apt (1.2.0)
       puppetlabs/stdlib (>= 2.2.1)
+    puppetlabs/concat (1.0.0)
     puppetlabs/stdlib (4.1.0)
 
 DEPENDENCIES
   puppetlabs/apt (>= 1.0.0)
+  puppetlabs/concat (>= 1.0.0)
   puppetlabs/stdlib (>= 0.1.6)
 

manifests/config.pp

@@ -49,7 +49,6 @@
   }
   if $confd_purge == true {
     File["${nginx::params::nx_conf_dir}/conf.d"] {
-      ignore  => 'vhost_autogen.conf',
       purge   => true,
       recurse => true,
     }
@@ -60,12 +59,19 @@
   }
   if $confd_purge == true {
     File["${nginx::params::nx_conf_dir}/conf.mail.d"] {
-      ignore  => 'vhost_autogen.conf',
       purge   => true,
       recurse => true,
     }
   }
 
+  file { "${nginx::params::nx_conf_dir}/conf.d/vhost_autogen.conf":
+    ensure => absent,
+  }
+
+  file { "${nginx::params::nx_conf_dir}/conf.mail.d/vhost_autogen.conf":
+    ensure => absent,
+  }
+
   file {$nginx::config::nx_run_dir:
     ensure => directory,
   }
@@ -80,6 +86,14 @@
     owner  => $nginx::params::nx_daemon_user,
   }
 
+  file { "${nginx::params::nx_conf_dir}/sites-available":
+    ensure => directory,
+  }
+
+  file { "${nginx::params::nx_conf_dir}/sites-enabled":
+    ensure => directory,
+  }
+
   file { '/etc/nginx/sites-enabled/default':
     ensure => absent,
   }
@@ -95,13 +109,13 @@
   }
 
   file { "${nginx::config::nx_temp_dir}/nginx.d":
-    ensure  => directory,
+    ensure  => absent,
     purge   => true,
     recurse => true,
   }
 
   file { "${nginx::config::nx_temp_dir}/nginx.mail.d":
-    ensure  => directory,
+    ensure  => absent,
     purge   => true,
     recurse => true,
   }

manifests/resource/location.pp

@@ -129,6 +129,7 @@
     'absent' => absent,
     default  => file,
   }
+  $config_file = "${nginx::config::nx_conf_dir}/sites-available/${vhost}.conf"
 
   $location_sanitized = regsubst($location, '\/', '_', 'G')
 
@@ -168,18 +169,20 @@
 
   ## Create stubs for vHost File Fragment Pattern
   if ($ssl_only != true) {
-    file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-${priority}-${location_sanitized}":
-      ensure  => $ensure_real,
+    concat::fragment { "${vhost}-${priority}-${location_sanitized}":
+      target  => $config_file,
       content => $content_real,
+      order   => $priority,
     }
   }
 
   ## Only create SSL Specific locations if $ssl is true.
   if ($ssl == true) {
     $ssl_priority = $priority + 300
-    file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-${ssl_priority}-${location_sanitized}-ssl":
-      ensure  => $ensure_real,
+    concat::fragment {"${vhost}-${ssl_priority}-${location_sanitized}-ssl":
+      target  => $config_file,
       content => $content_real,
+      order   => $ssl_priority,
     }
   }
 

manifests/resource/mailhost.pp

@@ -67,6 +67,8 @@
 
   validate_array($server_name)
 
+  $config_file = "${nginx::config::nx_conf_dir}/conf.mail.d/${name}.conf"
+
   # 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 and !$::ipaddress6) {
@@ -80,28 +82,27 @@
     }
   }
 
-  # Use the File Fragment Pattern to construct the configuration files.
-  # Create the base configuration file reference.
+  concat { $config_file:
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0644',
+    notify => Class['nginx::service'],
+  }
+
   if ($listen_port != $ssl_port) {
-    file { "${nginx::config::nx_temp_dir}/nginx.mail.d/${name}-001":
-      ensure  => $ensure ? {
-        'absent' => absent,
-        default  => 'file',
-      },
+    concat::fragment { "${name}-header":
+      target  => $config_file,
       content => template('nginx/mailhost/mailhost.erb'),
-      notify  => Class['nginx::service'],
+      order   => '001',
     }
   }
 
   # Create SSL File Stubs if SSL is enabled
   if ($ssl) {
-    file { "${nginx::config::nx_temp_dir}/nginx.mail.d/${name}-700-ssl":
-      ensure  => $ensure ? {
-        'absent' => absent,
-        default  => 'file',
-      },
+    concat::fragment { "${name}-ssl":
+      target  => $config_file,
       content => template('nginx/mailhost/mailhost_ssl.erb'),
-      notify  => Class['nginx::service'],
+      order   => '700',
     }
   }
 }

manifests/resource/vhost.pp

@@ -144,6 +144,15 @@
   validate_array($index_files)
   validate_array($server_name)
 
+  # Variables
+  $vhost_dir = "${nginx::config::nx_conf_dir}/sites-available"
+  $vhost_enable_dir = "${nginx::config::nx_conf_dir}/sites-enabled"
+  $vhost_symlink_ensure = $ensure ? {
+    'absent' => absent,
+    default  => 'link',
+  }
+  $config_file = "${vhost_dir}/${name}.conf"
+
   File {
     ensure => $ensure ? {
       'absent' => absent,
@@ -181,6 +190,13 @@
     default => $error_log,
   }
 
+  concat { $config_file:
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0644',
+    notify => Class['nginx::service'],
+  }
+
   if ($ssl == true) and ($ssl_port == $listen_port) {
     $ssl_only = true
   }
@@ -231,22 +247,21 @@
     }
   }
 
-  # Use the File Fragment Pattern to construct the configuration files.
-  # Create the base configuration file reference.
   if ($listen_port != $ssl_port) {
-    file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-001":
-      ensure  => $ensure ? {
-        'absent' => absent,
-        default  => 'file',
-      },
+    concat::fragment { "${name}-header":
+      target  => $config_file,
       content => template('nginx/vhost/vhost_header.erb'),
-      notify  => Class['nginx::service'],
+      order   => '001',
     }
   }
 
   # Create a proper file close stub.
   if ($listen_port != $ssl_port) {
-    file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-699": content => template('nginx/vhost/vhost_footer.erb'), }
+    concat::fragment { "${name}-footer":
+      target  => $config_file,
+      content => template('nginx/vhost/vhost_footer.erb'),
+      order   => '699',
+    }
   }
 
   # Create SSL File Stubs if SSL is enabled
@@ -260,25 +275,19 @@
       undef   => "${nginx::params::nx_logdir}/ssl-${domain_log_name}.error.log",
       default => $error_log,
     }
-    file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl":
-      ensure  => $ensure ? {
-        'absent' => absent,
-        default  => 'file',
-      },
+
+    concat::fragment { "${name}-ssl-header":
+      target  => $config_file,
       content => template('nginx/vhost/vhost_ssl_header.erb'),
-      notify  => Class['nginx::service'],
+      order   => '700',
     }
-    file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-999-ssl":
-      ensure  => $ensure ? {
-        'absent' => absent,
-        default  => 'file',
-      },
+    concat::fragment { "${name}-ssl-footer":
+      target  => $config_file,
       content => template('nginx/vhost/vhost_ssl_footer.erb'),
-      notify  => Class['nginx::service'],
+      order   => '999',
     }
 
     #Generate ssl key/cert with provided file-locations
-
     $cert = regsubst($name,' ','_')
 
     # Check if the file has been defined before creating the file to
@@ -294,4 +303,12 @@
       source => $ssl_key,
     })
   }
+
+  file{ "${name}.conf symlink":
+    ensure  => $vhost_symlink_ensure,
+    path    => "${vhost_enable_dir}/${name}.conf",
+    target  => $config_file,
+    require => Concat[$config_file],
+    notify  => Service['nginx'],
+  }
 }