capitate 0.3.5 → 0.3.6

data/lib/recipes/centos/merb.rb

@@ -4,42 +4,16 @@ namespace :merb do
     desc <<-DESC
     Setup merb.
       
-    <dl>
-    <dt>merb_command_path</dt>
-    <dd>The path for merb startup command</dd>
-    <dd class="default">Defaults to @merb@</dd>
-    
-    <dt>merb_nodes</dt>
-    <dd>Number of merb daemons to run</dd>
-    <dd>@set :merb_nodes, 3@</dd>
-    
-    <dt>merb_port</dt>
-    <dd>Starting port for merb nodes. If there are 3 merb nodes with port 9000, 
-    then instances will be at 9000, 9001, and 9002</dd>
-    <dd>@set :merb_port, 9000@</dd>
-    
-    <dt>merb_root</dt>
-    <dd>Directory for merb root</dd>
-    <dd class="default">Defaults to @\#{current_path}@</dd>
-    
-    <dt>merb_pid_path</dt>
-    <dd>Path for merb pids</dd> 
-    <dd class="default">Defaults to @\#{shared_path}/pids/merb.pid@</dd>      
-    </dl>
     "Source":#{link_to_source(__FILE__)}
     DESC
+    task_arg(:merb_nodes, "Number of merb daemons to run")
+    task_arg(:merb_port, "Starting port for merb nodes. If there are 3 merb nodes with port 9000, then instances will be at 9000, 9001, and 9002")
+    task_arg(:merb_command_path, "The path for merb startup command", :default => "merb")
+    task_arg(:merb_pid_path, "Path for merb pids", :default => Proc.new{"#{shared_path}/pids/merb.pid"}, :default_desc => "\#{shared_path}/pids/merb.pid")
+    task_arg(:merb_root, "Directory for merb root", :set => :current_path)
+    task_arg(:merb_application, "Merb application name", :default => Proc.new{"merb_#{application}"}, :default_desc => "merb_\#{application}")    
+    task_arg(:merb_initscript_name, "Initscript name", :default => Proc.new{"merb_#{application}"}, :default_desc => "merb_\#{application}")
     task :setup do 
-
-      # Settings
-      fetch(:merb_nodes)
-      fetch(:merb_port)
-      fetch_or_default(:merb_command_path, "merb")
-      fetch_or_default(:merb_pid_path, "#{shared_path}/pids/merb.pid")
-      fetch_or_default(:merb_root, current_path)
-      fetch_or_default(:merb_application, "merb_#{application}")
-      
-      fetch_or_default(:merb_initscript_name, "merb_#{application}")
-
       utils.install_template("merb/merb.initd.centos.erb", "/etc/init.d/#{merb_initscript_name}")
       run_via "/sbin/chkconfig --level 345 #{merb_initscript_name} on"
     end

data/lib/recipes/centos/mongrel_cluster.rb

@@ -7,55 +7,21 @@ namespace :mongrel do
       desc <<-DESC
       Create mongrel cluster.
       
-      <dl>
-      <dt>mongrel_application</dt>
-      <dd>Name of mongrel application</dd>
-      <dd>@set :mongrel_application, "mongrel_cluster_\#{application}"@</dd>
-      
-      <dt>mongrel_size</dt><dd>Number of mongrels</dd>
-      <dd>@set :mongrel_size, 3@</dd>
-      
-      <dt>mongrel_port</dt><dd>Starting port for mongrels. If there are 3 mongrels with port 9000, 
-      then instances will be at 9000, 9001, and 9002</dd>      
-      <dd>@set :mongrel_port, 9000@</dd>
-      
-      <dt>mongrel_config_dir</dt>
-      <dd>Directory for mongrel config.</dd>
-      <dd class="default">Defaults to @\#{shared_path}/config/mongrel@</dd>
-      
-      <dt>mongrel_pid_dir</dt><dd>Directory for mongrel pids</dd> 
-      <dd class="default">Defaults to @\#{shared_path}/pids@</dd>
-      
-      <dt>mongrel_config_script</dt><dd>Config script to load with mongrel</dd> 
-      <dd class="default">Defaults to @nil@</dd>
-      <dd>@set :mongrel_config_script, "config/mongrel_handler.rb"@</dd>
-      
-      <dt>mongrel_cluster_command</dt>
-      <dd>Mongrel cluster command.</dd>
-      <dd class="default">Defaults to @mongrel_cluster_ctl@</dd>
+      "Source":#{link_to_source(__FILE__)}
+      DESC
       
