From 6f8bf0c59010c4fdb04764f94a8809761ff49afd Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Tue, 23 Jun 2015 16:16:33 +0300 Subject: [PATCH] apache, yum: Remove unused mod_spdy support --- apache/manifests/init.pp | 36 ------------------------------------ yum/manifests/init.pp | 21 --------------------- 2 files changed, 57 deletions(-) diff --git a/apache/manifests/init.pp b/apache/manifests/init.pp index e6d7ff5..c790395 100644 --- a/apache/manifests/init.pp +++ b/apache/manifests/init.pp @@ -1026,42 +1026,6 @@ class apache::mod::wsgi($http=true, $https=true, $embedded=true) { } -# Install Google's mod_spdy -# -class apache::mod::spdy { - - case $::operatingsystem { - "centos","redhat","fedora": { } - default: { - fail("Apache module not supported in ${::operatingsystem}.") - } - } - - $spdy_package = "mod-spdy-beta" - - require yum::repo::mod_spdy - - package { $spdy_package: - ensure => installed, - } - - apache::configfile { "spdy.conf": - http => false, - https => true, - require => Package[$spdy_package], - notify => Service["httpsd"], - } - - apache::configfile { "load_ssl_with_npn.conf": - http => false, - https => true, - require => Package[$spdy_package], - notify => Service["httpsd"], - } - -} - - # Install and configure webalizer. # class apache::webalizer { diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp index 82fd2bf..fe2b1f1 100644 --- a/yum/manifests/init.pp +++ b/yum/manifests/init.pp @@ -706,27 +706,6 @@ class yum::repo::puppetlabs::dependencies { } -# Add Google's mod_spdy repository -# -class 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", - } - -} - - # Add Basho's riak repository # class yum::repo::riak {