From cf6851c7eb22bca42b46ae733582261878a17e94 Mon Sep 17 00:00:00 2001
From: fnoop <fnoopdogg@gmail.com>
Date: Tue, 21 Nov 2017 08:19:58 +0000
Subject: [PATCH 1/5] Rename service resource name from nginx to puppet_nginx
 #1158

---
 manifests/init.pp    | 2 +-
 manifests/service.pp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a6bcce0c5..cf9b99baa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -150,7 +150,7 @@
   $service_ensure                                            = running,
   $service_flags                                             = undef,
   $service_restart                                           = undef,
-  $service_name                                              = undef,
+  $service_name                                              = "nginx",
   $service_manage                                            = true,
   ### END Service Configuration ###
 
diff --git a/manifests/service.pp b/manifests/service.pp
index 587ed2569..48bd00868 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -40,7 +40,7 @@
   if $service_manage {
     case $::osfamily {
       'OpenBSD': {
-        service { 'nginx':
+        service { 'puppet_nginx':
           ensure     => $service_ensure_real,
           name       => $service_name,
           enable     => $service_enable,
@@ -50,7 +50,7 @@
         }
       }
       default: {
-        service { 'nginx':
+        service { 'puppet_nginx':
           ensure     => $service_ensure_real,
           name       => $service_name,
           enable     => $service_enable,
@@ -63,7 +63,7 @@
 
   # Allow overriding of 'restart' of Service resource; not used by default
   if $service_restart {
-    Service['nginx'] {
+    Service['puppet_nginx'] {
       restart => $service_restart,
     }
   }

From 7e7dbf66deeae822ec3d99174516684b15d7be32 Mon Sep 17 00:00:00 2001
From: fnoop <fnoopdogg@gmail.com>
Date: Tue, 21 Nov 2017 08:46:35 +0000
Subject: [PATCH 2/5] Merge resource name with service name #1158

---
 manifests/service.pp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/manifests/service.pp b/manifests/service.pp
index 48bd00868..e5c6f4a7a 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -40,9 +40,8 @@
   if $service_manage {
     case $::osfamily {
       'OpenBSD': {
-        service { 'puppet_nginx':
+        service { $service_name:
           ensure     => $service_ensure_real,
-          name       => $service_name,
           enable     => $service_enable,
           flags      => $service_flags,
           hasstatus  => true,
@@ -50,7 +49,7 @@
         }
       }
       default: {
-        service { 'puppet_nginx':
+        service { $service_name:
           ensure     => $service_ensure_real,
           name       => $service_name,
           enable     => $service_enable,
@@ -63,7 +62,7 @@
 
   # Allow overriding of 'restart' of Service resource; not used by default
   if $service_restart {
-    Service['puppet_nginx'] {
+    Service[$service_name] {
       restart => $service_restart,
     }
   }

From e557db0dc410d23525731aea15bd6530899395b4 Mon Sep 17 00:00:00 2001
From: fnoop <fnoopdogg@gmail.com>
Date: Tue, 21 Nov 2017 08:50:30 +0000
Subject: [PATCH 3/5] Change service_name to single quotes, #1158

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index cf9b99baa..7c1b468ac 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -150,7 +150,7 @@
   $service_ensure                                            = running,
   $service_flags                                             = undef,
   $service_restart                                           = undef,
-  $service_name                                              = "nginx",
+  $service_name                                              = 'nginx',
   $service_manage                                            = true,
   ### END Service Configuration ###
 

From ad41e15349a61d357d5c41ecb795385f148b3555 Mon Sep 17 00:00:00 2001
From: fnoop <fnoopdogg@gmail.com>
Date: Tue, 21 Nov 2017 09:00:04 +0000
Subject: [PATCH 4/5] Remove superfluous service_name #1158

---
 manifests/service.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/service.pp b/manifests/service.pp
index e5c6f4a7a..a797f57ef 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -51,7 +51,6 @@
       default: {
         service { $service_name:
           ensure     => $service_ensure_real,
-          name       => $service_name,
           enable     => $service_enable,
           hasstatus  => true,
           hasrestart => true,

From 36e6ce5a8b953e15553ef09bcaa986ad09cceb8f Mon Sep 17 00:00:00 2001
From: fnoop <fnoopdogg@gmail.com>
Date: Wed, 22 Nov 2017 10:00:45 +0000
Subject: [PATCH 5/5] Update test to work with service_name param #1158

---
 spec/classes/nginx_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
index 28b40c57b..527977531 100644
--- a/spec/classes/nginx_spec.rb
+++ b/spec/classes/nginx_spec.rb
@@ -211,7 +211,7 @@
             }
           end
 
-          it { is_expected.to contain_service('nginx').with_name('nginx14') }
+          it { is_expected.to contain_service('nginx14') }
         end
 
         describe 'when service_manage => false' do