apache, yum: Prevent mod_spdy post-install from modifying the yum repo file

This commit is contained in:
Ossi Salmi 2014-07-19 21:33:37 +03:00
parent 5ac54d2870
commit e913593020
2 changed files with 12 additions and 4 deletions

View file

@ -980,11 +980,10 @@ class apache::mod::spdy {
$spdy_package = "mod-spdy-beta" $spdy_package = "mod-spdy-beta"
include yum::repo::mod_spdy require yum::repo::mod_spdy
package { $spdy_package: package { $spdy_package:
ensure => installed, ensure => installed,
require => Yum::Repo["mod_spdy"],
} }
apache::configfile { "spdy.conf": apache::configfile { "spdy.conf":

View file

@ -654,14 +654,23 @@ class yum::repo::puppetlabs::dependencies {
} }
# Add Google's mod_spdy repository # Add Google's mod_spdy repository
# #
class yum::repo::mod_spdy { class yum::repo::mod_spdy {
yum::repo { "mod_spdy": yum::repo { "mod-spdy":
descr => "mod_spdy Repository", descr => "mod_spdy Repository",
baseurl => "http://dl.google.com/linux/mod-spdy/rpm/stable/x86_64", baseurl => "http://dl.google.com/linux/mod-spdy/rpm/stable/x86_64",
gpgkey => "puppet:///modules/yum/keys/google.key", gpgkey => "puppet:///modules/yum/keys/google.key",
} }
file { "/etc/default/mod-spdy":
ensure => present,
mode => "0644",
owner => "root",
group => "root",
content => "repo_add_once=\"false\"\n",
}
} }