-      <dt>mongrel_initscript_name</dt><dd>Mongrel initscript name.</dd> 
-      <dd class="default">Defaults to @mongrel_cluster_\#{application}@</dd>
+      task_arg(:mongrel_application, "Name of mongrel application")
+      task_arg(:mongrel_size, "Number of mongrels")
+      task_arg(:mongrel_port, "Starting port for mongrels. If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002")
+      task_arg(:mongrel_config_dir, "Directory for mongrel config", :default => Proc.new{"#{shared_path}/config/mongrel"}, :default_desc => "\#{shared_path}/config/mongrel")
+      task_arg(:mongrel_pid_dir, "Directory for mongrel pids", :default => Proc.new{"#{shared_path}/pids"}, :default_desc => "\#{shared_path}/pids")
+      task_arg(:mongrel_config_script, "Config script to load with mongrel", :default => nil)
       
-      <dt>mongrel_config_options</dt>
-      <dd>Config options appended to cluster yml.</dd>
-      <dd class="default">Defaults to @{}@</dd>
+      task_arg(:mongrel_cluster_command, "Mongrel cluster command", :default => "mongrel_cluster_ctl")
+      task_arg(:mongrel_initscript_name, "Mongrel initscript name", :default => Proc.new{"mongrel_cluster_#{application}"}, :default_desc => "mongrel_cluster_\#{application}")
+      task_arg(:mongrel_config_options, "Config options appended to cluster yml", :default => {})
       
-      </dl>
-      "Source":#{link_to_source(__FILE__)}
-      DESC
       task :setup do 
-
-        # Settings
-        fetch(:mongrel_size)
-        fetch(:mongrel_port)
-        fetch_or_default(:mongrel_config_dir, "#{shared_path}/config/mongrel")
-        fetch_or_default(:mongrel_pid_dir, "#{shared_path}/pids")
-        fetch_or_default(:mongrel_config_script, nil)
-        
-        fetch_or_default(:mongrel_cluster_command, "mongrel_cluster_ctl")
-        fetch_or_default(:mongrel_initscript_name, "mongrel_cluster_#{application}")
-        fetch_or_default(:mongrel_config_options, {})
         
         unless mongrel_config_script.blank?
           mongrel_config_options["config_script"] = mongrel_config_script
@@ -72,13 +38,11 @@ namespace :mongrel do
       end    
     
       desc "Mongrel cluster setup initscript for application"
+      task_arg(:mongrel_config_dir, "Directory for mongrel config", :default => Proc.new{"#{shared_path}/config/mongrel"}, :default_desc => "\#{shared_path}/config/mongrel")
+      task_arg(:mongrel_pid_dir, "Directory for mongrel pids", :default => Proc.new{"#{shared_path}/pids"}, :default_desc => "\#{shared_path}/pids")
+      task_arg(:mongrel_cluster_command, "Mongrel cluster command", :default => "mongrel_cluster_ctl")
+      task_arg(:mongrel_initscript_name, "Mongrel initscript name", :default => Proc.new{"mongrel_cluster_#{application}"}, :default_desc => "mongrel_cluster_\#{application}")
       task :initscript do
-
-        fetch_or_default(:mongrel_config_dir, "#{shared_path}/config/mongrel")
-        fetch_or_default(:mongrel_pid_dir, "#{shared_path}/pids")      
-        fetch_or_default(:mongrel_cluster_command, "mongrel_cluster_ctl")
-        fetch_or_default(:mongrel_initscript_name, "mongrel_cluster_#{application}")
-
         utils.install_template("mongrel/mongrel_cluster.initd.centos.erb", "/etc/init.d/#{mongrel_initscript_name}")
         run_via "/sbin/chkconfig --level 345 #{mongrel_initscript_name} on"
       end

data/lib/recipes/centos/monit.rb

@@ -5,49 +5,23 @@ namespace :monit do
     desc <<-DESC
     Install monit.
     
