Merge pull request #11 from clauded/master

Allow to override config.php template
infra-geo-ouverte · Jul 28, 2015 · 8711f04 · 8711f04
2 parents 5fea4a9 + cfd0dad
commit 8711f04
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -28,6 +28,7 @@
   $librairieVersion = $::igo::params::librairieVersion,
   $cphalconGitRepo  = $::igo::params::cphalconGitRepo,
   $cphalconVersion  = $::igo::params::cphalconVersion,
+  $configTemplate   = $::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':

diff --git 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'
 
 }