opendev
/
puppet-refstack
Code Issues Proposed changes

Merge "Use httpd module instead of apache"

This commit is contained in:
Jenkins 2015-09-12 21:42:47 +00:00 committed by Gerrit Code Review
parent 53d78113d2 674ef361f1
commit a9c5c27b85
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
# Install apache
include ::apache
include ::apache::params
include ::apache::mod::wsgi
include ::httpd
include ::httpd::params
include ::httpd::mod::wsgi
# Create a copy of the wsgi file with apache user permissions.
file { '/etc/refstack/app.wsgi':
ensure => present,
owner => $::apache::params::user,
group => $::apache::params::group,
owner => $::httpd::params::user,
group => $::httpd::params::group,
mode => '0644',
source => "${src_www_root}/refstack/api/app.wsgi",
require => [
@ -51,8 +51,8 @@ class refstack::apache::http () {
# Synchronize the app directory and the apache directory.
file { $install_www_root:
ensure => directory,
owner => $::apache::params::user,
group => $::apache::params::group,
owner => $::httpd::params::user,
group => $::httpd::params::group,
source => "${src_www_root}/refstack-ui/app",
recurse => true,
purge => true,
@ -61,7 +61,7 @@ class refstack::apache::http () {
}
# Set up RefStack as HTTP.
apache::vhost { $hostname:
httpd::vhost { $hostname:
port => 80,
docroot => $install_www_root,
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
# Install apache
include ::apache
include ::apache::params
include ::apache::mod::wsgi
include ::httpd
include ::httpd::params
include ::httpd::mod::wsgi
# Create a copy of the wsgi file with apache user permissions.
file { '/etc/refstack/app.wsgi':
ensure => present,
owner => $::apache::params::user,
group => $::apache::params::group,
owner => $::httpd::params::user,
group => $::httpd::params::group,
mode => '0644',
source => "${src_www_root}/refstack/api/app.wsgi",
require => [
@ -88,8 +88,8 @@ class refstack::apache::https () {
# Synchronize the app directory and the apache directory.
file { $install_www_root:
ensure => directory,
owner => $::apache::params::user,
group => $::apache::params::group,
owner => $::httpd::params::user,
group => $::httpd::params::group,
source => "${src_www_root}/refstack-ui/app",
recurse => true,
purge => true,
@ -98,7 +98,7 @@ class refstack::apache::https () {
}
# Set up RefStack as HTTPS.
apache::vhost { $hostname:
httpd::vhost { $hostname:
port => 443,
docroot => $install_www_root,
priority => '50',