kafo 0.0.9 → 0.0.10

data/README.md

@@ -190,7 +190,8 @@ Kafo support password arguments. It's adding some level of protection for you
 passwords. Usually people generate random strings for passwords. However all
 values are stored in config/answers.yaml which introduce some security risk.
 
-If this is something to concern for you, you can use password type. It will
+If this is something to consider for you, you can use password type (see 
+Argument types for more info how to define parameter type). It will
 generate a secure (random) password of decent length (32 chars) and encrypts
 it using AES 256 in CBC mode. It uses a passphrase that is stored in
 config/kafo.yaml so if anyone gets an access to this file, he can read all
@@ -289,6 +290,21 @@ bin/foreman-installer --foreman-db-password=UNDEF
 
 It also works in interactive mode.
 
+## Custom paths
+
+Usually when you package your installer you want to load files from specific
+paths. In order to do that you can use following configuration options:
+
+* :answer_file: /etc/kafo/kafo.yaml
+* :installer_dir: /usr/share/kafo/
+* :modules_dir: /usr/share/kafo/modules
+
+Answer file is obvious. Installer dir is a place where you installer is 
+installed. E.g. system checks will be loaded from here (under checks 
+subdirectory). On debian systems you may want to specify modules dir 
+independent on your installer location. If you specify this option your 
+installer puppet modules will be loaded from here.
+
 ## Order of puppet modules execution
 
 When you have more than one module you may end up in situation where you need

data/config/kafo.yaml.example

@@ -5,8 +5,10 @@
 ## Installer configuration
 # Path to answer file, if the file does not exist a $pwd/config/answers.yaml is used as a fallback
 # :answer_file: /etc/kafo/kafo.yaml
-# Uncomment if you want to load puppet modules from a specific path, $pwd/modules is used by default
+# Custome installer path
 # :installer_dir: /usr/share/kafo/
+# Uncomment if you want to load puppet modules from a specific path, $pwd/modules is used by default
+# :modules_dir: /usr/share/kafo/modules
 
 ## Kafo tuning, customization of core functionality
 # :no_prefix: false

data/lib/kafo/configuration.rb

@@ -13,6 +13,7 @@ class Configuration
       :mapping            => {},
       :answer_file        => '/etc/kafo/kafo.yaml',
       :installer_dir      => '.',
+      :modules_dir        => './modules',
       :default_values_dir => '/tmp'
   }
 

data/lib/kafo/puppet_command.rb

@@ -30,8 +30,10 @@ class PuppetCommand
   private
 
   def modules_path
+    installer_modules = KafoConfigure.config.app[:modules_dir] ||
+        (KafoConfigure.config.app[:installer_dir] + '/modules')
     [
-        KafoConfigure.config.app[:installer_dir] + '/modules',
+        installer_modules,
         File.join(KafoConfigure.gem_root, 'modules')
     ].join(':')
   end

data/lib/kafo/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Kafo
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/modules/kafo_configure/lib/puppet/parser/functions/load_kafo_answer_file.rb

@@ -4,7 +4,7 @@
 module Puppet::Parser::Functions
   newfunction(:load_kafo_answer_file, :type => :rvalue) do |args|
     answer_file = lookupvar('kafo_answer_file')
-    if answer_file && !answer_file.empty?
+    if answer_file && answer_file != :undefined && !answer_file.empty?
       answer_file
     else
       YAML.load_file(lookupvar('kafo_config_file'))[:answer_file]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,6 @@ extra_rdoc_files: []
 files:
 - bin/kafo-configure
 - bin/kafofy
-- config/kafo.yaml
 - config/kafo.yaml.example
 - config/config_header.txt
 - lib/kafo/puppet_module.rb

data/config/kafo.yaml

@@ -1,7 +0,0 @@
---- 
-  !ruby/sym log_dir: /var/log/kafo
-  !ruby/sym log_level: !ruby/sym debug
-  !ruby/sym no_prefix: false
-  !ruby/sym mapping: {}
-  !ruby/sym password: ibZ9oHb0CC6joJHhmOzIvDD8tjwa3jX5hGU6mEdYHcM
-  !ruby/sym answer_file: /home/ares/z/kafotest/config/answers.yaml