dew 0.1.8 → 0.1.9

data/lib/dew/commands/deploy.rb

@@ -45,6 +45,7 @@ class DeployCommand < Clamp::Command
       end
 
       env = Environment.get(environment_name)
+      raise "Unknown environment #{environment_name}" unless env
 
       db_managed = false
 
@@ -161,6 +162,7 @@ class DeployCommand < Clamp::Command
             ssh.run "sudo a2dissite default"
           end
           Inform.debug("Uploading passenger config")
+          working_directory = ssh.run("cd #{application_name} && pwd").chomp
           passenger_config = ERB.new(File.read template('apache.conf.erb')).result(OpenStruct.new(
             :use_passenger? => use_passenger?,
             :use_ssl? => use_ssl?,
@@ -168,11 +170,13 @@ class DeployCommand < Clamp::Command
             :rails_env => rails_env,
             :log_dir => is_redhat ? '/var/log/httpd' : '/var/log/apache2',
             :application_name => application_name,
-            :working_directory => "/home/ubuntu/#{application_name}",
+            :working_directory => working_directory,
             :gamej_proxy => gamej_proxy
           ).instance_eval {binding})
-          ssh.write passenger_config, "/tmp/apache.conf"
-          ssh.run "sudo cp /tmp/apache.conf #{conf_dest}"
+          apache_tmpfile = ssh.run("mktemp -t apacheconf").chomp
+          ssh.write passenger_config, apache_tmpfile
+          ssh.run "sudo cp #{apache_tmpfile} #{conf_dest}"
+          ssh.run "rm #{apache_tmpfile}"
           ssh.run "sudo chmod 0644 #{conf_dest}" # yeah, I don't know why it gets written as 0600
           unless is_redhat || ssh.exist?('/etc/apache2/sites-enabled/#{application_name}')
             Inform.debug("Enabling site in apache")

data/lib/dew/commands/deploy/templates/apache.conf.erb

@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
     ServerAdmin admin@playup.com
 
     <% if server_name %>
@@ -48,6 +48,7 @@
 	ProxyPassReverse /api/ http://<%= server_name %>/
     <% end %>
 </VirtualHost>
+
 <% if use_ssl? %>
 NameVirtualHost *:443
 <VirtualHost *:443>

data/lib/dew/version.rb

@@ -1,3 +1,3 @@
 module Dew
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -2,7 +2,7 @@
 name: dew
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - PlayUp Devops
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 Z
+date: 2011-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inform