Commit bef35479 authored by Russ Allbery's avatar Russ Allbery
Browse files

Use the service command when reloading Apache 

Use the service command rather than running init scripts directly when
reloading Apache, in preparation for support for non-sysvinit init
systems.  (rra)
parent f0fcddc7

NEWS

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ release/001.003 (unreleased) 
    contains an intermediate certificate signed by a 2048-bit root CA.

    (rra)



    Use the service command rather than running init scripts directly when

    reloading Apache, in preparation for support for non-sysvinit init

    systems.  (rra)



release/001.002 (2013-09-23)



    Cleanup: remove the deprecated files/certs directory.  Certs are now

manifests/init.pp

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ class apache { 
  exec { 'apache reload':

    path       => '/bin:/usr/bin:/sbin:/usr/sbin',

    command    => $operatingsystem ? {

      'debian' => '/etc/init.d/apache2 reload',

      'ubuntu' => '/etc/init.d/apache2 reload',

      'debian' => 'service apache2 reload',

      'ubuntu' => 'service apache2 reload',

      'redhat' => 'sh -c "apachectl configtest && /etc/init.d/httpd reload"',

    },

    refreshonly => true,