From e40e95a92a3586ef5e866d88302c35546bf15c23 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Thu, 15 Mar 2012 22:54:55 +0000
Subject: rename db_config.pp as it cause issue with rakefile for puppet-lint

---
 modules/puppet/manifests/stored_config.pp |  2 +-
 modules/puppet/templates/db_config.erb    | 10 ++++++++++
 modules/puppet/templates/db_config.pp     | 10 ----------
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 modules/puppet/templates/db_config.erb
 delete mode 100644 modules/puppet/templates/db_config.pp

diff --git a/modules/puppet/manifests/stored_config.pp b/modules/puppet/manifests/stored_config.pp
index b09b59e2..efe8a6fa 100644
--- a/modules/puppet/manifests/stored_config.pp
+++ b/modules/puppet/manifests/stored_config.pp
@@ -21,5 +21,5 @@ class puppet::stored_config {
         $database = 'sqlite3'
 #    }
 #
-    $db_config = template('puppet/db_config.pp')
+    $db_config = template('puppet/db_config.erb')
 }
diff --git a/modules/puppet/templates/db_config.erb b/modules/puppet/templates/db_config.erb
new file mode 100644
index 00000000..337a5043
--- /dev/null
+++ b/modules/puppet/templates/db_config.erb
@@ -0,0 +1,10 @@
+<%- if database == 'sqlite3' -%>
+    dbadapter = sqlite3
+    dblocation = /var/lib/puppet/storeconfigs.db
+<%- else -%>
+    dbadapter = postgresql
+    dbuser = puppet
+    dbpassword = <%= pgsql_password %>
+    dbserver = pgsql.<%= domain %>
+    dbname = puppet
+<%- end -%>
diff --git a/modules/puppet/templates/db_config.pp b/modules/puppet/templates/db_config.pp
deleted file mode 100644
index 337a5043..00000000
--- a/modules/puppet/templates/db_config.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-<%- if database == 'sqlite3' -%>
-    dbadapter = sqlite3
-    dblocation = /var/lib/puppet/storeconfigs.db
-<%- else -%>
-    dbadapter = postgresql
-    dbuser = puppet
-    dbpassword = <%= pgsql_password %>
-    dbserver = pgsql.<%= domain %>
-    dbname = puppet
-<%- end -%>
-- 
cgit v1.2.1