<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,25 +1,19 @@
 #!/usr/bin/env ruby
 require &quot;rubygems&quot;
 require &quot;aerial&quot;
-require 'sinatra'
 
-root_dir = File.dirname(__FILE__)
-env = ENV['RACK_ENV'].to_sym
+env  = ENV['RACK_ENV'].to_sym
+root = File.dirname(__FILE__)
 
-# set :environment          =&gt; env,
-#     :root                 =&gt; root_dir,
-#     :app_file             =&gt; File.join(root_dir, 'lib', 'aerial.rb'),
-#     :cache_enabled        =&gt; env == :production ? true : false,
-#     :cache_page_extension =&gt; '.html',
-#     :cache_output_dir     =&gt; ''
-# disable :run
-# run Sinatra::Application
-
-# Load configuration and initialize Integrity
-Aerial.new(File.dirname(__FILE__) + &quot;/config.yml&quot;)
+# Load configuration and initialize Aerial
+Aerial.new(root, &quot;/config.yml&quot;)
 
 # You probably don't want to edit anything below
 Aerial::App.set :environment, ENV[&quot;RACK_ENV&quot;] || :production
 Aerial::App.set :port, 4567
+Aerial::App.set :cache_enabled, env == :production ? true : false
+Aerial::App.set :cache_page_extension, '.html'
+Aerial::App.set :cache_output_dir, ''
+Aerial::App.set :root, root
 
 run Aerial::App</diff>
      <filename>config/config.sample.ru</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 ---
-environment: production
+environment: development
 chdir: /apps/aerial
 address: 127.0.0.1
 port: 4567
@@ -9,5 +9,5 @@ log: /apps/aerial/log/thin.log
 max_conns: 1024
 timeout: 30
 max_persistent_conns: 512
-daemonize: true
-servers: 2
+daemonize: false
+servers: 1</diff>
      <filename>config/thin.sample.yml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>b90afab07051b911d591d158300739f71848955e</id>
    </parent>
  </parents>
  <author>
    <name>Matt Sears</name>
    <email>matt@mattsears.com</email>
  </author>
  <url>http://github.com/mattsears/aerial/commit/8c88bbefd39e6b342c5721511829ea03eb76e9e5</url>
  <id>8c88bbefd39e6b342c5721511829ea03eb76e9e5</id>
  <committed-date>2009-10-18T19:55:36-07:00</committed-date>
  <authored-date>2009-10-18T19:55:36-07:00</authored-date>
  <message>Added and updated default configuration settings</message>
  <tree>ccced7e76f8a7a9b8c90188f93cc6fcd9d17d237</tree>
  <committer>
    <name>Matt Sears</name>
    <email>matt@mattsears.com</email>
  </committer>
</commit>
