opendev/puppet-mediawiki
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: I2f7206bf1b222643a9c1144c821f3d16a84e75d1
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2015-07-14 15:28:51 -04:00
parent 5512cdf72f
commit aa6920461a
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

@@ -20,7 +20,7 @@ class mediawiki(
ensure => present, ensure => present,
} }
include apache include ::httpd
include mediawiki::php include mediawiki::php
include mediawiki::app include mediawiki::app
@@ -35,7 +35,7 @@ class mediawiki(
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $ssl_cert_file_contents, content => $ssl_cert_file_contents,
before => Apache::Vhost[$site_hostname], before => Httpd::Vhost[$site_hostname],
} }
} }
@@ -45,7 +45,7 @@ class mediawiki(
group => 'ssl-cert', group => 'ssl-cert',
mode => '0640', mode => '0640',
content => $ssl_key_file_contents, content => $ssl_key_file_contents,
before => Apache::Vhost[$site_hostname], before => Httpd::Vhost[$site_hostname],
} }
} }
@@ -55,21 +55,21 @@ class mediawiki(
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $ssl_chain_file_contents, content => $ssl_chain_file_contents,
before => Apache::Vhost[$site_hostname], before => Httpd::Vhost[$site_hostname],
} }
} }
apache::vhost { $site_hostname: ::httpd::vhost { $site_hostname:
port => 443, port => 443,
docroot => 'MEANINGLESS ARGUMENT', docroot => 'MEANINGLESS ARGUMENT',
priority => '50', priority => '50',
template => 'mediawiki/apache/mediawiki.erb', template => 'mediawiki/apache/mediawiki.erb',
ssl => true, ssl => true,
} }
a2mod { 'rewrite': httpd_mod { 'rewrite':
ensure => present, ensure => present,
} }
a2mod { 'expires': httpd_mod { 'expires':
ensure => present, ensure => present,
} }
} }

2
metadata.json
View File

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