--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -2,9 +2,7 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  session :session_key => '_ks1_session_id', 
-    # TODO: Read from conf file or something
-    :secret => "imcerBupbitjahalCauncafiakbyFrecowphoadmodUtNakNipnuepbyRumatmor" 
+  session :session_key => '_ks1_session_id', :secret => GitoriousConfig["cookie_secret"]
   include AuthenticatedSystem
   
   protected

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -40,7 +40,7 @@ class RepositoriesController < ApplicationController
         format.html { redirect_to location }
         format.xml  { render :xml => @repository, :status => :created, :location => location }        
       else
-        format.html { render :action => "copy" }
+        format.html { render :action => "new" }
         format.xml  { render :xml => @repository.errors, :status => :unprocessable_entity }
       end
     end

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -24,7 +24,6 @@ class Repository < ActiveRecord::Base
   end
   
   BASE_REPOSITORY_URL = "gitorious.org"
-  BASE_REPOSITORY_DIR = File.join(RAILS_ROOT, "../repositories")
   
   def gitdir
     File.join(project.slug, "#{name}.git")
@@ -105,6 +104,6 @@ class Repository < ActiveRecord::Base
     end
     
     def self.full_path_from_partial_path(path)
-      File.expand_path(File.join(BASE_REPOSITORY_DIR, path))
+      File.expand_path(File.join(GitoriousConfig["repository_base_path"], path))
     end
 end

--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1 +1,2 @@
-database.yml
\ No newline at end of file
+database.yml
+gitorious.yml

--- a/config/environment.rb
+++ b/config/environment.rb
@@ -29,10 +29,10 @@ Rails::Initializer.run do |config|
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
-  config.action_controller.session = {
-    :session_key => '_ks1_session',
-    :secret      => 'd11c9229c49301cc6c307279b689396b'
-  }
+  # config.action_controller.session = {
+  #   :session_key => '_ks1_session',
+  #   :secret      => 'd11c9229c49301cc6c307279b689396b'
+  # }
 
   # Use the database for sessions instead of the cookie-based default,
   # which shouldn't be used to store highly confidential information

--- /dev/null
+++ b/config/initializers/gitorious_config.rb
@@ -0,0 +1 @@
+GitoriousConfig = YAML::load_file(File.join(RAILS_ROOT, "config/gitorious.yml"))
\ No newline at end of file

--- a/lib/gitorious/ssh/client.rb
+++ b/lib/gitorious/ssh/client.rb
@@ -36,11 +36,11 @@ module Gitorious
         "#{@strainer.verb} '#{@strainer.full_path}'"
       end
     
-    
       protected
         def connection
-          port = $DEBUG ? 3000 : 80
-          @connection ||= Net::HTTP.start("localhost", port)
+          port = GitoriousConfig["gitorious_client_port"]
+          host = GitoriousConfig["gitorious_client_host"]
+          @connection ||= Net::HTTP.start(host, port)
         end
     end
   end

--- a/script/gitorious
+++ b/script/gitorious
@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby -wKU
 
+require "yaml"
 if File.symlink?(__FILE__)
   $:.unshift File.dirname(File.readlink(__FILE__)) + "/../lib/gitorious/ssh"
 else
   $:.unshift File.dirname(__FILE__) + "/../lib/gitorious/ssh"
 end
 
+GitoriousConfig = YAML.load_file(File.dirname(__FILE__) + "/../config/gitorious.yml")
+
 ENV["PATH"] = "/opt/local/bin:#{ENV["PATH"]}"
 
 require "strainer"

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -76,7 +76,8 @@ describe Repository do
   end
   
   it "has a full repository_path" do
-    expected_dir = File.expand_path(File.join(RAILS_ROOT, "../repositories", projects(:johans).slug, "foo.git"))
+    expected_dir = File.expand_path(File.join(GitoriousConfig["repository_base_path"], 
+      projects(:johans).slug, "foo.git"))
     @repository.full_repository_path.should == expected_dir
   end
   

--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,7 +13,7 @@ Spec::Runner.configure do |config|
   config.include KeyserSource::SpecDSL
   
   # config.after(:each) do
-  #   path = File.join(Repository::BASE_REPOSITORY_DIR, "*")
+  #   path = File.join(GitoriousConfig["repository_base_path"], "*")
   #   Dir[path].each do |dir|
   #     `rm -rf #{dir}`
   #   end