From 6e23b94443851970faa0b4fe25bc726f4c1d8a03 Mon Sep 17 00:00:00 2001 From: Claude Durocher Date: Thu, 16 Jul 2015 16:37:04 -0400 Subject: [PATCH 1/3] Allow config.php template override --- manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index fa0ba4a..a72fed7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,6 +28,7 @@ $librairieVersion = $::igo::params::librairieVersion, $cphalconGitRepo = $::igo::params::cphalconGitRepo, $cphalconVersion = $::igo::params::cphalconVersion, + $config_template = $::igo::params::configTemplate, ) inherits ::igo::params { @@ -89,7 +90,7 @@ file { "${igoAppPath}/config/config.php": owner => $appUser, group => $appGroup, - content => template('igo/config.php.erb'), + content => template($configTemplate), require => $requiredIgoAppPath, } class { '::igo::apache': From 9e1df2bb5892879d6679cc9e1d1997ca5adadf8c Mon Sep 17 00:00:00 2001 From: Claude Durocher Date: Thu, 16 Jul 2015 16:37:53 -0400 Subject: [PATCH 2/3] Allow config.php template override --- manifests/params.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/params.pp b/manifests/params.pp index d148519..dc282ca 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -30,5 +30,7 @@ $pgsqlEtcPath = "/etc/postgresql/${::postgresql::globals::default_version}" $pgsqlScriptPath = "/usr/share/postgresql/${::postgresql::globals::default_version}/contrib/postgis-${::postgresql::globals::default_postgis_version}" $srcPath = '/usr/src' + + $configTemplate = 'igo/config.php.erb' } From cfd0dad5aaa6ba067b8ec3beb2a503436533f763 Mon Sep 17 00:00:00 2001 From: Claude Durocher Date: Thu, 16 Jul 2015 16:58:37 -0400 Subject: [PATCH 3/3] Allow config.php template override --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index a72fed7..61da493 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,7 +28,7 @@ $librairieVersion = $::igo::params::librairieVersion, $cphalconGitRepo = $::igo::params::cphalconGitRepo, $cphalconVersion = $::igo::params::cphalconVersion, - $config_template = $::igo::params::configTemplate, + $configTemplate = $::igo::params::configTemplate, ) inherits ::igo::params {