Removed extra upstart script, added sysconfig for actionrunner

StackStorm · Oct 9, 2015 · dcae020 · dcae020
1 parent 693bf1c
commit dcae020
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/manifests/profile/server.pp b/manifests/profile/server.pp
@@ -308,15 +308,6 @@
 
   if $_ng_init {
 
-    file { '/etc/init/st2actionrunner.conf':
-      ensure => present,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0444',
-      source => 'puppet:///modules/st2/etc/init/st2actionrunner.conf',
-      notify => Service['st2actionrunner'],
-    }
-
     # Spin up any number of workers as needed
     $_workers = prefix(range("0", "${workers}"), "worker")
 
@@ -327,6 +318,13 @@
         process => 'actionrunner'
       }
 
+      file{'/etc/sysconfig/st2actionrunner':
+        ensure => 'present',
+        owner  => 'root',
+        group  => 'root',
+        mode   => '0640'
+      }
+
       file_line{'st2actionrunner count':
         path => '/etc/sysconfig/st2actionrunner',
         line => "WORKERSNUM=${_workers}"
@@ -363,15 +361,15 @@
 
     if $manage_st2web_service {
       $init_provider = $::st2::params::init_type
-      if $operatingsystem == 'Ubuntu' {
+      if $osfamily == 'Debian' {
         file { '/etc/init/st2web.conf':
           ensure => present,
           owner  => 'root',
           group  => 'root',
           mode   => '0444',
           source => 'puppet:///modules/st2/etc/init/st2web.conf',
         }
-      } elsif $operatingsystem == 'RedHat' {
+      } elsif $osfamily == 'RedHat' {
         case $operatingsystemmajrelease {
           '7': {
             file { "/etc/systemd/system/st2web.service":