Unverified Commit 254cb8f0 authored by cocker-cc's avatar cocker-cc Committed by Marcus Poller
Browse files

Switch Default for Restart-Command to systemctl 

Almost all Linux-Distributions now default to Systemd.  So switch the
Default for Restart-Command to systemctl.

- use /usr/bin/systemctl instead of /bin/systemctl, because with
  usr-Merge the former Dir is dead
- keep Alpine and RedHat 6 on init.d
parent bc4ab0c1

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'

...

data/osfamily/RedHat/6.yaml

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



postfix::params::mailx_package: 's-nail'

postfix::ldap_packages: ['postfix-ldap']

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

spec/classes/postfix_spec.rb

+5 −5
Changes for spec/classes/postfix_spec.rb: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ describe 'postfix' do 
              ensure: 'running',

              enable: 'true',

              hasstatus: 'true',

              restart: '/etc/init.d/postfix reload',

              restart: '/usr/bin/systemctl reload postfix'

            )

          }

        end
@@ -112,7 +112,7 @@ describe 'postfix' do 
                ensure: 'running',

                enable: 'true',

                hasstatus: 'true',

                restart: '/bin/systemctl reload postfix',

                restart: '/usr/bin/systemctl reload postfix'

              )

            }

          end
@@ -125,7 +125,7 @@ describe 'postfix' do 
                ensure: 'running',

                enable: 'true',

                hasstatus: 'true',

                restart: '/bin/systemctl reload postfix',

                restart: '/usr/bin/systemctl reload postfix'

              )

            }

          end
@@ -152,7 +152,7 @@ describe 'postfix' do 
              ensure: 'running',

              enable: 'true',

              hasstatus: 'true',

              restart: '/bin/systemctl reload postfix',

              restart: '/usr/bin/systemctl reload postfix'

            )

          }

        end
@@ -235,7 +235,7 @@ describe 'postfix' do 
              ensure: 'running',

              enable: 'true',

              hasstatus: 'true',

              restart: '/etc/init.d/postfix reload',

              restart: '/usr/bin/systemctl reload postfix'

            )

          }