Skip to content
Snippets Groups Projects
Commit aa6651b7 authored by Christophe Haen's avatar Christophe Haen
Browse files

Merge branch 'nginxTmpl' into 'qa'

nginx: use nginx_tpl_path parameter and fix its default

See merge request ai/it-puppet-module-dirac!31
parents 31e6877d 485fe526
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,7 @@ class dirac ($dirac_user = 'dirac', $dirac_group = 'dirac',
$extensions = [], $web_extensions = [],
$dirac_tpl_path = 'dirac/dirac.cfg.erb',
$web_tpl_path = 'dirac/site.conf.erb',
$nginx_tpl_path = 'dirac/nginx.conf',
$nginx_tpl_path = 'dirac/nginx.conf.erb',
$install_tpl_path = 'dirac/install.cfg.erb',
$teigi_keys = [],
$dirac_config_args = {},
......@@ -230,7 +230,7 @@ class dirac ($dirac_user = 'dirac', $dirac_group = 'dirac',
file { '/opt/rh/nginx16/root/etc/nginx/nginx.conf':
ensure => present,
require => Package['nginx16'],
content => template('dirac/nginx.conf.erb'),
content => template($nginx_tpl_path),
}
service { 'nginx16-nginx':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment