From 5c0ba7d666e085e82560a9237a88e3afe8a6700a Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Tue, 22 Apr 2014 16:42:26 +0530
Subject: [PATCH] moved config directory back inside assets directory

---
 Dockerfile                                          |   2 +-
 config.tar.bz2 => assets/config.tar.bz2             | Bin
 {config => assets/config}/gitlab-shell/config.yml   |   0
 {config => assets/config}/gitlabhq/database.yml     |   0
 {config => assets/config}/gitlabhq/gitlab.yml       |   0
 {config => assets/config}/gitlabhq/rack_attack.rb   |   0
 {config => assets/config}/gitlabhq/resque.yml       |   0
 {config => assets/config}/gitlabhq/sidekiq.yml      |   0
 {config => assets/config}/gitlabhq/smtp_settings.rb |   0
 {config => assets/config}/gitlabhq/unicorn.rb       |   0
 {config => assets/config}/nginx/gitlab              |   0
 11 files changed, 1 insertion(+), 1 deletion(-)
 rename config.tar.bz2 => assets/config.tar.bz2 (100%)
 rename {config => assets/config}/gitlab-shell/config.yml (100%)
 rename {config => assets/config}/gitlabhq/database.yml (100%)
 rename {config => assets/config}/gitlabhq/gitlab.yml (100%)
 rename {config => assets/config}/gitlabhq/rack_attack.rb (100%)
 rename {config => assets/config}/gitlabhq/resque.yml (100%)
 rename {config => assets/config}/gitlabhq/sidekiq.yml (100%)
 rename {config => assets/config}/gitlabhq/smtp_settings.rb (100%)
 rename {config => assets/config}/gitlabhq/unicorn.rb (100%)
 rename {config => assets/config}/nginx/gitlab (100%)

diff --git a/Dockerfile b/Dockerfile
index 6824c599..096d4e7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ ADD assets/setup/ /app/setup/
 RUN chmod 755 /app/setup/install
 RUN /app/setup/install
 
-ADD config/ /app/setup/config/
+ADD assets/config/ /app/setup/config/
 ADD assets/init /app/init
 RUN chmod 755 /app/init
 
diff --git a/config.tar.bz2 b/assets/config.tar.bz2
similarity index 100%
rename from config.tar.bz2
rename to assets/config.tar.bz2
diff --git a/config/gitlab-shell/config.yml b/assets/config/gitlab-shell/config.yml
similarity index 100%
rename from config/gitlab-shell/config.yml
rename to assets/config/gitlab-shell/config.yml
diff --git a/config/gitlabhq/database.yml b/assets/config/gitlabhq/database.yml
similarity index 100%
rename from config/gitlabhq/database.yml
rename to assets/config/gitlabhq/database.yml
diff --git a/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml
similarity index 100%
rename from config/gitlabhq/gitlab.yml
rename to assets/config/gitlabhq/gitlab.yml
diff --git a/config/gitlabhq/rack_attack.rb b/assets/config/gitlabhq/rack_attack.rb
similarity index 100%
rename from config/gitlabhq/rack_attack.rb
rename to assets/config/gitlabhq/rack_attack.rb
diff --git a/config/gitlabhq/resque.yml b/assets/config/gitlabhq/resque.yml
similarity index 100%
rename from config/gitlabhq/resque.yml
rename to assets/config/gitlabhq/resque.yml
diff --git a/config/gitlabhq/sidekiq.yml b/assets/config/gitlabhq/sidekiq.yml
similarity index 100%
rename from config/gitlabhq/sidekiq.yml
rename to assets/config/gitlabhq/sidekiq.yml
diff --git a/config/gitlabhq/smtp_settings.rb b/assets/config/gitlabhq/smtp_settings.rb
similarity index 100%
rename from config/gitlabhq/smtp_settings.rb
rename to assets/config/gitlabhq/smtp_settings.rb
diff --git a/config/gitlabhq/unicorn.rb b/assets/config/gitlabhq/unicorn.rb
similarity index 100%
rename from config/gitlabhq/unicorn.rb
rename to assets/config/gitlabhq/unicorn.rb
diff --git a/config/nginx/gitlab b/assets/config/nginx/gitlab
similarity index 100%
rename from config/nginx/gitlab
rename to assets/config/nginx/gitlab