FiXato-ubuntu-machine 0.5.3.2.10 → 0.5.3.2.11

data/lib/capistrano/ext/ubuntu-machine/helpers.rb

@@ -41,9 +41,12 @@ end
 
 def sudo_add_to_file(file,lines)
   tmpfile = "#{File.basename(file)}.tmp"
-  run "cp #{file} #{tmpfile}"
+  sudo "cp #{file} #{tmpfile}"
+  # Temporarily make world read/writable so it can be appended to. 
+  sudo "chmod 0777 #{tmpfile} && sudo chown #{user}:#{user} #{tmpfile}"
   add_to_file(tmpfile,lines)
-  sudo "mv #{tmpfile} #{file}"
+  # Use cp + rm instead mv so the destination file will keep its owner/modes.
+  sudo "cp #{tmpfile} #{file} && rm #{tmpfile}"
 end
 
 # Re-activate sudo session if it has expired.
@@ -56,7 +59,7 @@ end
 # - period should be a valid crontab period
 # - use_sudo can be set to true if you want to edit the root crontab.
 def add_to_crontab(commands,period,use_sudo=false)
-  send_cmd = use_sudo ? :run : :sudo
+  send_cmd = use_sudo ? :sudo : :run
   tmp_cron="/tmp/cron.tmp"
   cron_lines = [*commands].map{|cmd| "#{period} #{cmd}"}
   self.send(send_cmd, "rm -f #{tmp_cron} && crontab -l || true > #{tmp_cron}")

data/lib/capistrano/ext/ubuntu-machine/ssh.rb

@@ -1,5 +1,7 @@
 namespace :ssh do
   _cset :ssh_secundary_keys, []
+  _cset(:ssh_config_port) {ssh_options[:port] || 22}
+
   desc <<-DESC
     Setup SSH on the gateway host. Runs `upload_keys`, `install_ovh_ssh_key` AND \
     `configure_sshd` then reloads the SSH service to finalize the changes.

data/lib/capistrano/ext/ubuntu-machine/templates/sshd_config.erb

@@ -2,7 +2,7 @@
 # See the sshd(8) manpage for details
 
 # What ports, IPs and protocols we listen for
-Port <%= ssh_options[:port] %>
+Port <%= ssh_config_port %>
 # Use these options to restrict which interfaces/protocols sshd will bind to
 #ListenAddress ::
 #ListenAddress 0.0.0.0
@@ -77,4 +77,4 @@ Subsystem sftp /usr/lib/openssh/sftp-server
 
 UseDNS no
 
-AllowUsers <%= user %>
+AllowUsers root <%= user %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: FiXato-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.5.3.2.10
+  version: 0.5.3.2.11
 platform: ruby
 authors: 
 - Thomas Balthazar