<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>configure_slicehost_rails_only.sh</filename>
    </added>
    <added>
      <filename>eldorado.database.yml</filename>
    </added>
    <added>
      <filename>notes.txt</filename>
    </added>
    <added>
      <filename>spin</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -4,8 +4,15 @@ is a basic shell script to prepare a remote Slicehost Ubuntu 8.04 VPS
 for running production Ruby on Rails 
 applications.
 
+The script is self contained and does not require any user input except 
+the password of your target slice. In the original version, you also
+need to update the target address of your slice from &quot;fiveruns.slicehost.com&quot;
+to the address of your account.  It will take your environment from 
+blank build to live, serving a sample &#8220;Hello World&#8221; application in 
+about 90 seconds.  
+
 It is available at: http://github.com/mmond.  It installed:
- 	Ruby 1.8.6 
+	Ruby 1.8.6 
 	Rubygems 1.2
 	Rails 2.1.0
 	Sqlite3
@@ -13,21 +20,11 @@ It is available at: http://github.com/mmond.  It installed:
 	Thin 0.8.2
 	Hello World example Rails application
 
-The script is self contained and does not require any user input except 
-the password of your target slice. In the original version, you also
-need to update the target address of your slice from &quot;fiveruns.slicehost.com&quot;
-to the address of your account.  It will take your environment from 
-blank build to live, serving a sample &#8220;Hello World&#8221; application in 
-about 90 seconds.
-
 It's completely ripe for cleaning up, extending and customizing for 
 other Linux distros, hosting providers and application configurations.
 
 Currently in process is:  configure_slicehost_eldorado.sh which builds
-on the first script.  
-
-
-This version of script includes the above and:
+on the first script.  This version of script includes the above and:
 	nginx
 	Capistrano
 	Mongrel</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -10,23 +10,26 @@
 #	Edit the following line with your slice's IP or domain name
 ssh root@fiveruns.slicehost.com '
 
-#    Update Ubuntu package manager
+#	Add alias for ll	(Dear Ubuntu: This should be the default)
+echo &quot;alias \&quot;ll=ls -lAgh\&quot;&quot; &gt;&gt; /root/.profile
+
+#   Update Ubuntu package manager
 #
 apt-get update
 apt-get upgrade -y
 
-#    Install dependencies
+#   Install dependencies
 #
-apt-get -y install build-essential libssl-dev libreadline5-dev zlib1g-dev  
+apt-get -y install build-essential libssl-dev libreadline5-dev zlib1g-dev 
 apt-get -y install libsqlite-dev libsqlite3-ruby libsqlite3-dev 
 apt-get -y install mysql-server libmysqlclient15-dev mysql-client 
 
-#    Install Ruby 
+#   Install Ruby 
 #
 apt-get -y install ruby ruby1.8-dev irb ri rdoc libopenssl-ruby1.8 
 
-#    Install rubygems v.1.2 from source.  apt-get installs
-#    version 0.9.4 requiring a lengthy rubygems update
+#   Install rubygems v.1.2 from source.  apt-get installs
+#   version 0.9.4 requiring a lengthy rubygems update
 RUBYGEMS=&quot;rubygems-1.2.0&quot;
 wget http://rubyforge.org/frs/download.php/38646/$RUBYGEMS.tgz
 tar xzf $RUBYGEMS.tgz
@@ -35,13 +38,13 @@ ruby setup.rb
 cd ..
 ln -s /usr/bin/gem1.8 /usr/bin/gem
 
-#    Install gems
+#   Install gems
 # 
 gem install -v=2.1.0 rails --no-rdoc --no-ri  
 gem install mysql  --no-rdoc --no-ri
 gem install tzinfo mysql thin --no-rdoc --no-ri
 
-#    Configure a simple Rails Application
+#   Configure a simple Rails Application
 #
 mkdir /var/www/
 cd /var/www
@@ -50,19 +53,19 @@ cd hello
 ./script/generate controller welcome hello
 echo &quot;Hello World&quot; &gt; app/views/welcome/hello.html.erb
 
-#    Download FiveRuns Manage  ** Installation and registration is run seperately **
-#    If you are new to FiveRuns, sign up for a free trial:  https://manage.fiveruns.com/signup
-#    After, you have created an account, just execute the installer that is downloaded here
+#   Download FiveRuns Manage  ** Installation and registration is run seperately **
+#   If you are new to FiveRuns, sign up for a free trial:  https://manage.fiveruns.com/signup
+#   After, you have created an account, just execute the installer that is downloaded here
 #
 cd /tmp
 wget http://manage.fiveruns.com/system/downloads/client/manage-installer-linux-ubuntu-64bit-intel.sh
 
-#    Install the Manage gem and echoe gem dependency
+#   Install the Manage gem and echoe gem dependency
 #
 gem install fiveruns_manage --source http://gems.fiveruns.com
 gem install echoe --no-ri --no-rdoc
 
-#    Install, configure and start the Thin web server
+#   Install, configure and start the Thin web server
 #
 thin install
 /usr/sbin/update-rc.d -f thin defaults</diff>
      <filename>configure_slicehost.sh</filename>
    </modified>
    <modified>
      <diff>@@ -17,21 +17,26 @@
 #		nginx
 #		Capistrano
 #		Mongrel
-#		Eldorado full stack community web portal   ###########  ???????????
-
-
-#	To execute the script, cd to the parent directory of where you'd like the local copy of the Rails apps.
-#	Hello World will install to ./hello and Eldorado will install to ./eldorado
-
- 
+#		Eldorado full stack community web portal  
+#	
 
 #	Edit the following line with your slice's IP or domain name
 TARGET='YOURACCOUNT.slicehost.com'		# e.g. fiveruns.slicehost.com
 
