--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -2,7 +2,7 @@ class Mailer < ActionMailer::Base
   def signup_notification(user)
     setup_email(user)
     @subject    += 'Please activate your new account'
-    @body[:url]  = "http://gitorious.org/users/activate/#{user.activation_code}"
+    @body[:url]  = "http://GitoriousConfig['gitorious_host']/users/activate/#{user.activation_code}"
   
   end
   
@@ -18,7 +18,7 @@ class Mailer < ActionMailer::Base
     @body[:cloner] = repository.user
     @body[:project] = repository.project
     @body[:repository] = repository
-    @body[:url] = "http://gitorious.org/p/#{repository.project.slug}/repos/#{repository.name}"
+    @body[:url] = "http://GitoriousConfig['gitorious_host']/p/#{repository.project.slug}/repos/#{repository.name}"
   end
   
   def merge_request_notification(merge_request)
@@ -26,7 +26,7 @@ class Mailer < ActionMailer::Base
     @subject += %Q{#{merge_request.source_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}}
     @body[:merge_request] = merge_request
     @body[:project] = merge_request.target_repository.project
-    url = "http://gitorious.org/p/#{merge_request.target_repository.project.slug}"
+    url = "http://GitoriousConfig['gitorious_host']/p/#{merge_request.target_repository.project.slug}"
     url << "/repos/#{merge_request.target_repository.name}"
     url << "/merge_requests/#{merge_request.id}"
     @body[:url] = url
@@ -35,7 +35,7 @@ class Mailer < ActionMailer::Base
   protected
     def setup_email(user)
       @recipients  = "#{user.email}"
-      @from        = "Gitorious <no-reply@gitorious.org>"
+      @from        = "Gitorious <no-reply@GitoriousConfig['gitorious_host']>"
       @subject     = "[Gitorious] "
       @sent_on     = Time.now
       @body[:user] = user

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -18,7 +18,7 @@ class Repository < ActiveRecord::Base
   after_create :add_user_as_committer, :create_new_repos_task
   after_destroy :create_delete_repos_task
   
-  BASE_REPOSITORY_URL = "gitorious.org"
+  BASE_REPOSITORY_URL = "GitoriousConfig['gitorious_host']"
   
   def self.new_by_cloning(other, username=nil)
     suggested_name = username ? "#{username}s-clone" : nil

--- a/app/views/browse/index.atom.builder
+++ b/app/views/browse/index.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
   feed.updated((@commits.blank? ? nil : @commits.first.committed_date))
 
   @commits.each do |commit|
-    item_url = "http://gitorious.org" +  project_repository_commit_path(@project, @repository, commit.id)
+    item_url = "http://GitoriousConfig['gitorious_host']" +  project_repository_commit_path(@project, @repository, commit.id)
     feed.entry(commit.id, {
       :url => item_url, 
       :updated => commit.committed_date, 

--- a/app/views/comments/index.atom.builder
+++ b/app/views/comments/index.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
   feed.updated((@comments.blank? ? Time.now : @comments.first.created_at))
 
   @comments.each do |comment|
-    item_url = "http://gitorious.org" + project_repository_comments_path(@project,@repository)
+    item_url = "http://GitoriousConfig['gitorious_host']" + project_repository_comments_path(@project,@repository)
     feed.entry(comment, :url => item_url) do |entry|
       entry.title("#{comment.user.login}: #{truncate(comment.body, 30)}")
       entry.content(comment.body)

--- a/app/views/mailer/activation.rhtml
+++ b/app/views/mailer/activation.rhtml
@@ -1,8 +1,8 @@
 Hello <%= @user.login %>, 
 
-your account has been activated.  You can add your public SSH key here http://gitorious.org/account as well as change your details.
+your account has been activated.  You can add your public SSH key here http://GitoriousConfig['gitorious_host']/account as well as change your details.
 
 Thank you
 
-http://gitorious.org
+http://GitoriousConfig['gitorious_host']
 

--- a/app/views/mailer/merge_request_notification.rhtml
+++ b/app/views/mailer/merge_request_notification.rhtml
@@ -7,4 +7,4 @@ You can review the request and its commits here:
 
 Thank you
 
-http://gitorious.org
+http://GitoriousConfig['gitorious_host']

--- a/app/views/mailer/new_repository_clone.rhtml
+++ b/app/views/mailer/new_repository_clone.rhtml
@@ -6,4 +6,4 @@ Hello <%= @user.login -%>,
 
 Thank you
 
-http://gitorious.org
\ No newline at end of file
+http://GitoriousConfig['gitorious_host']
\ No newline at end of file

--- a/app/views/mailer/signup_notification.rhtml
+++ b/app/views/mailer/signup_notification.rhtml
@@ -1,6 +1,6 @@
 Hello,
 
-Your gitorious.org account has been created, your username is <%= @user.login %>
+Your GitoriousConfig['gitorious_host'] account has been created, your username is <%= @user.login %>
 
 Please visit this url to activate your account:
 
@@ -9,4 +9,4 @@ Please visit this url to activate your account:
 
 Thank you
 
-http://gitorious.org
\ No newline at end of file
+http://GitoriousConfig['gitorious_host']
\ No newline at end of file

--- a/app/views/projects/index.atom.builder
+++ b/app/views/projects/index.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
   feed.updated((@projects.blank? ? Time.now : @projects.first.created_at))
 
   @projects.each do |project|
-    item_url = "http://gitorious.org" + project_path(project)
+    item_url = "http://GitoriousConfig['gitorious_host']" + project_path(project)
     feed.entry(project, :url => item_url) do |entry|
       entry.title(project.title)
       entry.content(project.description)

--- a/app/views/site/faq.html.erb
+++ b/app/views/site/faq.html.erb
@@ -15,7 +15,7 @@
   file of the repository you wish to push:
 <pre>
 [remote "origin"]
-       url = git@gitorious.org:<em>project</em>/<em>repository.git</em>
+       url = git@GitoriousConfig['gitorious_host']:<em>project</em>/<em>repository.git</em>
        fetch = +refs/heads/*:refs/remotes/origin/*
 [branch "master"]
        remote = origin
@@ -24,11 +24,11 @@
   and then <code>git push origin master</code> to push the code to Gitorious.
 </p>
 <p>
-  You can also just run "<code>git push git@gitorious.org:tumbline/mainline.git</code>", or 
+  You can also just run "<code>git push git@GitoriousConfig['gitorious_host']:tumbline/mainline.git</code>", or 
   you can setup a remote by doing the following (add --fetch to the add call to 
   get the config from above):
   <pre>
-  git remote add origin git@gitorious.org:<em>project</em>/<em>repository.git</em>
+  git remote add origin git@GitoriousConfig['gitorious_host']:<em>project</em>/<em>repository.git</em>
   # to push the master branch to the origin remote we added above:
   git push origin master 
   # after that you can just do:
@@ -44,7 +44,7 @@
   can contact you about your projects if they need to. We do however take light 
   measures against crawlers by not displaying your email in completely plain text. <br />
   But just to be clear: we won't sell or use any information you give to 
-  gitorious.org against you or anyone else for financial and/or personal gains.
+  GitoriousConfig['gitorious_host'] against you or anyone else for financial and/or personal gains.
 </p>
 
 <hr />

--- a/config/gitorious.sample.yml
+++ b/config/gitorious.sample.yml
@@ -16,3 +16,6 @@ gitorious_client_port: 3000
 
 # Host the ./script/gitorious script should use:
 gitorious_client_host: localhost
+
+# Host which is serving the gitorious app
+gitorious_host: GitoriousConfig['gitorious_host']

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -62,15 +62,15 @@ describe Repository do
   end
   
   it "has a push url" do
-    @repository.push_url.should == "git@gitorious.org:#{@repository.project.slug}/foo.git"
+    @repository.push_url.should == "git@GitoriousConfig['gitorious_host']:#{@repository.project.slug}/foo.git"
   end
   
   it "has a clone url" do
-    @repository.clone_url.should == "git://gitorious.org/#{@repository.project.slug}/foo.git"
+    @repository.clone_url.should == "git://GitoriousConfig['gitorious_host']/#{@repository.project.slug}/foo.git"
   end
   
   it "has a http url" do
-    @repository.http_clone_url.should == "http://git.gitorious.org/#{@repository.project.slug}/foo.git"
+    @repository.http_clone_url.should == "http://git.GitoriousConfig['gitorious_host']/#{@repository.project.slug}/foo.git"
   end
   
   it "should assign the creator as a comitter on create" do 

--- a/spec/models/ssh_key_spec.rb
+++ b/spec/models/ssh_key_spec.rb
@@ -33,13 +33,13 @@ describe SshKey do
   it "allows a wider range of extended comments" do
     key = new_key
     
-    key.key = "ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE gitorious.org key"
+    key.key = "ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE #{GitoriousConfig['gitorious_host']} key"
     key.should be_valid
     
-    key.key = "ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE joe+gitorious.org key"
+    key.key = "ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE joe+#{GitoriousConfig['gitorious_host']} key"
     key.should be_valid
     
-    key.key = "ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE http://gitorious.org key"
+    key.key = "ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE http://#{GitoriousConfig['gitorious_host']} key"
     key.should be_valid
   end
   

--- a/vendor/diff-display/README.txt
+++ b/vendor/diff-display/README.txt
@@ -49,7 +49,7 @@ See Diff::Renderer::Base for what methods your callback needs to implement
 Git Repository
 ===============
 
-http://gitorious.org/projects/diff-display/
+http://GitoriousConfig['gitorious_host']/projects/diff-display/
 
 
 License