Merge pull request #879 from andybotting/create-streams-dirs

Add missing stream dirs and create streams from hiera

manifests/config.pp

@@ -273,6 +273,33 @@
     owner  => $daemon_user,
   }
 
+  if $stream {
+    file { "${conf_dir}/streams-available":
+      ensure => directory,
+      owner  => $sites_available_owner,
+      group  => $sites_available_group,
+      mode   => $sites_available_mode,
+    }
+
+    if $vhost_purge == true {
+      File["${conf_dir}/streams-available"] {
+        purge   => true,
+        recurse => true,
+      }
+    }
+
+    file { "${conf_dir}/streams-enabled":
+      ensure => directory,
+    }
+
+    if $vhost_purge == true {
+      File["${conf_dir}/streams-enabled"] {
+        purge   => true,
+        recurse => true,
+      }
+    }
+  }
+
   file { "${conf_dir}/sites-available":
     ensure => directory,
     owner  => $sites_available_owner,

manifests/init.pp

@@ -124,6 +124,7 @@
   $string_mappings                = {},
   $nginx_locations                = {},
   $nginx_mailhosts                = {},
+  $nginx_streamhosts              = {},
   $nginx_upstreams                = {},
   $nginx_vhosts                   = {},
   $nginx_vhosts_defaults          = {},
@@ -313,6 +314,7 @@
   create_resources('nginx::resource::vhost', $nginx_vhosts, $nginx_vhosts_defaults)
   create_resources('nginx::resource::location', $nginx_locations)
   create_resources('nginx::resource::mailhost', $nginx_mailhosts)
+  create_resources('nginx::resource::streamhost', $nginx_streamhosts)
   create_resources('nginx::resource::map', $string_mappings)
   create_resources('nginx::resource::geo', $geo_mappings)
 

spec/classes/config_spec.rb

@@ -679,6 +679,12 @@
       end
     end
 
+    context 'when stream true' do
+      let(:params) { { stream: true } }
+      it { is_expected.to contain_file('/etc/nginx/streams-available') }
+      it { is_expected.to contain_file('/etc/nginx/streams-enabled') }
+    end
+
     context 'when daemon_user = www-data' do
       let(:params) { { daemon_user: 'www-data' } }
       it { is_expected.to contain_file('/var/nginx/client_body_temp').with(owner: 'www-data') }

spec/classes/nginx_spec.rb

@@ -13,7 +13,8 @@
       nginx_vhosts: { 'test2.local' => { 'www_root' => '/' } },
       nginx_vhosts_defaults: { 'listen_options' => 'default_server' },
       nginx_locations: { 'test2.local' => { 'vhost' => 'test2.local', 'www_root' => '/' } },
-      nginx_mailhosts: { 'smtp.test2.local' => { 'auth_http' => 'server2.example/cgi-bin/auth', 'protocol' => 'smtp', 'listen_port' => 587 } }
+      nginx_mailhosts: { 'smtp.test2.local' => { 'auth_http' => 'server2.example/cgi-bin/auth', 'protocol' => 'smtp', 'listen_port' => 587 } },
+      nginx_streamhosts: { 'streamhost1' => { 'proxy' => 'streamproxy' } }
     }
   end
 
@@ -32,5 +33,6 @@
     it { is_expected.to contain_nginx__resource__vhost('test2.local').with_listen_options('default_server') }
     it { is_expected.to contain_nginx__resource__location('test2.local') }
     it { is_expected.to contain_nginx__resource__mailhost('smtp.test2.local') }
+    it { is_expected.to contain_nginx__resource__streamhost('streamhost1').with_proxy('streamproxy') }
   end
 end