gluez 0.4.5 → 0.4.6

data/lib/gluez/resources/disable.rb

@@ -1,6 +1,8 @@
 resource :disable do
   ready!
   
+  self.as_user "root"
+  
   steps do |step|
     step.checks << "\\$(update-rc.d -n -f #{self.name} remove | grep '/etc/rc' | wc -l) -eq 0"
     step.code = "/usr/sbin/update-rc.d -f #{self.name} remove"

data/lib/gluez/resources/enable.rb

@@ -1,6 +1,8 @@
 resource :enable do
   ready!
   
+  self.as_user "root"
+  
   steps do |step|
     step.checks << "\\$(update-rc.d -n -f #{self.name} remove | grep '/etc/rc' | wc -l) -gt 0"
     step.code = "/usr/sbin/update-rc.d #{self.name} defaults"

data/lib/gluez/resources/initd.rb

@@ -2,6 +2,7 @@ require 'base64'
 
 resource :initd do
   optional    :daemon_opts, :default => ""
+  optional    :path, :default => "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
   mandatory   :daemon
   
   ready!
@@ -21,9 +22,9 @@ resource :initd do
     # Description:       starts #{self.name}
     ### END INIT INFO
 
-    PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+    PATH=#{self.path}
     DAEMON=#{self.daemon}
-    DAEMON_OPTS=#{self.daemon_opts}
+    DAEMON_OPTS="#{self.daemon_opts}"
     NAME=#{self.name}
     DESC=$NAME
 
@@ -41,26 +42,26 @@ resource :initd do
     case "$1" in
       start)
         echo -n "Starting $DESC: "
-        start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS || true
+        start-stop-daemon --start --chuid #{self.user} --quiet --pidfile /var/run/$NAME.pid --exec su -l #{self.user} -c '$DAEMON' -- $DAEMON_OPTS || true
         echo "$NAME."
         ;;
 
       stop)
         echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON || true
+        start-stop-daemon --stop --chuid #{self.user} --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON || true
         echo "$NAME."
         ;;
 
       restart|force-reload)
         echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON || true
+        start-stop-daemon --stop --chuid #{self.user} --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON || true
         sleep 1
-        start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS || true
+        start-stop-daemon --start --chuid #{self.user} --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS || true
         echo "$NAME."
         ;;    
       reload)
         echo -n "Reloading $DESC configuration: "
-        start-stop-daemon --stop --signal HUP --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON || true
+        start-stop-daemon --stop --chuid #{self.user} --signal HUP --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON || true
         echo "$NAME."
         ;;
 

data/lib/gluez/resources/restart.rb

@@ -1,5 +1,8 @@
 resource :restart do
   ready!
+  
+  self.as_user "root"
+  
   steps do |step|
     step.code = "service #{self.name} restart"
   end

data/lib/gluez/resources/start.rb

@@ -1,6 +1,8 @@
 resource :start do
   ready!
   
+  self.as_user "root"
+  
   setup = "service --status-all 1>/tmp/gluez.tmp 2>&1"
   steps do |step|
     step.checks << %Q("\\$(grep #{self.name} /tmp/gluez.tmp | wc -l)" = "1")

data/lib/gluez/resources/stop.rb

@@ -1,6 +1,8 @@
 resource :stop do
   ready!
   
+  self.as_user "root"
+  
   setup = "service --status-all 1>/tmp/gluez.tmp 2>&1"
   steps do |step|
     step.checks << %Q("\\$(grep #{self.name} /tmp/gluez.tmp | wc -l)" = "1")

data/lib/gluez/resources/upstart.rb

@@ -0,0 +1,46 @@
+require 'base64'
+
+resource :upstart do
+  optional    :start_on,  :default => "runlevel [2]"
+  optional    :stop_on,   :default => "runlevel [016]"
+  optional    :fork,      :default => false
+  mandatory   :code
+  
+  ready!
+  
+  self.as_user "root"
+
+  script = <<-EOF
+    description "#{self.name}"
+
+    start on #{self.start_on}
+    stop on #{self.stop_on}
+
+    console owner
+
+    #{self.fork ? 'expect fork' : ''}
+    respawn
+
+    exec #{self.code}
+  EOF
+  
+  script64 = Base64.encode64(script.multiline_strip)
+
+  setup "cat >~/.gluez_transfer <<\\DATA
+#{script64.strip}
+DATA"
+  
+  steps do |step|
+    step.checks << "-f /etc/init/#{self.name}.conf"
+    step.code = "touch /etc/init/#{self.name}.conf"
+  end
+  steps do |step|
+    step.checks << %Q("\\$(cat ~/.gluez_transfer | base64 -i -d - | md5sum - | awk '{print \\$1}')" = "\\$(md5sum /etc/init/#{self.name}.conf | awk '{print \\$1}')")
+    step.code = "cat ~/.gluez_transfer | base64 -i -d - > /etc/init/#{self.name}.conf"
+  end
+  steps do |step|
+    step.checks << "-L /etc/init.d/#{self.name}"
+    step.code = "ln -s /lib/init/upstart-job /etc/init.d/#{self.name}"
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gluez
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -41,6 +41,7 @@ files:
 - lib/gluez/resources/substitute.rb
 - lib/gluez/resources/transfer.rb
 - lib/gluez/resources/umount.rb
+- lib/gluez/resources/upstart.rb
 - lib/gluez/string.rb
 - lib/gluez/templates/profile.erb
 - lib/gluez.rb