le1t0-deprec 2.1.6.087 → 2.1.6.088

data/lib/deprec/recipes/glusterfs.rb

@@ -22,7 +22,10 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       set :glusterfs_defaults, { }
       set :glusterfs_exports, { }
-      set :glusterfs_client_config_local, false
+      set :glusterfs_client_config_local, { }
+      
+      # DON'T use this one, it's only used for internal purposes
+      set :glusterfs_client_config_contents, ""
             
       SRC_PACKAGES[:glusterfs] = {
         :md5sum => "e2eaf3d1e7a735ee7e7b262a46bbc75d  glusterfs-3.0.4.tar.gz", 
@@ -52,18 +55,18 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Generate configuration file(s) for Glusterfs from template(s)"
       task :config_gen do
-        system_config_files = SYSTEM_CONFIG_FILES[:glusterfs].dup
-        if glusterfs_client_config_local
-          glusterfs_exports.each do |name, cfg|
-            system_config_files << {
-              :template => "glusterfs.vol.erb",
-              :path => "/etc/glusterfs/#{name}-#{cfg[:transport] || glusterfs_defaults[:transport] || 'tcp'}.vol",
-              :mode => 0644,
-              :owner => 'root:root'
-            }
-          end
+        glusterfs_client_config_local.each do |name, contents|
+          set :glusterfs_client_config_contents, contents
+          cfg = glusterfs_exports[name]
+          deprec2.render_template(:glusterfs, {
+            :template => "glusterfs.vol.erb",
+            :path => "/etc/glusterfs/#{name}-#{cfg[:transport] || glusterfs_defaults[:transport] || 'tcp'}.vol",
+            :mode => 0644,
+            :owner => 'root:root'
+          })
         end
-        system_config_files.each do |file|
+        set :glusterfs_client_config_contents, ""
+        SYSTEM_CONFIG_FILES[:glusterfs].each do |file|
           deprec2.render_template(:glusterfs, file)
         end
       end

data/lib/deprec/templates/glusterfs/glusterfs.vol.erb

@@ -0,0 +1 @@
+<%= glusterfs_client_config_contents %>

metadata

@@ -2,7 +2,7 @@
 name: le1t0-deprec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.6.087
+  version: 2.1.6.088
 platform: ruby
 authors: 
 - Le1t0