lib/kuzushi.rb in kuzushi-0.0.41 vs lib/kuzushi.rb in kuzushi-0.0.42

- old
+ new

@@ -107,22 +107,24 @@ def service_file(service) file = [] file << "start on stopped rc RUNLEVEL=[2345]" file << "stop on runlevel [!2345]" + filt << "" file << "respawn" unless service.respawn == false if service.user - file << "exec su -c '#{service.command}' #{service.user}" ## TODO add shell escaping here + file << "exec su - -c '#{service.command}' #{service.user}" ## TODO add shell escaping here else file << "exec #{service.command}" end - file.join("\n") + filt << "" + file.join("\n") end def process_services(service) task "installing service #{service.name}" do - put_file(service_file(service), "/etc/init/#{service.name}.conf") + put_file(service_file(service), "/etc/init/#{service.name}.conf", 0600) shell "service #{service.name} start" end end def process_packages @@ -385,14 +387,14 @@ def cp_file(src, dest) FileUtils.mkdir_p(File.dirname(dest)) FileUtils.cp(src, dest) end - def put_file(data, dest) + def put_file(data, dest, mode = 0700) FileUtils.mkdir_p(File.dirname(dest)) File.open(dest,"w") do |f| f.write(data) - f.chmod(0700) + f.chmod(mode) end end def log(message) puts message