summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/auth.rb2
-rw-r--r--lib/gitlab/backend/gitolite.rb2
-rw-r--r--lib/gitlab/backend/gitolite_config.rb6
-rw-r--r--lib/gitlab/project_mover.rb4
-rw-r--r--lib/tasks/gitlab/activate_namespaces.rake2
-rw-r--r--lib/tasks/gitlab/backup.rake22
-rw-r--r--lib/tasks/gitlab/check.rake42
-rw-r--r--lib/tasks/gitlab/import.rake2
-rw-r--r--lib/tasks/gitlab/info.rake22
9 files changed, 52 insertions, 52 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 056fb034daf..8c45c93557e 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -38,7 +38,7 @@ module Gitlab
email: email,
password: password,
password_confirmation: password,
- projects_limit: Gitlab.config.default_projects_limit,
+ projects_limit: Gitlab.config.gitlab.default_projects_limit,
}, as: :admin)
if Gitlab.config.omniauth['block_auto_created_users'] && !ldap
@user.blocked = true
diff --git a/lib/gitlab/backend/gitolite.rb b/lib/gitlab/backend/gitolite.rb
index 7c3861bdd13..3b8a2090f73 100644
--- a/lib/gitlab/backend/gitolite.rb
+++ b/lib/gitlab/backend/gitolite.rb
@@ -38,7 +38,7 @@ module Gitlab
end
def url_to_repo path
- Gitlab.config.ssh_path + "#{path}.git"
+ Gitlab.config.gitolite.ssh_path_prefix + "#{path}.git"
end
def enable_automerge
diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb
index 70ccc4782c6..a2bc4ca8d74 100644
--- a/lib/gitlab/backend/gitolite_config.rb
+++ b/lib/gitlab/backend/gitolite_config.rb
@@ -16,7 +16,7 @@ module Gitlab
def ga_repo
@ga_repo ||= ::Gitolite::GitoliteAdmin.new(
File.join(config_tmp_dir,'gitolite'),
- conf: Gitlab.config.gitolite_config_file
+ conf: Gitlab.config.gitolite.config_file
)
end
@@ -167,7 +167,7 @@ module Gitlab
# Enable access to all repos for gitolite admin.
# We use it for accept merge request feature
def admin_all_repo
- owner_name = Gitlab.config.gitolite_admin_key
+ owner_name = Gitlab.config.gitolite.admin_key
# @ALL repos premission for gitolite owner
repo_name = "@all"
@@ -189,7 +189,7 @@ module Gitlab
def pull tmp_dir
Dir.mkdir tmp_dir
- `git clone #{Gitlab.config.gitolite_admin_uri} #{tmp_dir}/gitolite`
+ `git clone #{Gitlab.config.gitolite.admin_uri} #{tmp_dir}/gitolite`
unless File.exists?(File.join(tmp_dir, 'gitolite', 'conf', 'gitolite.conf'))
raise PullError, "unable to clone gitolite-admin repo"
diff --git a/lib/gitlab/project_mover.rb b/lib/gitlab/project_mover.rb
index eeab22ae6e7..def6e90001b 100644
--- a/lib/gitlab/project_mover.rb
+++ b/lib/gitlab/project_mover.rb
@@ -15,10 +15,10 @@ module Gitlab
def execute
# Create new dir if missing
- new_dir_path = File.join(Gitlab.config.git_base_path, new_dir)
+ new_dir_path = File.join(Gitlab.config.gitolite.repos_path, new_dir)
system("mkdir -m 770 #{new_dir_path}") unless File.exists?(new_dir_path)
- old_path = File.join(Gitlab.config.git_base_path, old_dir, "#{project.path}.git")
+ old_path = File.join(Gitlab.config.gitolite.repos_path, old_dir, "#{project.path}.git")
new_path = File.join(new_dir_path, "#{project.path}.git")
if File.exists? new_path
diff --git a/lib/tasks/gitlab/activate_namespaces.rake b/lib/tasks/gitlab/activate_namespaces.rake
index 08df0a8040b..70ec88d0b3f 100644
--- a/lib/tasks/gitlab/activate_namespaces.rake
+++ b/lib/tasks/gitlab/activate_namespaces.rake
@@ -27,7 +27,7 @@ namespace :gitlab do
end
print "\n\nMove projects from groups under groups dirs:".yellow
- git_path = Gitlab.config.git_base_path
+ git_path = Gitlab.config.gitolite.repos_path
Project.where('namespace_id IS NOT NULL').find_each(batch_size: 500) do |project|
next unless project.group
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index c01fe479dba..307a6288a24 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -8,7 +8,7 @@ namespace :gitlab do
Rake::Task["gitlab:app:db_dump"].invoke
Rake::Task["gitlab:app:repo_dump"].invoke
- Dir.chdir(Gitlab.config.backup_path)
+ Dir.chdir(Gitlab.config.backup.path)
# saving additional informations
s = {}
@@ -17,7 +17,7 @@ namespace :gitlab do
s[:gitlab_version] = %x{git rev-parse HEAD}.gsub(/\n/,"")
s[:tar_version] = %x{tar --version | head -1}.gsub(/\n/,"")
- File.open("#{Gitlab.config.backup_path}/backup_information.yml", "w+") do |file|
+ File.open("#{Gitlab.config.backup.path}/backup_information.yml", "w+") do |file|
file << s.to_yaml.gsub(/^---\n/,'')
end
@@ -39,10 +39,10 @@ namespace :gitlab do
# delete backups
print "Deleting old backups... "
- if Gitlab.config.backup_keep_time > 0
+ if Gitlab.config.backup.keep_time > 0
file_list = Dir.glob("*_gitlab_backup.tar").map { |f| f.split(/_/).first.to_i }
file_list.sort.each do |timestamp|
- if Time.at(timestamp) < (Time.now - Gitlab.config.backup_keep_time)
+ if Time.at(timestamp) < (Time.now - Gitlab.config.backup.keep_time)
%x{rm #{timestamp}_gitlab_backup.tar}
end
end
@@ -55,7 +55,7 @@ namespace :gitlab do
# Restore backup of GitLab system
desc "GITLAB | Restore a previously created backup"
task :backup_restore => :environment do
- Dir.chdir(Gitlab.config.backup_path)
+ Dir.chdir(Gitlab.config.backup.path)
# check for existing backups in the backup dir
file_list = Dir.glob("*_gitlab_backup.tar").each.map { |f| f.split(/_/).first.to_i }
@@ -111,7 +111,7 @@ namespace :gitlab do
################################# REPOSITORIES #################################
task :repo_dump => :environment do
- backup_path_repo = File.join(Gitlab.config.backup_path, "repositories")
+ backup_path_repo = File.join(Gitlab.config.backup.path, "repositories")
FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo)
puts "Dumping repositories:"
project = Project.all.map { |n| [n.path, n.path_to_repo] }
@@ -127,7 +127,7 @@ namespace :gitlab do
end
task :repo_restore => :environment do
- backup_path_repo = File.join(Gitlab.config.backup_path, "repositories")
+ backup_path_repo = File.join(Gitlab.config.backup.path, "repositories")
puts "Restoring repositories:"
project = Project.all.map { |n| [n.path, n.path_to_repo] }
project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")]
@@ -136,8 +136,8 @@ namespace :gitlab do
FileUtils.rm_rf(project.second) if File.dirname(project.second) # delete old stuff
if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1")
permission_commands = [
- "sudo chmod -R g+rwX #{Gitlab.config.git_base_path}",
- "sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}"
+ "sudo chmod -R g+rwX #{Gitlab.config.gitolite.repos_path}",
+ "sudo chown -R #{Gitlab.config.gitolite.ssh_user}:#{Gitlab.config.gitolite.ssh_user} #{Gitlab.config.gitolite.repos_path}"
]
permission_commands.each { |command| Kernel.system(command) }
puts "[DONE]".green
@@ -150,7 +150,7 @@ namespace :gitlab do
###################################### DB ######################################
task :db_dump => :environment do
- backup_path_db = File.join(Gitlab.config.backup_path, "db")
+ backup_path_db = File.join(Gitlab.config.backup.path, "db")
FileUtils.mkdir_p(backup_path_db) unless Dir.exists?(backup_path_db)
puts "Dumping database tables:"
@@ -170,7 +170,7 @@ namespace :gitlab do
end
task :db_restore=> :environment do
- backup_path_db = File.join(Gitlab.config.backup_path, "db")
+ backup_path_db = File.join(Gitlab.config.backup.path, "db")
puts "Restoring database tables:"
Rake::Task["db:reset"].invoke
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index f70a3e7bbcf..0a452686c43 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -268,7 +268,7 @@ namespace :gitlab do
options = {
"user.name" => "GitLab",
- "user.email" => Gitlab.config.email_from
+ "user.email" => Gitlab.config.gitlab.email_from
}
correct_options = options.map do |name, value|
run("git config --global --get #{name}").try(:squish) == value
@@ -290,7 +290,7 @@ namespace :gitlab do
end
def check_gitlab_in_git_group
- gitolite_ssh_user = Gitlab.config.ssh_user
+ gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
print "gitlab user is in #{gitolite_ssh_user} group? ... "
if run_and_match("id -rnG", /\Wgit\W/)
@@ -309,10 +309,10 @@ namespace :gitlab do
# see https://github.com/gitlabhq/gitlabhq/issues/1059
def check_issue_1056_shell_profile_error
- gitolite_ssh_user = Gitlab.config.ssh_user
+ gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... "
- profile_file = File.expand_path("~#{Gitlab.config.ssh_user}/.profile")
+ profile_file = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.profile")
unless File.read(profile_file) =~ /^-e PATH/
puts "yes".green
@@ -414,7 +414,7 @@ namespace :gitlab do
test_path = "/tmp/gitlab_gitolite_admin_test"
FileUtils.rm_rf(test_path)
- `git clone -q #{Gitlab.config.gitolite_admin_uri} #{test_path}`
+ `git clone -q #{Gitlab.config.gitolite.admin_uri} #{test_path}`
raise unless $?.success?
puts "yes".green
@@ -423,7 +423,7 @@ namespace :gitlab do
try_fixing_it(
"Make sure the \"admin_uri\" is set correctly in config/gitlab.yml",
"Try cloning it yourself with:",
- " git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite-admin",
+ " git clone -q #{Gitlab.config.gitolite.admin_uri} /tmp/gitolite-admin",
"Make sure Gitolite is installed correctly."
)
for_more_information(
@@ -452,7 +452,7 @@ namespace :gitlab do
puts "no".red
try_fixing_it(
"Try committing to it yourself with:",
- " git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite-admin",
+ " git clone -q #{Gitlab.config.gitolite.admin_uri} /tmp/gitolite-admin",
" touch foo",
" git add foo",
" git commit -m \"foo\"",
@@ -469,7 +469,7 @@ namespace :gitlab do
def check_dot_gitolite_exists
print "Config directory exists? ... "
- gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite")
+ gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
if File.directory?(gitolite_config_path)
puts "yes".green
@@ -490,7 +490,7 @@ namespace :gitlab do
def check_dot_gitolite_permissions
print "Config directory access is drwxr-x---? ... "
- gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite")
+ gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
unless File.exists?(gitolite_config_path)
puts "can't check because of previous errors".magenta
return
@@ -512,7 +512,7 @@ namespace :gitlab do
end
def check_dot_gitolite_user_and_group
- gitolite_ssh_user = Gitlab.config.ssh_user
+ gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... "
gitolite_config_path = File.expand_path("~#{gitolite_ssh_user}/.gitolite")
@@ -615,9 +615,9 @@ namespace :gitlab do
print "post-receive hook exists? ... "
hook_file = "post-receive"
- gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
+ gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common")
gitolite_hook_file = File.join(gitolite_hooks_path, hook_file)
- gitolite_ssh_user = Gitlab.config.ssh_user
+ gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file)
@@ -639,10 +639,10 @@ namespace :gitlab do
print "post-receive hook up-to-date? ... "
hook_file = "post-receive"
- gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
+ gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common")
gitolite_hook_file = File.join(gitolite_hooks_path, hook_file)
gitolite_hook_content = File.read(gitolite_hook_file)
- gitolite_ssh_user = Gitlab.config.ssh_user
+ gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
unless File.exists?(gitolite_hook_file)
puts "can't check because of previous errors".magenta
@@ -669,7 +669,7 @@ namespace :gitlab do
def check_repo_base_exists
print "Repo base directory exists? ... "
- repo_base_path = Gitlab.config.git_base_path
+ repo_base_path = Gitlab.config.gitolite.repos_path
if File.exists?(repo_base_path)
puts "yes".green
@@ -691,7 +691,7 @@ namespace :gitlab do
def check_repo_base_permissions
print "Repo base access is drwsrws---? ... "
- repo_base_path = Gitlab.config.git_base_path
+ repo_base_path = Gitlab.config.gitolite.repos_path
unless File.exists?(repo_base_path)
puts "can't check because of previous errors".magenta
return
@@ -713,10 +713,10 @@ namespace :gitlab do
end
def check_repo_base_user_and_group
- gitolite_ssh_user = Gitlab.config.ssh_user
+ gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
print "Repo base owned by #{gitolite_ssh_user}:#{gitolite_ssh_user}? ... "
- repo_base_path = Gitlab.config.git_base_path
+ repo_base_path = Gitlab.config.gitolite.repos_path
unless File.exists?(repo_base_path)
puts "can't check because of previous errors".magenta
return
@@ -777,9 +777,9 @@ namespace :gitlab do
print "post-receive hooks in repos are links: ... "
hook_file = "post-receive"
- gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
+ gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common")
gitolite_hook_file = File.join(gitolite_hooks_path, hook_file)
- gitolite_ssh_user = Gitlab.config.ssh_user
+ gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
unless File.exists?(gitolite_hook_file)
puts "can't check because of previous errors".magenta
@@ -828,7 +828,7 @@ namespace :gitlab do
########################
def gitolite_home
- File.expand_path("~#{Gitlab.config.ssh_user}")
+ File.expand_path("~#{Gitlab.config.gitolite.ssh_user}")
end
def gitolite_version
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index 09f0dc9e459..81f66e2e406 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -12,7 +12,7 @@ namespace :gitlab do
desc "GITLAB | Import bare repositories from git_host -> base_path into GitLab project instance"
task :repos => :environment do
- git_base_path = Gitlab.config.git_base_path
+ git_base_path = Gitlab.config.gitolite.repos_path
repos_to_import = Dir.glob(git_base_path + '/*')
repos_to_import.each do |repo_path|
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake
index 2f633974c83..85458fe2c43 100644
--- a/lib/tasks/gitlab/info.rake
+++ b/lib/tasks/gitlab/info.rake
@@ -46,7 +46,7 @@ namespace :gitlab do
http_clone_url = project.http_url_to_repo
ssh_clone_url = project.ssh_url_to_repo
- omniauth_providers = Gitlab.config.omniauth_providers
+ omniauth_providers = Gitlab.config.omniauth.providers
omniauth_providers.map! { |provider| provider['name'] }
puts ""
@@ -55,17 +55,17 @@ namespace :gitlab do
puts "Revision:\t#{Gitlab::Revision}"
puts "Directory:\t#{Rails.root}"
puts "DB Adapter:\t#{database_adapter}"
- puts "URL:\t\t#{Gitlab.config.url}"
+ puts "URL:\t\t#{Gitlab.config.gitlab.url}"
puts "HTTP Clone URL:\t#{http_clone_url}"
puts "SSH Clone URL:\t#{ssh_clone_url}"
- puts "Using LDAP:\t#{Gitlab.config.ldap_enabled? ? "yes".green : "no"}"
- puts "Using Omniauth:\t#{Gitlab.config.omniauth_enabled? ? "yes".green : "no"}"
- puts "Omniauth Providers: #{omniauth_providers.map(&:magenta).join(', ')}" if Gitlab.config.omniauth_enabled?
+ puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".green : "no"}"
+ puts "Using Omniauth:\t#{Gitlab.config.omniauth.enabled ? "yes".green : "no"}"
+ puts "Omniauth Providers: #{omniauth_providers.map(&:magenta).join(', ')}" if Gitlab.config.omniauth.enabled
# check Gitolite version
- gitolite_version_file = "#{Gitlab.config.git_base_path}/../gitolite/src/VERSION"
+ gitolite_version_file = "#{Gitlab.config.gitolite.repos_path}/../gitolite/src/VERSION"
if File.exists?(gitolite_version_file) && File.readable?(gitolite_version_file)
gitolite_version = File.read(gitolite_version_file)
end
@@ -73,11 +73,11 @@ namespace :gitlab do
puts ""
puts "Gitolite information".yellow
puts "Version:\t#{gitolite_version || "unknown".red}"
- puts "Admin URI:\t#{Gitlab.config.gitolite_admin_uri}"
- puts "Admin Key:\t#{Gitlab.config.gitolite_admin_key}"
- puts "Repositories:\t#{Gitlab.config.git_base_path}"
- puts "Hooks:\t\t#{Gitlab.config.git_hooks_path}"
- puts "Git:\t\t#{Gitlab.config.git.path}"
+ puts "Admin URI:\t#{Gitlab.config.gitolite.admin_uri}"
+ puts "Admin Key:\t#{Gitlab.config.gitolite.admin_key}"
+ puts "Repositories:\t#{Gitlab.config.gitolite.repos_path}"
+ puts "Hooks:\t\t#{Gitlab.config.gitolite.hooks_path}"
+ puts "Git:\t\t#{Gitlab.config.git.bin_path}"
end
View Lorry Controller Status