opendev/puppet-drupal
Code Issues Proposed changes

Migrate to puppet-httpd module

Browse Source 
puppet-httpd is the openstack-infra version of puppetlabs-apache
(0.0.4) release.

This patchset will remove the puppetlabs-apache namespace from -infra
allowing for possible future patchsets to use newer puppetlabs-apache
modules.

Change-Id: I341295e1969b9ff1d54ac84655c1eb340b239684
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2015-07-14 15:44:42 -04:00
parent 157d7e7c8e
commit 21b54b74b6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@@ -89,13 +89,13 @@ class drupal (
$conf_ga_account = undef, $conf_ga_account = undef,
$conf_openid_provider = undef, $conf_openid_provider = undef,
) { ) {
include apache include ::httpd
include pear include pear
# ssl certificates # ssl certificates
if $site_ssl_enabled == true { if $site_ssl_enabled == true {
include apache::ssl include ::httpd::ssl
# site x509 certificate # site x509 certificate
if $site_ssl_cert_file_contents != '' { if $site_ssl_cert_file_contents != '' {
@@ -104,7 +104,7 @@ class drupal (
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $site_ssl_cert_file_contents, content => $site_ssl_cert_file_contents,
before => Apache::Vhost[$site_name], before => Httpd::Vhost[$site_name],
} }
} }
@@ -115,7 +115,7 @@ class drupal (
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $site_ssl_key_file_contents, content => $site_ssl_key_file_contents,
before => Apache::Vhost[$site_name], before => Httpd::Vhost[$site_name],
} }
} }
@@ -126,7 +126,7 @@ class drupal (
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $site_ssl_chain_file_contents, content => $site_ssl_chain_file_contents,
before => Apache::Vhost[$site_name], before => Httpd::Vhost[$site_name],
} }
} }
} }
@@ -139,7 +139,7 @@ class drupal (
mode => '0755', mode => '0755',
} }
apache::vhost { $site_name: ::httpd::vhost { $site_name:
port => 80, port => 80,
priority => '50', priority => '50',
docroot => $site_docroot, docroot => $site_docroot,
@@ -165,7 +165,7 @@ class drupal (
require => File[$site_root], require => File[$site_root],
} }
a2mod { 'rewrite': httpd_mod { 'rewrite':
ensure => present, ensure => present,
} }

2
metadata.json
View File

@@ -17,6 +17,6 @@
"dependencies": [ "dependencies": [
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0" }, { "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0" },
{ "name": "puppetlabs/mysql", "version_requirement": "= 0.6.1" }, { "name": "puppetlabs/mysql", "version_requirement": "= 0.6.1" },
{ "name": "puppetlabs/apache", "version_requirement": "= 0.0.4" } { "name": "openstackinfra/httpd", "version_requirement": "0.x" }
] ]
} }