-    <dl>
-    <dt>monit_build_options</dt>
-    <dd>Monit build options.</dd>
-    
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task_arg(:monit_port, "Monit port", :default => 2812)
+    task_arg(:monit_password, "Monit password", :default => Proc.new{prompt.password('Monit admin password (to set): ', :verify => true)}, :default_desc => "password prompt")
+    task_arg(:monit_conf_dir, :default => "/etc/monit")
+    task_arg(:monit_pid_path, "Path to monit pid", :default => "/var/run/monit.pid")
+    task_arg(:monit_log_path, "Path to monit log file", :default => "/var/log/monit.log")
+    task_arg(:monit_build_options, <<-EOS)    
+    Monit build options
     <pre>
     <code class="ruby">
     set :monit_build_options, { :url => "http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz" }
     </code>
     </pre>
-
-    <dt>monit_port</dt>
-    <dd>Monit port</dd>
-    <dd class="default">Defaults to @2812@</dd>
-    <dd>@set :monit_port, 2812@</dd>
-
-    <dt>monit_password</dt>
-    <dd>Monit password</dd>
-    <dd class="default">Defaults to password prompt</dd>
-    <dd>@set :monit_password, prompt.password('Monit admin password (to set): ')@</dd>
-
-    <dt>monit_conf_dir</dt><dd>Directory for monitrc files.</dd>
-    <dd>@set :monit_conf_dir, "/etc/monit"@</dd>
-
-    <dt>monit_pid_path</dt><dd>Path to monit pid.</dd>
-    @set :monit_pid_path, "/var/run/monit.pid"@</dd>
-
-    <dt>monit_log_path</dt>
-    <dd>Path to monit log file.</dd>
-    <dd class="default">Defaults to @/var/log/monit.log@</dd>
-    
-    </dl>
-    "Source":#{link_to_source(__FILE__)}
-    DESC
+    EOS
     task :install do
       
-      # Settings
-      fetch_or_default(:monit_port, 2812)
-      fetch_or_default(:monit_password, prompt.password('Monit admin password (to set): ', :verify => true))
-      fetch_or_default(:monit_conf_dir, "/etc/monit")
-      fetch_or_default(:monit_pid_path, "/var/run/monit.pid")
-      fetch_or_default(:monit_log_path, "/var/log/monit.log")
-      fetch(:monit_build_options)
-        
       # Install dependencies
       yum.install([ "flex", "byacc" ])
         

data/lib/recipes/centos/mysql.rb

@@ -5,19 +5,10 @@ namespace :mysql do
     desc <<-DESC
     Install mysql.
     
-    <dl>
-    <dt>mysql_admin_password_set</dt>
-    <dd>Mysql admin password (to set)</dd>
-    <dd class="default">Defaults to password prompt.</dd>    
-    <pre><code class="ruby">set :mysql_admin_password_set, prompt.password('Mysql admin password (to set): ')<code></pre>
-    </dl>
     "Source":#{link_to_source(__FILE__)}
     DESC
+    task_arg(:mysql_admin_password_set, "Mysql admin password (to set)", :default => Proc.new{prompt.password('Mysql admin password (to set): ', :verify => true)}, :default_desc => "password prompt")
     task :install do    
-      
-      # Settings
-      fetch_or_default(:mysql_admin_password_set, prompt.password('Mysql admin password (to set): ', :verify => true))
-
       # Install through package manager
       yum.install([ "mysql", "mysql-devel", "mysql-server" ])
 

data/lib/recipes/centos/nginx.rb

@@ -5,9 +5,10 @@ namespace :nginx do
     desc <<-DESC
     Install nginx, conf, initscript, nginx user and service.
     
-    <dl>
-    <dt>nginx_build_options</dt>
-    <dd>Nginx build options.
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task_arg(:nginx_build_options, <<-EOS)
+    Nginx build options.
     <pre>
     <code class="ruby">
     set :nginx_build_options, {
@@ -18,39 +19,12 @@ namespace :nginx do
     }
     </code>
     </pre>