+#	Create local repository for Eldorado.  configure_slicehost_eldorado.sh will download  
+#	Eldorado from Github to ~/el-dorado 
+git clone git://github.com/trevorturk/el-dorado.git
+#	Update the deploy.rb file.  !!!!!!!!!!!!!!!!!!!!!!!!!!!For now we'll use a manually edited YOURACCOUNT.slicehost.com    !!!!!!!!!!!!!!!!!!!!!!!!!
+#	Use the Eldorado application directory structure.  Doing this now allows us to copy the preconfigured database.yml
+cap deploy:setup
+
 #	Make remote ssh connection
 # 	Replace YOURACOUNTNAME with your target server IP or domain name  
 ssh root@$YOURACCOUNT.slicehost.com '
 
+#	Add alias for ll	(Dear Ubuntu: This should be default)
+echo &quot;alias \&quot;ll=ls -lAgh\&quot;&quot; &gt;&gt; /root/.profile
+
 #    Update Ubuntu package manager
 #
 apt-get update
@@ -42,6 +47,7 @@ apt-get upgrade -y
 apt-get -y install build-essential libssl-dev libreadline5-dev zlib1g-dev  
 apt-get -y install libsqlite-dev libsqlite3-ruby libsqlite3-dev 
 apt-get -y install mysql-server libmysqlclient15-dev mysql-client 
+apt-get -y install git-core locate nginx
 
 #    Install Ruby 
 #
@@ -60,21 +66,11 @@ ln -s /usr/bin/gem1.8 /usr/bin/gem
 #    Install gems
 # 
 gem install -v=2.1.0 rails --no-rdoc --no-ri  
-gem install mysql  --no-rdoc --no-ri
-gem install tzinfo mysql thin --no-rdoc --no-ri
-
-#    Configure a simple Rails Application
-#
-mkdir /var/www/
-cd /var/www
-rails hello
-cd hello
-./script/generate controller welcome hello
-echo &quot;Hello World&quot; &gt; app/views/welcome/hello.html.erb
+gem install mysql mongrel tzinfo thin --no-rdoc --no-ri
 
 #    Download FiveRuns Manage  ** Installation and registration is run seperately **
-#    If are new to FiveRuns, sign up for a free trial:  https://manage.fiveruns.com/signup
-#    After, you have created an account, just execute the installer below
+#    If are new to FiveRuns, sign up for a free 30 day trial:  https://manage.fiveruns.com/signup
+#    After, you have created an account, just execute the downloaded installer.
 #
 cd /tmp
 wget http://manage.fiveruns.com/system/downloads/client/manage-installer-linux-ubuntu-64bit-intel.sh
@@ -84,14 +80,21 @@ wget http://manage.fiveruns.com/system/downloads/client/manage-installer-linux-u
 gem install fiveruns_manage --source http://gems.fiveruns.com
 gem install echoe --no-ri --no-rdoc
 
-#    Install, configure and start the Thin web server
-#
-thin install
-/usr/sbin/update-rc.d -f thin defaults								#	Perhaps this should be Capifed?
-thin -p 80 config -C /etc/thin/eldorado.yml -c /var/www/eldorado  	#	Serve Eldorado on 80
-thin -p 8080 config -C /etc/thin/hello.yml -c /var/www/hello		#	Serve Hello World on 8080
-/etc/init.d/thin start		
+#	Download the custom database.yml for Eldorado
+cd /var/www/eldorado/config
+wget http://github.com/mmond/configuration-automation/tree/master/eldorado_database.yml
+mv eldorado_database.yml database
 '
+#	Deploy Eldorado via Capistrano
+cap deploy:check
+cp eldorado.database.yml el-dorado/config/datatabase.yml   #  This should fix the following error : the database.yml file does not yet exist.    !!!!!!!!!!!!!!!!!!!!!!!!!
+cap deploy:update		
+
+#	Configure Database YAML file??
+
+
+
+#	*******************This should all happen via Cap now *******************
 
 
 #	This section installs a production copy of the Eldorado Community web portal to a preconfigured </diff>
      <filename>configure_slicehost_eldorado.sh</filename>
    </modified>
    <modified>
      <diff>@@ -6,7 +6,7 @@ set :deploy_via, :copy
 set :git_shallow_clone, 1
 
 set :application, 'eldorado'
-set :deploy_to, '/var/www/eldorado'
+set :deploy_to, '/var/www/el-dorado'
 set :mongrel_port, '8000'
 set :user, 'root'
 set :use_sudo, false  # We are already root in this example</diff>
      <filename>eldorado.deploy.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>657a4251825c614e61eb7ba0a6eb5d5190085dab</id>
    </parent>
  </parents>
  <author>
    <name>mark</name>
    <email>mmond@io.com</email>
  </author>
  <url>http://github.com/mmond/configuration-automation/commit/7ffe2c948becd539ef1a9c983f89becb53da1783</url>
  <id>7ffe2c948becd539ef1a9c983f89becb53da1783</id>
  <committed-date>2008-10-16T10:10:17-07:00</committed-date>
  <authored-date>2008-10-16T10:10:17-07:00</authored-date>
  <message>Add config minus app</message>
  <tree>9c9af4d62dc6fd36e94411963d32241dcd0f9d5a</tree>
  <committer>
    <name>mark</name>
    <email>mmond@io.com</email>
  </committer>
</commit>
