oneblackbear-obbistrano 1.0.22 → 1.0.23

data/lib/obbistrano_tasks.rb

@@ -252,12 +252,12 @@ Capistrano::Configuration.instance(:must_exist).load do
         public_ip = ""
         run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
         public_ip = public_ip.strip
-        f = File.open(File.join(File.dirname(__FILE__), 'templates/apache_vhost.erb' ))
-        contents = f.read
-        f.close
-        buffer = ERB.new(contents)
-        config = buffer.result(binding())
         roles[:web].servers.each do |webserver|
+          f = File.open(File.join(File.dirname(__FILE__), 'templates/apache_vhost.erb' ))
+          contents = f.read
+          f.close
+          buffer = ERB.new(contents)
+          config = buffer.result(binding())
           put config, "/etc/httpd/conf.d/#{webserver}-apache-vhost.conf"
         end  
       end

data/lib/templates/apache_vhost.erb

@@ -1,14 +1,14 @@
 <VirtualHost <%=public_ip%>:80>
-  ServerName <%=domain%>
+  ServerName <%=webserver%>
   <%aliases.each do |aliass|%>
     ServerAlias <%=aliass%>
   <%end%>
-  DocumentRoot /home/<%=application%>/public
+  DocumentRoot /home/<%=application%>/<%=deploy_to%>/public
   DirectoryIndex index.html index.htm index.php
   AddOutputFilterByType DEFLATE text/html text/plain text/xml application/x-javascript text/css
   SetOutputFilter DEFLATE
 
-  <Directory /home/<%=application%>/public>
+  <Directory /home/<%=application%>/<%=deploy_to%>/public>
     Options Indexes IncludesNOEXEC FollowSymLinks
     allow from all
     AllowOverride All

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.0.22"
+  s.version = "1.0.23"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.date = Time.now
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oneblackbear-obbistrano
 version: !ruby/object:Gem::Version 
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors: 
 - Ross Riley