opendev/puppet-httpd
Code Issues Proposed changes

Define params::ssl_path for vhost::proxy

Browse Source 
The vhost::proxy vhost template file uses the ssl_path var.
Unfortuantely this isn't defined in params so we get errors like:

  Unknown variable: 'httpd::params::ssl_path'. at /etc/puppetlabs/code/modules/httpd/manifests/vhost/proxy.pp:37:15

Fix that by defining a value. Note this value should be correct for
debuntu, but is probably wrong for RHEL/CentOS.

Change-Id: Idbb1ac60a17d5506c4dd0d19eb10c1a45741c3b5
This commit is contained in:
Clark Boylan 2020-03-04 16:04:11 -08:00
parent 1609bb6a44
commit c629d4779a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@ -38,6 +38,7 @@ class httpd::params {
$mod_python_package = 'mod_python' $mod_python_package = 'mod_python'
$mod_wsgi_package = 'mod_wsgi' $mod_wsgi_package = 'mod_wsgi'
$ssl_package = 'mod_ssl' $ssl_package = 'mod_ssl'
$ssl_path = '/etc/ssl'
$apache_dev = 'httpd-devel' $apache_dev = 'httpd-devel'
$vdir = '/etc/httpd/conf.d/' $vdir = '/etc/httpd/conf.d/'
} }
@ -50,6 +51,7 @@ class httpd::params {
$mod_python_package = 'libapache2-mod-python' $mod_python_package = 'libapache2-mod-python'
$mod_wsgi_package = 'libapache2-mod-wsgi' $mod_wsgi_package = 'libapache2-mod-wsgi'
$ssl_package = 'apache-ssl' $ssl_package = 'apache-ssl'
$ssl_path = '/etc/ssl'
$apache_dev = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev'] $apache_dev = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
$vdir = '/etc/apache2/sites-enabled/' $vdir = '/etc/apache2/sites-enabled/'
} }
@ -59,6 +61,7 @@ class httpd::params {
$mod_python_package = 'libapache2-mod-python' $mod_python_package = 'libapache2-mod-python'
$mod_wsgi_package = 'libapache2-mod-wsgi' $mod_wsgi_package = 'libapache2-mod-wsgi'
$ssl_package = 'apache-ssl' $ssl_package = 'apache-ssl'
$ssl_path = '/etc/ssl'
$apache_dev = 'apache-dev' $apache_dev = 'apache-dev'
$vdir = '/etc/apache2/sites-enabled/' $vdir = '/etc/apache2/sites-enabled/'
} }