make a better config deployment

3 files changed, 19 insertions, 10 deletions

diff --git a/manifests/config.pp b/manifests/config.pp
index 3a4a356..78f5602 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,8 +1,21 @@
-class trocla::config {
-  file{"${settings::confdir}/trocla.yaml":
-    source => [ "puppet:///modules/site-trocla/${fqdn}/trocla.yaml",
-                'puppet:///modules/site-trocla/trocla.yaml' ],
-    require => Package['trocla'],
-    owner => root, group => puppet, mode => 0640;           
+class trocla::config($ruby='system') {
+  if $trocla::default_config::ruby == 'system' or $trocla::default_config::ruby == 'both' {
+    require trocla::master
+  }
+  if $trocla::default_config::ruby == 'ree' or $trocla::default_config::ruby == 'both' {
+    require trocla::master::ree
+  }
+
+  # deploy default config file and link it for trocla cli lookup
+  file{
+    "${settings::confdir}/trocla.yaml":
+      content => "---\nadapter_options:\n    :path: ${settings::confdir}/trocla_data.yaml\n",
+      owner => root, group => puppet, mode => 0640;
+    '/etc/trocla.yaml':
+      ensure => link,
+      target => "${settings::confdir}/trocla.yaml",
+    "${settings::confdir}/trocla_data.yaml":
+      ensure => present,
+      owner => puppet, group => 0, mode => 0600;
   }
 }
diff --git a/manifests/master.pp b/manifests/master.pp
index 62c975e..2748b73 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -12,6 +12,4 @@ class trocla::master {
       ensure   => present,
       provider => gem,
   }
-
-  include trocla::config
 }
diff --git a/manifests/master/ree.pp b/manifests/master/ree.pp
index 92cc07b..08d9a8e 100644
--- a/manifests/master/ree.pp
+++ b/manifests/master/ree.pp
@@ -9,6 +9,4 @@ class trocla::master::ree {
   require ruby-enterprise::gems::highline
   
   ruby-enterprise::gem{'trocla': }
-
-  include trocla::config
 }