Commit 09815835 authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

handle stretch

parent 6b3a509b

NEWS

+4 −0
Original line number Diff line number Diff line 
unreleased (2017-11-08)



    Update for stretch. (adamhl)



release/001.023 (2017-11-08)



    Add "apache::debian::disable_3DES" parameter to disable DES and

manifests/init.pp

+18 −6
Original line number Diff line number Diff line
@@ -13,13 +13,25 @@ class apache ( 
    include webauth

  }



  if ($osfamily == 'RedHat') {

    package { 'apache':

    name   => $osfamily ? {

      'Debian' => 'apache2-mpm-prefork',

      'RedHat' => 'httpd'

    },

      name   => 'httpd',

      ensure => present,

    }

  } elsif ($osfamily == 'Debian') {

    if (($::lsbdistcodename == 'wheezy') or ($::lsbdistcodename == 'jessie')) {

      package { 'apache':

        name   => 'apache2-mpm-prefork',

        ensure => present,

      }

    } else {

      package { 'apache2':

        ensure => present,

      }

    }

  } else {

    crit("do not know what to do")

  }



  # Name the service apache, which doesn't match the name from either OS but

  # is easier to remember.