-    </dd>
-    
-    <dt>nginx_bin_path</dt>
-    <dd>Nginx sbin path</dd>
-    <dd class="default">Defaults to /sbin/nginx</dd>
-    <dd>@set :nginx_bin_path, "/sbin/nginx"@</dd>
-    
-    <dt>nginx_conf_path</dt>
-    <dd>Path to nginx conf.</dd>
-    <dd class="default">Defaults to /etc/nginx/nginx.conf</dd>
-    <dd>@set :nginx_conf_path, "/etc/nginx/nginx.conf"@</dd>
-    
-    <dt>nginx_pid_path</dt>
-    <dd>Path to nginx pid file</dd>
-    <dd class="default">Defaults to /var/run/nginx.pid</dd>
-    <dd>@set :nginx_pid_path, "/var/run/nginx.pid"@</dd>
-    
-    <dt>nginx_prefix_path</dt>
-    <dd>Nginx install prefix</dd>
-    <dd class="default">Defaults to /var/nginx_</dd>
-    <dd>@set :nginx_prefix_path, "/var/nginx"@</dd>
-    </dl>
-    "Source":#{link_to_source(__FILE__)}
-    DESC
-    task :install do
-      
-      # Settings
-      fetch(:nginx_build_options)
-      fetch_or_default(:nginx_bin_path, "/sbin/nginx")
-      fetch_or_default(:nginx_conf_path, "/etc/nginx/nginx.conf")
-      fetch_or_default(:nginx_pid_path, "/var/run/nginx.pid")
-      fetch_or_default(:nginx_prefix_path, "/var/nginx")      
-            
+    EOS
+    task_arg(:nginx_bin_path, "Nginx sbin path", :default => "/sbin/nginx")
+    task_arg(:nginx_conf_path, "Path to nginx conf", :default => "/etc/nginx/nginx.conf")
+    task_arg(:nginx_pid_path, "Path to nginx pid file", :default => "/var/run/nginx.pid")
+    task_arg(:nginx_prefix_path, "Nginx install prefix", :default => "/var/nginx")          
+    task :install do      
       # Install dependencies
       yum.install([ "pcre-devel", "openssl", "openssl-devel" ]) 
             
@@ -71,11 +45,10 @@ namespace :nginx do
     end
     
     desc "Install nginx initscript"
+    task_arg(:nginx_bin_path, "Nginx sbin path", :default => "/sbin/nginx")
+    task_arg(:nginx_conf_path, "Path to nginx conf", :default => "/etc/nginx/nginx.conf")
+    task_arg(:nginx_pid_path, "Path to nginx pid file", :default => "/var/run/nginx.pid")    
     task :initscript do
-      fetch_or_default(:nginx_bin_path, "/sbin/nginx")
-      fetch_or_default(:nginx_conf_path, "/etc/nginx/nginx.conf")
-      fetch_or_default(:nginx_pid_path, "/var/run/nginx.pid")
-      
       utils.install_template("nginx/nginx.initd.centos.erb", "/etc/init.d/nginx")
       run_via "/sbin/chkconfig --level 345 nginx on"
     end
@@ -84,8 +57,7 @@ namespace :nginx do
     desc "Restart nginx (service)"
     task :restart do
       sudo "/sbin/service nginx restart"
-    end
-    
+    end    
     
   end
   

data/lib/recipes/centos/ruby.rb

@@ -5,14 +5,10 @@ namespace :ruby do
     desc <<-DESC
     Install ruby and rubygems.
     
-    <dl>    
-    <dt>ruby_build_options</dt>
-    <dd>Ruby build options.</dd>
-    
-    <dt>rubygems_build_options<dt>
-    <dd>Rubygems build options.</dd>    
-    </dl>
-    
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task_arg(:ruby_build_options, <<-EOS)
+    Rubygems build options.
     <pre>
     <code class="ruby">
     set :ruby_build_options, {
@@ -23,14 +19,9 @@ namespace :ruby do
     }
     </code>
     </pre>
-    "Source":#{link_to_source(__FILE__)}
-    DESC
+    EOS
+    task_arg(:rubygems_build_options, "Rubygems build options")    
     task :install do 
-
-      # Settings
-      fetch(:ruby_build_options)
-      fetch(:rubygems_build_options)
-    
       # Install dependencies
       yum.install([ "zlib", "zlib-devel", "readline-devel" ])
     

data/lib/recipes/centos/sphinx.rb

@@ -5,10 +5,9 @@ namespace :sphinx do
     desc <<-DESC
     Install sphinx.\n
     
-    <dl>
-    <dt>sphinx_build_options</dt>
-    <dd>Sphinx build options.</dd>
-    <dd>
+    DESC
+    task_arg(:sphinx_build_options, <<-EOS)
+    Sphinx build options.
     <pre>
     <code class="ruby">
     set :sphinx_build_options, {
@@ -18,19 +17,9 @@ namespace :sphinx do
     }
     </code>    
     </pre>
