opendev/puppet-refstack
Code Issues Proposed changes

Use httpd module instead of apache

Browse Source 
OpenStack Infra currently uses a fork of puppetlabs/apache called
openstackinfra/httpd.

Change-Id: I470d7f5ebeee9949f6dd58d48a580d94866df0fd
This commit is contained in:
Jeremy Stanley 2015-09-05 19:30:05 +00:00
parent e1482bf068
commit 674ef361f1
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/apache/http.pp
View File

@ -31,15 +31,15 @@ class refstack::apache::http () {
$server_admin = $::refstack::params::server_admin $server_admin = $::refstack::params::server_admin
# Install apache # Install apache
include ::apache include ::httpd
include ::apache::params include ::httpd::params
include ::apache::mod::wsgi include ::httpd::mod::wsgi
# Create a copy of the wsgi file with apache user permissions. # Create a copy of the wsgi file with apache user permissions.
file { '/etc/refstack/app.wsgi': file { '/etc/refstack/app.wsgi':
ensure => present, ensure => present,
owner => $::apache::params::user, owner => $::httpd::params::user,
group => $::apache::params::group, group => $::httpd::params::group,
mode => '0644', mode => '0644',
source => "${src_www_root}/refstack/api/app.wsgi", source => "${src_www_root}/refstack/api/app.wsgi",
require => [ require => [
@ -51,8 +51,8 @@ class refstack::apache::http () {
# Synchronize the app directory and the apache directory. # Synchronize the app directory and the apache directory.
file { $install_www_root: file { $install_www_root:
ensure => directory, ensure => directory,
owner => $::apache::params::user, owner => $::httpd::params::user,
group => $::apache::params::group, group => $::httpd::params::group,
source => "${src_www_root}/refstack-ui/app", source => "${src_www_root}/refstack-ui/app",
recurse => true, recurse => true,
purge => true, purge => true,
@ -61,7 +61,7 @@ class refstack::apache::http () {
} }
# Set up RefStack as HTTP. # Set up RefStack as HTTP.
apache::vhost { $hostname: httpd::vhost { $hostname:
port => 80, port => 80,
docroot => $install_www_root, docroot => $install_www_root,
priority => '50', priority => '50',

16
manifests/apache/https.pp
View File

@ -38,15 +38,15 @@ class refstack::apache::https () {
$resolved_ssl_ca = $::refstack::params::resolved_ssl_ca $resolved_ssl_ca = $::refstack::params::resolved_ssl_ca
# Install apache # Install apache
include ::apache include ::httpd
include ::apache::params include ::httpd::params
include ::apache::mod::wsgi include ::httpd::mod::wsgi
# Create a copy of the wsgi file with apache user permissions. # Create a copy of the wsgi file with apache user permissions.
file { '/etc/refstack/app.wsgi': file { '/etc/refstack/app.wsgi':
ensure => present, ensure => present,
owner => $::apache::params::user, owner => $::httpd::params::user,
group => $::apache::params::group, group => $::httpd::params::group,
mode => '0644', mode => '0644',
source => "${src_www_root}/refstack/api/app.wsgi", source => "${src_www_root}/refstack/api/app.wsgi",
require => [ require => [
@ -88,8 +88,8 @@ class refstack::apache::https () {
# Synchronize the app directory and the apache directory. # Synchronize the app directory and the apache directory.
file { $install_www_root: file { $install_www_root:
ensure => directory, ensure => directory,
owner => $::apache::params::user, owner => $::httpd::params::user,
group => $::apache::params::group, group => $::httpd::params::group,
source => "${src_www_root}/refstack-ui/app", source => "${src_www_root}/refstack-ui/app",
recurse => true, recurse => true,
purge => true, purge => true,
@ -98,7 +98,7 @@ class refstack::apache::https () {
} }
# Set up RefStack as HTTPS. # Set up RefStack as HTTPS.
apache::vhost { $hostname: httpd::vhost { $hostname:
port => 443, port => 443,
docroot => $install_www_root, docroot => $install_www_root,
priority => '50', priority => '50',