FiXato-ubuntu-machine 0.5.3.2.5 → 0.5.3.2.7

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

@@ -14,8 +14,12 @@ namespace :ruby do
   
 
   set :ruby_enterprise_url do
-    path = Net::HTTP.get('www.rubyenterpriseedition.com', '/download.html').scan(/<a href="\/ruby-enterprise-.*\.tar\.gz/).first
-    path.gsub!('<a href="','http://www.rubyenterpriseedition.com')
+    path = Net::HTTP.get('www.rubyenterpriseedition.com', '/download.html').scan(/<a href=".*\/ruby-enterprise-.*\.tar\.gz"/).first
+    path.gsub!('<a href="','').gsub!('"','')
+    # in case they have relative URLs again:
+    if path[0,1] == '/'
+      path = 'http://www.rubyenterpriseedition.com%s' % path
+    end
     path
   end
 
@@ -28,7 +32,7 @@ namespace :ruby do
   end
   
   set :passenger_version do
-    `gem list passenger$ -r`.gsub(/[\n|\s|passenger|(|)]/,"")
+    `gem list passenger$ -r`.gsub(/[\n|\s|passenger|(|)]/,"").split(',').first
   end
   
 

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

@@ -40,7 +40,7 @@
 
 
 # Reject all other inbound - default deny unless explicitly allowed policy
--A INPUT -j REJECT
--A FORWARD -j REJECT
+#-A INPUT -j REJECT
+#-A FORWARD -j REJECT
 
 COMMIT

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

@@ -17,4 +17,26 @@ namespace :tmpfs do
       sudo "mv fstab.tmp /etc/fstab"
     end
   end
+
+  desc "Create ftp directories within :vsftpd_tmpfs_directory for each user defined in :vsftpd_users and symlink in their homedirs"
+  task :create_vsftpd_tmpfs_dirs, :roles => :app do
+    cron_commands = []
+    vsftpd_users.each do |target_user|
+      target_tmpfs_dir = File.join(vsftpd_tmpfs_directory,target_user)
+      cmds = []
+      cmds << "mkdir -p #{target_tmpfs_dir}"
+      cmds << "chown #{target_user}:#{vsftpd_group} #{target_tmpfs_dir}"
+      cmds << "chmod 0777 #{target_tmpfs_dir}"
+      cmds.each{|cmd| sudo cmd}
+      cron_commands << cmds.join(' && ')
+      sudo "ln -s #{File.join(vsftpd_tmpfs_directory,target_user)} ~#{target_user}/ftp"
+    end
+
+    tmp_cron="/tmp/tmp_cron"
+    sudo "rm -f #{tmp_cron} && crontab -l || true > #{tmp_cron}"
+    cron_commands.compact.each do |cmd|
+      run "echo '@reboot #{cmd}' >> #{tmp_cron}"
+    end
+    sudo "crontab #{tmp_cron}"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: FiXato-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.5.3.2.5
+  version: 0.5.3.2.7
 platform: ruby
 authors: 
 - Thomas Balthazar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency