le1t0-deprec 2.1.6.024 → 2.1.6.025

data/CHANGELOG

@@ -1,5 +1,9 @@
 # deprec changelog
 
+= 2.1.6.025 (Jul 15, 2010)
+
+* bugfix for haproxy + fix user to run haproxy under
+
 = 2.1.6.024 (Jul 15, 2010)
 
 * made haproxy configurable

data/lib/deprec/recipes/haproxy.rb

@@ -11,8 +11,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       }
       
+      set :haproxy_user, 'root'
+      set :haproxy_group, 'root'
+      
       # :haproxy_global_options should be a hash of options, in key => value pairs. Values can also be arrays of strings.
-      set :haproxy_global_options => {
+      set :haproxy_global_options, {
         "log" => "/var/log/haproxy.log daemon info",
         "maxconn" => 4096,
         "pidfile" => "/var/run/haproxy.pid",
@@ -22,7 +25,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # :haproxy_default_options should be a hash of options, in key => value pairs. 
       #  :stats_auth => 'user:password' presence of this setting automatically enables stats
       #  :options => hash of options, in key => value pairs. Values can also be arrays of strings. 
-      set :haproxy_default_options => {
+      set :haproxy_default_options, {
         :stats_auth => 'user:password',
         :options => {
           "option" => [

data/lib/deprec/templates/haproxy/haproxy-init.d

@@ -41,7 +41,7 @@ haproxy_start()
 
 haproxy_stop()
 {
-	start-stop-daemon --stop --user root --pidfile "$PIDFILE" \
+	start-stop-daemon --stop --user <%= haproxy_user %> --pidfile "$PIDFILE" \
 		|| return 2
 	return 0
 }

data/lib/deprec/templates/haproxy/haproxy.cfg.erb

@@ -5,6 +5,8 @@
 # haproxy -f /etc/haproxy.cfg -sf `cat /var/run/haproxy.pid`
 #
 global
+      user <%= haproxy_user %>
+      group <%= haproxy_group %>
 <% haproxy_global_options.each do |key, values| [values].flatten.each do |value| %>
       <%= key %> <%= value %>
 <% end end %>

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 1
   - 6
-  - 24
-  version: 2.1.6.024
+  - 25
+  version: 2.1.6.025
 platform: ruby
 authors: 
 - Le1t0