ms_deploy 0.3.2 → 0.3.3

data/lib/ms_deploy/recipes/nginx.rb

@@ -49,32 +49,28 @@ Capistrano::Configuration.instance.load do
           'serve_static_files' => fetch(:serve_static_files, true),
       }
 
+      sites_path = fetch(:nginx_sites_enabled_path, "/etc/nginx/sites-enabled")
+
       if protocol.nil? or protocol == 'http' or protocol == 'both'
         config_path = "#{shared_path}/config/#{application}_vhost.conf"
 
-        sites_path = fetch(:nginx_sites_enabled_path, "/etc/nginx/sites-enabled")
-
-        if protocol.nil? or protocol == 'http' or protocol == 'both'
-          config_path = "#{shared_path}/config/#{application}_vhost.conf"
-
-          put(render_erb_template(template_path, vars), config_path)
+        put(render_erb_template(template_path, vars), config_path)
 
-          with_user(fetch(:setup_user, user)) do
-            try_sudo "rm -f #{sites_path}/#{application}_#{stage}.conf"
-            try_sudo "ln -s #{config_path} #{sites_path}/#{application}_#{stage}.conf"
-          end
+        with_user(fetch(:setup_user, user)) do
+          try_sudo "rm -f #{sites_path}/#{application}_#{stage}.conf"
+          try_sudo "ln -s #{config_path} #{sites_path}/#{application}_#{stage}.conf"
         end
-        if protocol == 'https' or protocol == 'both'
-          vars.merge!({'protocol' => 'https'})
+      end
+      if protocol == 'https' or protocol == 'both'
+        vars.merge!({'protocol' => 'https'})
 
-          config_path = "#{shared_path}/config/#{application}_ssl_vhost.conf"
+        config_path = "#{shared_path}/config/#{application}_ssl_vhost.conf"
 
-          put(render_erb_template(template_path, vars), config_path)
+        put(render_erb_template(template_path, vars), config_path)
 
-          with_user(fetch(:setup_user, user)) do
-            try_sudo "rm -f #{sites_path}/#{application}_#{stage}_ssl.conf"
-            try_sudo "ln -s #{config_path} #{sites_path}/#{application}_#{stage}_ssl.conf"
-          end
+        with_user(fetch(:setup_user, user)) do
+          try_sudo "rm -f #{sites_path}/#{application}_#{stage}_ssl.conf"
+          try_sudo "ln -s #{config_path} #{sites_path}/#{application}_#{stage}_ssl.conf"
         end
       end
     end

data/lib/ms_deploy/version.rb

@@ -1,3 +1,3 @@
 module MsDeploy
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ms_deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter