From ae9d89ac9cce3de72a4514c537a710afb2bfbda0 Mon Sep 17 00:00:00 2001 From: Paul Belanger <pabelanger@redhat.com> Date: Fri, 24 Jul 2015 16:23:08 -0400 Subject: [PATCH] Remove puppet-apache now that we have migrated We now fully support puppet-httpd, so lets remove puppet-apache Change-Id: I48924b277ccbadf805947ae400b25807f3887cdc Depends-On: I67aea79c04d725f9b9889a38aff018f0895321a9 Depends-On: I0bcc68e049396560e9f51a2cb4ba941f8a8d2862 Signed-off-by: Paul Belanger <pabelanger@redhat.com> --- install_modules.sh | 1 + modules.env | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/install_modules.sh b/install_modules.sh index 75c312493f..b458ca6d6a 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -47,6 +47,7 @@ fi remove_module "gearman" #remove old saz-gearman remove_module "limits" # remove saz-limits (required by saz-gearman) +remove_module "apache" # load modules.env to populate MODULES[*] and SOURCE_MODULES[*] # for processing. diff --git a/modules.env b/modules.env index 4e808b92c2..7d4129fe65 100644 --- a/modules.env +++ b/modules.env @@ -43,7 +43,6 @@ SOURCE_MODULES["https://github.com/nanliu/puppet-staging"]="1.0.0" SOURCE_MODULES["https://github.com/puppet-community/puppet-alternatives"]="0.3.0" SOURCE_MODULES["https://github.com/puppet-community/puppet-archive"]="0.3.0" SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]="2.4.0" -SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apache"]="0.0.4" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apt"]="1.4.2" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-concat"]="1.1.0" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-firewall"]="1.1.3"