-    </dd>
-    
-    <dt>sphinx_prefix</dt>
-    <dd>Sphinx install prefix</dd>
-    <dd class="default">Defaults to @/usr/local/sphinx@</dd>
-    </dl>
-    DESC
+    EOS
+    task_arg(:sphinx_prefix, "Sphinx install prefix", :default => "/usr/local/sphinx")    
     task :install do 
-      
-      # Settings
-      fetch(:sphinx_build_options)
-      fetch_or_default(:sphinx_prefix, "/usr/local/sphinx")
-      
       # Install dependencies
       yum.install([ "gcc-c++" ])
       
@@ -41,37 +30,25 @@ namespace :sphinx do
     desc <<-DESC
     Setup sphinx for application.
   
-    <dl>
-    <dt>sphinx_prefix</dt><dd>Sphinx install prefix</dd><dd class="default">Defaults to @/usr/local/sphinx@</dd>
-    <dt>sphinx_pid_path</dt><dd>Directory to sphinx pid</dd><dd class="default">Defaults to @\#{shared_path}/pids/searchd.pid@</dd>
-    <dt>sphinx_conf_path</dt><dd>Path to sphinx.conf</dd><dd class="default">Defaults to @\#{shared_path}/config/sphinx.conf@</dd>
-    <dt>sphinx_index_path</dt><dd>Path to sphinx indexes</dd><dd class="default">Defaults to @\#{shared_path}/var/index@</dd>
-    </dl>
     "Source":#{link_to_source(__FILE__)}
     DESC
+    task_arg(:sphinx_prefix, "Sphinx install prefix", :default => "/usr/local/sphinx")
+    task_arg(:sphinx_pid_path, "Directory to sphinx pid", :default => Proc.new{"#{shared_path}/pids/searchd.pid"}, :default_desc => "\#{shared_path}/pids/searchd.pid")
+    task_arg(:sphinx_conf_path, "Path to sphinx.conf", :default => Proc.new{"#{shared_path}/config/sphinx.conf"}, :default_desc => "\#{shared_path}/config/sphinx.conf")      
+    task_arg(:sphinx_index_root, "Path to sphinx indexes", :default => Proc.new{"#{shared_path}/var/index"}, :default_desc => "\#{shared_path}/var/index")
     task :setup do       
-      
-      # Settings
-      fetch_or_default(:sphinx_prefix, "/usr/local/sphinx")
-      fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")
-      fetch_or_default(:sphinx_conf_path, "#{shared_path}/config/sphinx.conf")      
-      fetch_or_default(:sphinx_index_root, "#{shared_path}/var/index")      
-
       initscript
-
       # Create app indexes dir
       run "mkdir -p #{shared_path}/var/index"    
     end
     
     
     desc "Setup sphinx initscript"
+    task_arg(:sphinx_prefix, "Sphinx install prefix", :default => "/usr/local/sphinx")
+    task_arg(:sphinx_pid_path, "Directory to sphinx pid", :default => Proc.new{"#{shared_path}/pids/searchd.pid"}, :default_desc => "\#{shared_path}/pids/searchd.pid")
+    task_arg(:sphinx_conf_path, "Path to sphinx.conf", :default => Proc.new{"#{shared_path}/config/sphinx.conf"}, :default_desc => "\#{shared_path}/config/sphinx.conf")      
+    task_arg(:sphinx_index_root, "Path to sphinx indexes", :default => Proc.new{"#{shared_path}/var/index"}, :default_desc => "\#{shared_path}/var/index")    
     task :initscript do      
-
-      fetch_or_default(:sphinx_prefix, "/usr/local/sphinx")
-      fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")
-      fetch_or_default(:sphinx_conf_path, "#{shared_path}/config/sphinx.conf")      
-      fetch_or_default(:sphinx_index_root, "#{shared_path}/var/index")      
-      
       utils.install_template("sphinx/sphinx_app.initd.centos.erb", "/etc/init.d/sphinx_#{application}")
       run_via "/sbin/chkconfig --level 345 sphinx_#{application} on"
       

data/lib/recipes/docs.rb

@@ -5,24 +5,12 @@ namespace :docs do
   
   This recipe generated this documentation.
   
