diff --git a/config/email.yml b/config/email.yml deleted file mode 100644 index b5ce15302227ef124f80397becc818ab1a8b9894..0000000000000000000000000000000000000000 --- a/config/email.yml +++ /dev/null @@ -1,2 +0,0 @@ -from: notify@gitlabhq.com -host: gitlabhq.com diff --git a/config/gitlab.yml b/config/gitlab.yml new file mode 100644 index 0000000000000000000000000000000000000000..caa26ad2dce714a669b857cd1b8b135822509385 --- /dev/null +++ b/config/gitlab.yml @@ -0,0 +1,24 @@ +# Gitlab application config file + +# Email used for notification +# about new issues, comments +email: + from: notify@gitlabhq.com + host: gitlabhq.com + +# Gitosis congiguration +gitosis: + admin_uri: git@localhost:gitosis-admin.git + base_path: /home/git/repositories/ + host: localhost + git_user: git + # port: 22 + +# Git settings +# Use default values unless you understand it +git: + # Max size of git object like commit, in bytes + # This value can be increased if you have a very large commits + git_max_size: 5242880 # 5.megabytes + # Git timeout to read commit, in seconds + git_timeout: 10 diff --git a/config/gitosis.yml b/config/gitosis.yml deleted file mode 100644 index 1e3137e89e644838a3bdbb9a06d78cc672175071..0000000000000000000000000000000000000000 --- a/config/gitosis.yml +++ /dev/null @@ -1,5 +0,0 @@ -admin_uri: git@localhost:gitosis-admin.git -base_path: /home/git/repositories/ -host: localhost -git_user: git -# port: 22 diff --git a/config/initializers/gitlabhq/10_load_config.rb b/config/initializers/gitlabhq/10_load_config.rb new file mode 100644 index 0000000000000000000000000000000000000000..cfda096e5e8a37f46bc47017216e19f901e5dbef --- /dev/null +++ b/config/initializers/gitlabhq/10_load_config.rb @@ -0,0 +1,3 @@ +GITOSIS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitosis"] +EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"] +GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"] diff --git a/config/initializers/grit_ext.rb b/config/initializers/gitlabhq/20_grit_ext.rb similarity index 65% rename from config/initializers/grit_ext.rb rename to config/initializers/gitlabhq/20_grit_ext.rb index 1a7e6361c01787ffa6f093a72e8668ddfb87799a..102078e96447190a4a232a077cae9ea73ceb3a70 100644 --- a/config/initializers/grit_ext.rb +++ b/config/initializers/gitlabhq/20_grit_ext.rb @@ -10,3 +10,6 @@ end Grit::Commit.class_eval do include CommitExt end + +Grit::Git.git_timeout = GIT_OPTS["git_timeout"] +Grit::Git.git_max_size = GIT_OPTS["git_max_size"] diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb deleted file mode 100644 index 60f8515eb6560ac81ac51748e65a70470c5b176e..0000000000000000000000000000000000000000 --- a/config/initializers/load_config.rb +++ /dev/null @@ -1,2 +0,0 @@ -GITOSIS = YAML.load_file("#{Rails.root}/config/gitosis.yml") -EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/email.yml")