#3100: reduce upstart init script syntax

jeff1evesque · Nov 12, 2017 · 6e37767 · 6e37767
1 parent 50b49b3
commit 6e37767
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/puppet/environment/vagrant/modules/webserver/manifests/service.pp b/puppet/environment/vagrant/modules/webserver/manifests/service.pp
@@ -95,7 +95,7 @@
 
     ## dos2unix: convert clrf (windows to linux) in case host machine is
     ##           windows.
-    file { '/etc/init/start_gunicorn_api.conf':
+    file { '/etc/init/gunicorn_api.conf':
         ensure  => file,
         content => dos2unix(template($template_path_api)),
         require => Class['compiler::initial_compile'],
@@ -104,7 +104,7 @@
 
     ## dos2unix: convert clrf (windows to linux) in case host machine is
     ##           windows.
-    file { '/etc/init/start_gunicorn_web.conf':
+    file { '/etc/init/gunicorn_web.conf':
         ensure  => file,
         content => dos2unix(template($template_path_web)),
         require => Class['compiler::initial_compile'],

diff --git a/puppet/environment/vagrant/modules/webserver/manifests/start.pp b/puppet/environment/vagrant/modules/webserver/manifests/start.pp
@@ -11,25 +11,25 @@
     ## run gunicorn
     if $vagrant_mounted {
         # ensure service starts at boot
-        service { 'start_gunicorn_api':
+        service { 'gunicorn_api':
             ensure  => 'running',
             enable  => true,
             require => Class['webserver::service'],
         }
         # ensure service starts at boot
-        service { 'start_gunicorn_web':
+        service { 'gunicorn_web':
             ensure  => 'running',
             enable  => true,
             require => Class['webserver::service'],
         }
     }
     else {
         ## run and restart when needed
-        service { 'start_gunicorn_api':
+        service { 'gunicorn_api':
             ensure  => 'running',
             require => Class['webserver::service'],
         }
-        service { 'start_gunicorn_web':
+        service { 'gunicorn_web':
             ensure  => 'running',
             require => Class['webserver::service'],
         }