Commit 22f39b9a authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

fix an exec path and add TLSv1.0 override to debian::old

parent 925ae23c

manifests/debian.pp

+4 −2
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ 
# transition clearer.



# Releases wheezy and older

class apache::debian::old {

class apache::debian::old(

  $disable_TLS10 = false

){

  exec { 'a2dissite 000-default':

    command => 'a2dissite 000-default',

    onlyif  => 'readlink /etc/apache2/sites-enabled/000-default | grep sites-available/default',
@@ -18,7 +20,7 @@ class apache::debian::old { 


  # Disable weak SSL ciphers.

  file { '/etc/apache2/conf.d/ssl-strength':

    source  => 'puppet:///modules/apache/etc/apache2/conf.d/ssl-strength',

    content => template('apache/etc/apache2/conf.d/ssl-strength.erb'),

    require => Package['apache'],

    notify  => Service['apache'],

  }

manifests/module.pp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ define apache::module($ensure) { 
  # Enable or disable the module using a2enmod or a2dismod.

  exec { $cmd:

    command => $cmd,

    path    => '/usr/sbin',

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

    require => Package['apache'],

    unless  => "[ $condition ]",

    notify  => Exec['apache reload'];