Unverified Commit 7f4c4c30 authored by Francesco Di Nucci's avatar Francesco Di Nucci Committed by GitHub
Browse files

Merge pull request #457 from marcusdots/master 

Switch Default for Restart-Command to systemctl
parents bc4ab0c1 3e678a97

REFERENCE.md

+0 −1
Changes for REFERENCE.md: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1310,4 +1310,3 @@ Returns: `Enum['cdb','dir','lmdb','db']` The file extension of the table type 
Data type: `String[1]`



The table type to report on

data/common.yaml

+1 −1
Changes for data/common.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ postfix::params::seltype: ~ 
postfix::params::postfix_package: 'postfix'

postfix::params::mailx_package: 'mailx'

postfix::params::master_os_template: "postfix/master.cf.default.erb"

postfix::params::restart_cmd: '/etc/init.d/postfix reload'

postfix::params::restart_cmd: '/usr/bin/systemctl reload postfix'

...

data/os/Alpine.yaml

+1 −0
Changes for data/os/Alpine.yaml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
---

postfix::params::master_os_template: "postfix/master.cf.debian.erb"

postfix::params::restart_cmd: '/etc/init.d/postfix reload'

data/osfamily/RedHat.yaml

+0 −1
Changes for data/osfamily/RedHat.yaml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line 
---

postfix::params::aliasesseltype: 'etc_aliases_t'

postfix::params::seltype: 'postfix_etc_t'

postfix::params::restart_cmd: '/bin/systemctl reload postfix'

postfix::params::master_os_template: 'postfix/master.cf.redhat.erb'

postfix::mta_bin_path: '/usr/sbin/sendmail.postfix'

...

manifests/service.pp

+2 −6
Changes for manifests/service.pp: 2 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -7,17 +7,13 @@ class postfix::service { 


  $manage_aliases = $postfix::manage_aliases



  exec { 'restart postfix after packages install':

    command     => regsubst($postfix::params::restart_cmd, 'reload', 'restart'),

    refreshonly => true,

    subscribe   => Package['postfix'],

    require     => Class['postfix::files'],

  }

  service { 'postfix':

    ensure    => $postfix::service_ensure,

    enable    => $postfix::service_enabled,

    hasstatus => true,

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

    subscribe => Package['postfix'],

    require   => Class['postfix::files'],

  }

  # Aliases

  if $manage_aliases {