Commit be33e7ef authored by Mickaël Canévet's avatar Mickaël Canévet
Browse files

Merge pull request #78 from smithtrevor/systemd_restart_support 

Systemd restart support
parents 32ebb5d2 cd2a6f8d

manifests/params.pp

+9 −0
Changes for manifests/params.pp: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ class postfix::params { 
        default => undef,

      }



      $restart_cmd = $::operatingsystemmajrelease ? {

        '7'     => '/bin/systemctl reload postfix',

        default => '/etc/init.d/postfix reload',

      }



      $mailx_package = 'mailx'



      $master_os_template = "${module_name}/master.cf.redhat.erb"
@@ -15,6 +20,8 @@ class postfix::params { 
    'Debian': {

      $seltype = undef



      $restart_cmd = '/etc/init.d/postfix reload'



      $mailx_package = $::lsbdistcodename ? {

        /sarge|etch|lenny/ => 'mailx',

        default            => 'bsd-mailx',
@@ -26,6 +33,8 @@ class postfix::params { 
    'Suse': {

      $seltype = undef



      $restart_cmd = '/etc/init.d/postfix reload'



      $mailx_package = 'mailx'



      if $::operatingsystem != 'SLES' {

manifests/service.pp

+1 −1
Changes for manifests/service.pp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ class postfix::service { 
    ensure    => running,

    enable    => true,

    hasstatus => true,

    restart   => '/etc/init.d/postfix reload',

    restart   => $::postfix::params::restart_cmd,

  }

}

spec/classes/postfix_spec.rb

+1 −1
Changes for spec/classes/postfix_spec.rb: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ describe 'postfix' do 
          :ensure    => 'running',

          :enable    => 'true',

          :hasstatus => 'true',

          :restart   => '/etc/init.d/postfix reload'

          :restart   => '/bin/systemctl reload postfix'

      ) }

    end

  end