diff --git a/apache/manifests/init.pp b/apache/manifests/init.pp index a48b471..dea144a 100644 --- a/apache/manifests/init.pp +++ b/apache/manifests/init.pp @@ -980,11 +980,10 @@ class apache::mod::spdy { $spdy_package = "mod-spdy-beta" - include yum::repo::mod_spdy + require yum::repo::mod_spdy package { $spdy_package: - ensure => installed, - require => Yum::Repo["mod_spdy"], + ensure => installed, } apache::configfile { "spdy.conf": diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp index 673b7ee..c34372f 100644 --- a/yum/manifests/init.pp +++ b/yum/manifests/init.pp @@ -654,14 +654,23 @@ class yum::repo::puppetlabs::dependencies { } + # Add Google's mod_spdy repository # class yum::repo::mod_spdy { - yum::repo { "mod_spdy": + yum::repo { "mod-spdy": descr => "mod_spdy Repository", baseurl => "http://dl.google.com/linux/mod-spdy/rpm/stable/x86_64", 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", + } + }