From 765f9f91a40e91e7655b0e4bac3ef5e53be429c5 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Wed, 21 Dec 2016 12:49:24 +0100 Subject: [PATCH] Bump puppetlabs-apache to 1.11.0 Change-Id: I3d7930999b9548090c4a094352c9a1cff16e62a3 Closes-Bug: #1653107 --- deployment/Puppetfile | 2 +- deployment/puppet/cobbler/manifests/server.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/Puppetfile b/deployment/Puppetfile index f004dd1466..8601c0bb68 100644 --- a/deployment/Puppetfile +++ b/deployment/Puppetfile @@ -59,7 +59,7 @@ mod 'ntp', # Pull in puppetlabs-apache mod 'apache', :git => 'https://github.com/fuel-infra/puppetlabs-apache.git', - :ref => '1.9.0' + :ref => '1.11.0' # Pull in puppetlabs-apt mod 'apt', diff --git a/deployment/puppet/cobbler/manifests/server.pp b/deployment/puppet/cobbler/manifests/server.pp index fd0122203c..9753fb708e 100644 --- a/deployment/puppet/cobbler/manifests/server.pp +++ b/deployment/puppet/cobbler/manifests/server.pp @@ -64,7 +64,7 @@ class cobbler::server ( notify => Service['xinetd'], } - file { '/etc/httpd/conf.d/ssl.conf': + File<| title == '/etc/httpd/conf.d/ssl.conf' |> { ensure => absent }