slingshot 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1.2 2007-11-01
+
+* minor updates using yourdomain, redirects in main file
+
 == 1.1.1 2007-08-17
 
 * few minor tweaks relating to directory creation on startup

data/lib/slingshot/recipes.rb

@@ -78,6 +78,10 @@ set :crontab_email, "root@localhost"
 
 set :mongrel_cluster_configuration_dir, "/etc/mongrel_cluster"
 
+# set this to true to ensure that the apache config file gets loaded first
+#   we build 00_application.conf to ensure it is first in the load path
+set :primary_web_configuration_loaded_first, false
+
 # =============================================================================
 # RAILS APPLICATION CONFIGURATION TASKS
 # =============================================================================
@@ -109,7 +113,6 @@ task :after_setup do
   mongrel_configuration_setup
   database_configuration_setup
   apache_configuration_setup
-  apache_redirects_setup
   crontab_configuration_setup
   
 end

data/lib/slingshot/server_setup.rb

@@ -65,7 +65,7 @@ task :yum_update_system do
     retry
   end
   
-  run "yum -y install curl lynx gcc mysql mysql-server mysql-devel postfix subversion mod_dav_svn monit rdiff-backup zlib zlib-devel openssl openssl-devel ImageMagick ImageMagick-devel ntp"
+  run "yum -y install curl lynx gcc make mysql mysql-server mysql-devel postfix subversion mod_dav_svn monit rdiff-backup zlib zlib-devel openssl openssl-devel ImageMagick ImageMagick-devel ntp ncurses-devel"
 end
 
 desc "Add default users"
@@ -379,9 +379,22 @@ EOF
              downgrade-1.0 force-response-1.0
     </IfModule>
   </VirtualHost>
+
 EOF
   end
   
+  if redirect_www_requests
+  apache2_rails_conf +=<<-EOF
+  <VirtualHost *:80>
+          ServerName   #{domain_name}
+          ServerAlias  www.#{domain_name}
+          ServerAdmin  support@#{domain_name}
+          RedirectPermanent / "http://www.#{domain_name}/"
+  </VirtualHost>
+
+EOF
+  end
+
   apache2_rails_conf +=<<-EOF
   <Proxy balancer://#{application}_mongrel_cluster>
 EOF
@@ -412,8 +425,8 @@ EOF
   apache2_rails_configuration = render :template => apache2_rails_conf
 
   apache2_rails_common = render :template => <<-EOF
-  ServerName #{server_name}
-  ServerAlias www.#{server_name}
+  ServerName #{domain_name}
+  ServerAlias www.#{domain_name}
   DocumentRoot #{deploy_to}/current/public
 
   <Directory "#{deploy_to}/current/public">
@@ -464,34 +477,11 @@ EOF
 
   # if apache is setup to read /etc/rails/*.conf these will get read as configuration files
   #  see prerequisites above for more info
-  sudo "ln -nfs #{deploy_to}/#{shared_dir}/system/#{application}.conf #{apache_conf_home}/#{application}.conf"
+  sudo "ln -nfs #{deploy_to}/#{shared_dir}/system/#{application}.conf #{apache_conf_home}/#{primary_web_configuration_loaded_first ? "00_" : ""}#{application}.conf"
   sudo "ln -nfs #{deploy_to}/#{shared_dir}/system/#{application}.common #{apache_conf_home}/#{application}.common"
 
 end
 
-desc "Apache Redirects for ensuring www.servername.com answers"
-task :apache_redirects_setup do
-
-  if redirect_www_requests
-  redirect_apache2_rails_conf = <<-EOF
-  <VirtualHost *:80>
-          ServerName   #{domain_name}
-          ServerAlias  www.#{domain_name}
-          ServerAdmin  support@#{domain_name}
-          RedirectPermanent / "http://www.#{domain_name}/"
-  </VirtualHost>
-    
-EOF
-
-  redirect_apache2_rails_configuration = render :template => redirect_apache2_rails_conf
-
-  put redirect_apache2_rails_configuration, "#{deploy_to}/#{shared_dir}/system/redirects.conf"
-
-  # since apache is setup to read /etc/rails/*.conf these will get read as configuration files
-  sudo "ln -nfs #{deploy_to}/#{shared_dir}/system/redirects.conf #{apache_conf_home}/redirects.conf"
-  end 
-end
-
 desc "Setup crontab Configuration"
 task :crontab_configuration_setup do
   

data/lib/slingshot/version.rb

@@ -2,7 +2,7 @@ module Slingshot #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Slingshot</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/slingshot"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/slingshot" class="numbers">1.1.1</a>
+      <a href="http://rubyforge.org/projects/slingshot" class="numbers">1.1.2</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: slingshot
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-08-17 00:00:00 -04:00
+  version: 1.1.2
+date: 2007-11-03 00:00:00 -04:00
 summary: Set of server setup tasks for use with Slingshot Hosting
 require_paths: 
 - lib