Commit 63d91dac authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

release/002.001

parent 09ffcdea

NEWS

+4 −0
Original line number Diff line number Diff line 
release/002.001 (2018-06-21)



    Update conf.pp to handle stretch (adamhl)



release/002.000 (2018-04-30)



    Change 'cert-files' to 'cert_files' (modules cannot have dashes!)

manifests/conf.pp

+25 −25
Original line number Diff line number Diff line
@@ -28,31 +28,7 @@ define apache::conf( 
    fail("Unsupported apache::conf operating system ${::operatingsystem}")

  }



  if $lsbdistcodename == 'jessie' {

    # For jessie the $directory value is ignored.  Everything must

    # be in /etc/apache2/conf-enabled



    if $name =~ /.conf$/ {

      $conf_id = $name

    } else {

      $conf_id = "${name}.conf"

    }

    # Install the file.

    file { "/etc/apache2/conf-available/$conf_id":

      ensure  => $ensure,

      source  => $source,

      content => $content,

      require => Package['apache'],

      notify  => Exec["a2enconf ${conf_id}"],

    }

    exec { "a2enconf ${conf_id}":

      command     => "a2enconf ${conf_id}",

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

      refreshonly => true,

      require     => File["/etc/apache2/conf-available/$conf_id"],

      notify      => Exec['apache reload'],

    }

  } else {

  if ($lsbdistcodename == 'wheezy') {

    $parent   = "/etc/apache2/${directory}"

    $realname = "${parent}/${name}"
@@ -76,5 +52,29 @@ define apache::conf( 
      notify  => Exec['apache reload'],

      require => Exec["mkparentdir ${realname}"],

    }

  } else {

    # For jessie and later the $directory value is ignored.  Everything

    # must be in /etc/apache2/conf-enabled



    if $name =~ /.conf$/ {

      $conf_id = $name

    } else {

      $conf_id = "${name}.conf"

    }

    # Install the file.

    file { "/etc/apache2/conf-available/$conf_id":

      ensure  => $ensure,

      source  => $source,

      content => $content,

      require => Package['apache'],

      notify  => Exec["a2enconf ${conf_id}"],

    }

    exec { "a2enconf ${conf_id}":

      command     => "a2enconf ${conf_id}",

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

      refreshonly => true,

      require     => File["/etc/apache2/conf-available/$conf_id"],

      notify      => Exec['apache reload'],

    }

  }

}