-  <dl>
-  <dt>docs_recipes_dir</dd>
-  <dd>Destination directory</dd>
-  <dd class="default">Defaults to @docs/recipes@</dd>  
-  <dd>@set :docs_recipes_dir, "docs/recipes"@</dd>   
-    
-  <dt>docs_recipes_clear</dt>
-  <dd>Whether to clear destination before generating.</dd>  
-  <dd>@set :docs_recipes_clear, true@</dd>
-  </dl>
   "Source":#{link_to_source(__FILE__)}
   DESC
+  task_arg(:docs_recipes_dir, "Destination directory", :default => "docs/recipes")
+  task_arg(:docs_recipes_clear, "Whether to clear destination before generating.", :default => true)
   task :recipes do
     
-    # Settings
-    fetch_or_default(:docs_recipes_dir, "docs/recipes")
-    fetch_or_default(:docs_recipes_clear, true)
-    
     # Build task tree
     top_node = capitate.task_tree
         

data/lib/recipes/logrotated.rb

@@ -3,23 +3,22 @@ namespace :logrotated do
   
   desc <<-DESC
   Create logrotated conf. You probably use this in other recipes and not standalone.
-  
-  <dl>
-  <dt>logrotate_name</dt>
-  <dd>Name of file in /etc/logrotate.d/</dd>
-  
-  <dt>logrotate_log_path<dt>
-  <dd>Path to log file. Can include wildcards, like /var/log/foo_*.log.</dd>
-  
-  <dt>logrotate_options</dt>
-  <dd>:rotate (Number of times to rotate before discarding)</dd>
-  <dd>:size (Rotate when file hits this size)</dd>
-  <dd>:daily, :weekly, :monthly (How often to perform rotate)</dd>
-  <dd>:missingok</dd>
-  <dd>:compress</dd>
-  <dd>:delaycompress</dd>
-  <dd>:notifempty</dd>
-  <dd>:copytruncate</dd>
+    
+  "Source":#{link_to_source(__FILE__)}
+  DESC
+  task_arg(:logrotate_name, "Name of file in /etc/logrotate.d/")
+  task_arg(:logrotate_log_path, "Path to log file. Can include wildcards, like /var/log/foo_*.log.")
+  task_arg(:logrotate_options, <<-EOS)
+  Log rotate options
+  
+  * :rotate (Number of times to rotate before discarding)
+  * :size (Rotate when file hits this size)
+  * :daily, :weekly, :monthly (How often to perform rotate)
+  * :missingok
+  * :compress
+  * :delaycompress
+  * :notifempty
+  * :copytruncate
   
   See man page for all the options.
   
@@ -29,14 +28,9 @@ namespace :logrotated do
       :daily, :missingok, :compress, :delaycompress, :notifempty, :copytruncate ]
   </code>
   </pre>
-  "Source":#{link_to_source(__FILE__)}
-  DESC
+  EOS
   task :install_conf do
     
-    fetch(:logrotate_name)
-    fetch(:logrotate_log_path)
-    fetch(:logrotate_options)
-    
     text = []    
     logrotate_options.each do |option|            
       if option.is_a?(Hash)
@@ -56,26 +50,12 @@ namespace :logrotated do
   desc <<-DESC
   Force rotate files.
   
-  <dl>
-  <dt>logrotate_prefix</dt>
-  <dd>Path to logrotate</dd>
-  <dd>Defaults to none</dd>
-  
-  <dt>logrotate_conf_path</dt>
-  <dd>Path to logrotate conf</dd>
-  <dd>Defaults to @"/etc/logrotate.conf"@</dd>
-  </dl>
   "Source":#{link_to_source(__FILE__)}   
   DESC
+  task_arg(:logrotate_bin_path, "Logrotate bin path", :default => "logrotate", :example => "/usr/local/bin/logrotate")
+  task_arg(:logrotate_conf_path, "Path to logrotate conf", :default => "/etc/logrotate.conf")
   task :force do 
-        
-    fetch_or_default(:logrotate_prefix, "")
-    fetch_or_default(:logrotate_conf_path, "/etc/logrotate.conf")    
-    
-    command = "logrotate"
-    command = "#{logrotate_prefix}/logrotate" unless logrotate_prefix.blank?
-    
-    run_via "#{command} -f #{logrotate_conf_path}"    
+    run_via "#{logrotate_bin_path} -f #{logrotate_conf_path}"    
   end
   
 end