From c4841ba03b8892583df1d7f37af5391b04833000 Mon Sep 17 00:00:00 2001
From: Al Wiesner <awiesner@fedora.awiesner>
Date: Tue, 8 Mar 2016 11:46:46 -0500
Subject: [PATCH 1/6] added include statement to nginx.conf.erb for
 streams-enabled dir

---
 templates/conf.d/nginx.conf.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb
index f239d9fe9..1c6fc2d8c 100644
--- a/templates/conf.d/nginx.conf.erb
+++ b/templates/conf.d/nginx.conf.erb
@@ -156,5 +156,6 @@ mail {
 <% if @stream -%>
 stream {
   include <%= @conf_dir %>/conf.stream.d/*.conf;
+  include <%= @conf_dir %>/streams-enabled/*.conf;
 }
 <% end -%>

From 35069a3a8e47d9705ed9f4453dda2b7ad3dbd238 Mon Sep 17 00:00:00 2001
From: Al Wiesner <awiesner@fedora.awiesner>
Date: Tue, 8 Mar 2016 12:52:27 -0500
Subject: [PATCH 2/6] removed server_name from streamhost.erb as it is invalid
 parameter for nginx streams

---
 templates/streamhost/streamhost.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/streamhost/streamhost.erb b/templates/streamhost/streamhost.erb
index 260648a5d..b91c2317c 100644
--- a/templates/streamhost/streamhost.erb
+++ b/templates/streamhost/streamhost.erb
@@ -17,7 +17,6 @@ server {
   listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %>;
   <%- end -%>
 <%- end -%>
-  server_name           <%= @server_name.join(" ") %>;
 
   <% Array(@raw_prepend).each do |line| -%>
     <%= line %>

From 86ca9327b88dc69a28c69dc79617ec7bb318efb3 Mon Sep 17 00:00:00 2001
From: Al Wiesner <awiesner@fedora.awiesner>
Date: Tue, 8 Mar 2016 13:05:22 -0500
Subject: [PATCH 3/6] need to ensure /etc/nginx/streams-available and
 /etc/nginx/streams-enabled exist

---
 manifests/resource/streamhost.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/manifests/resource/streamhost.pp b/manifests/resource/streamhost.pp
index 7ec69dbc3..b10aa761f 100644
--- a/manifests/resource/streamhost.pp
+++ b/manifests/resource/streamhost.pp
@@ -112,6 +112,17 @@
     'absent' => absent,
     default  => 'link',
   }
+  
+  file {
+    default:
+      ensure  => directory,
+      mode    => '0755',
+    ; 
+    "${streamhost_dir}":
+    ;
+    "${streamhost_enable_dir}":
+    ;
+  }
 
   $name_sanitized = regsubst($name, ' ', '_', 'G')
   $config_file = "${streamhost_dir}/${name_sanitized}.conf"

From 0749d17312414e93a01ec23c785f94445b4cf667 Mon Sep 17 00:00:00 2001
From: Al Wiesner <awiesner@fedora.awiesner>
Date: Tue, 8 Mar 2016 13:16:44 -0500
Subject: [PATCH 4/6] adding require to file creation for streamhost files

---
 manifests/resource/streamhost.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/resource/streamhost.pp b/manifests/resource/streamhost.pp
index b10aa761f..7e6ef830f 100644
--- a/manifests/resource/streamhost.pp
+++ b/manifests/resource/streamhost.pp
@@ -131,6 +131,10 @@
     ensure => $ensure ? {
       'absent' => absent,
       default  => 'file',
+      require  => [
+        File["${streamhost_dir}"],
+        File["${streamhost_enable_dir}"],
+      ],
     },
     notify => Class['::nginx::service'],
     owner  => $owner,

From b4ec22d86f7280a0d2e510a564ff89d47d27013a Mon Sep 17 00:00:00 2001
From: Al Wiesner <awiesner@fedora.awiesner>
Date: Tue, 8 Mar 2016 13:53:41 -0500
Subject: [PATCH 5/6] fixing file resource implementation

---
 manifests/resource/streamhost.pp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/manifests/resource/streamhost.pp b/manifests/resource/streamhost.pp
index 7e6ef830f..4ddd8802d 100644
--- a/manifests/resource/streamhost.pp
+++ b/manifests/resource/streamhost.pp
@@ -113,15 +113,11 @@
     default  => 'link',
   }
   
-  file {
-    default:
+  file {[$streamhost_dir, $streamhost_enable_dir]:
       ensure  => directory,
-      mode    => '0755',
-    ; 
-    "${streamhost_dir}":
-    ;
-    "${streamhost_enable_dir}":
-    ;
+      owner   => $owner,
+      group   => $group,
+      mode    => $mode,
   }
 
   $name_sanitized = regsubst($name, ' ', '_', 'G')
@@ -132,8 +128,8 @@
       'absent' => absent,
       default  => 'file',
       require  => [
-        File["${streamhost_dir}"],
-        File["${streamhost_enable_dir}"],
+        File[$streamhost_dir],
+        File[$streamhost_enable_dir],
       ],
     },
     notify => Class['::nginx::service'],

From aff441b145cc8ad0b67dca5c8661b8ecfac10384 Mon Sep 17 00:00:00 2001
From: Al Wiesner <awiesner@fedora.awiesner>
Date: Tue, 8 Mar 2016 14:02:51 -0500
Subject: [PATCH 6/6] fixing indentation issues

---
 manifests/resource/streamhost.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/resource/streamhost.pp b/manifests/resource/streamhost.pp
index 4ddd8802d..c4cbf776f 100644
--- a/manifests/resource/streamhost.pp
+++ b/manifests/resource/streamhost.pp
@@ -114,10 +114,10 @@
   }
   
   file {[$streamhost_dir, $streamhost_enable_dir]:
-      ensure  => directory,
-      owner   => $owner,
-      group   => $group,
-      mode    => $mode,
+    ensure  => directory,
+    owner   => $owner,
+    group   => $group,
+    mode    => $mode,
   }
 
   $name_sanitized = regsubst($name, ' ', '_', 'G')