Commit caf5b9e5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'feature/config' of dev.gitlabhq.com:gitlabhq

parents b3a0ee8e 1d543e64
...@@ -40,6 +40,7 @@ gem "foreman" ...@@ -40,6 +40,7 @@ gem "foreman"
gem "colored" gem "colored"
gem 'resque_mailer' gem 'resque_mailer'
gem 'tabs_on_rails' gem 'tabs_on_rails'
gem 'settingslogic'
group :assets do group :assets do
gem "sass-rails", "3.2.5" gem "sass-rails", "3.2.5"
......
...@@ -313,6 +313,7 @@ GEM ...@@ -313,6 +313,7 @@ GEM
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
settingslogic (2.0.8)
shoulda-matchers (1.1.0) shoulda-matchers (1.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
simplecov (0.6.4) simplecov (0.6.4)
...@@ -416,6 +417,7 @@ DEPENDENCIES ...@@ -416,6 +417,7 @@ DEPENDENCIES
rspec-rails rspec-rails
sass-rails (= 3.2.5) sass-rails (= 3.2.5)
seed-fu seed-fu
settingslogic
shoulda-matchers shoulda-matchers
simplecov simplecov
six six
......
...@@ -158,6 +158,11 @@ table { ...@@ -158,6 +158,11 @@ table {
&.small { &.small {
@extend .btn-small; @extend .btn-small;
} }
&.active {
border-color:#aaa;
background-color:#ccc;
}
} }
a:focus { a:focus {
......
...@@ -34,7 +34,7 @@ class Admin::UsersController < ApplicationController ...@@ -34,7 +34,7 @@ class Admin::UsersController < ApplicationController
def new def new
@admin_user = User.new(:projects_limit => GITLAB_OPTS["default_projects_limit"]) @admin_user = User.new(:projects_limit => Gitlab.config.default_projects_limit)
end end
def edit def edit
......
...@@ -13,7 +13,7 @@ module ApplicationHelper ...@@ -13,7 +13,7 @@ module ApplicationHelper
end end
def web_app_url def web_app_url
"#{request_protocol}://#{GIT_HOST["host"]}/" "#{request_protocol}://#{Gitlab.config.web_host}/"
end end
def last_commit(project) def last_commit(project)
......
...@@ -2,10 +2,10 @@ class Notify < ActionMailer::Base ...@@ -2,10 +2,10 @@ class Notify < ActionMailer::Base
include Resque::Mailer include Resque::Mailer
add_template_helper ApplicationHelper add_template_helper ApplicationHelper
default_url_options[:host] = EMAIL_OPTS["host"] default_url_options[:host] = Gitlab.config.web_host
default_url_options[:protocol] = -> { EMAIL_OPTS["protocol"] ? EMAIL_OPTS["protocol"] : "http" }.call default_url_options[:protocol] = Gitlab.config.web_protocol
default from: EMAIL_OPTS["from"] default from: Gitlab.config.email_from
def new_user_email(user_id, password) def new_user_email(user_id, password)
@user = User.find(user_id) @user = User.find(user_id)
......
...@@ -113,7 +113,7 @@ class Project < ActiveRecord::Base ...@@ -113,7 +113,7 @@ class Project < ActiveRecord::Base
end end
def web_url def web_url
[GIT_HOST['host'], code].join("/") [Gitlab.config.url, code].join("/")
end end
def common_notes def common_notes
......
...@@ -73,7 +73,7 @@ module GitPush ...@@ -73,7 +73,7 @@ module GitPush
id: commit.id, id: commit.id,
message: commit.safe_message, message: commit.safe_message,
timestamp: commit.date.xmlschema, timestamp: commit.date.xmlschema,
url: "http://#{GIT_HOST['host']}/#{code}/commits/#{commit.id}", url: "#{Gitlab.config.url}/#{code}/commits/#{commit.id}",
author: { author: {
name: commit.author_name, name: commit.author_name,
email: commit.author_email email: commit.author_email
......
...@@ -68,7 +68,7 @@ module Repository ...@@ -68,7 +68,7 @@ module Repository
end end
def path_to_repo def path_to_repo
File.join(GIT_HOST["base_path"], "#{path}.git") File.join(Gitlab.config.git_base_path, "#{path}.git")
end end
def update_repository def update_repository
...@@ -141,4 +141,12 @@ module Repository ...@@ -141,4 +141,12 @@ module Repository
file_path file_path
end end
def ssh_url_to_repo
url_to_repo
end
def http_url_to_repo
http_url = [Gitlab.config.url, "/", path, ".git"].join()
end
end end
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
Path Path
.input .input
.input-prepend .input-prepend
%span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:" %span.add-on= Gitlab.config.ssh_path
= f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record? = f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record?
.clearfix .clearfix
= f.label :code do = f.label :code do
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
Git Clone Git Clone
.input .input
.input-prepend .input-prepend
%span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:" %span.add-on= Gitlab.config.ssh_path
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record? = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
%span.add-on= ".git" %span.add-on= ".git"
.clearfix .clearfix
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
Git Clone Git Clone
.input .input
.input-prepend .input-prepend
%span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:" %span.add-on= Gitlab.config.ssh_path
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record? = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
%span.add-on= ".git" %span.add-on= ".git"
.clearfix .clearfix
......
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
.row .row
.span7 .span7
.form-horizontal .form-horizontal
.input-prepend .input-prepend.project_clone_holder
%span.add-on git clone %span.add-on git clone
= link_to "SSH", "#", :class => "btn small active", :"data-clone" => @project.ssh_url_to_repo
= link_to "HTTP", "#", :class => "btn small", :"data-clone" => @project.http_url_to_repo
= text_field_tag :project_clone, @project.url_to_repo, :class => "one_click_select span5" = text_field_tag :project_clone, @project.url_to_repo, :class => "one_click_select span5"
.span4.right .span4.right
.right .right
...@@ -23,4 +26,12 @@ ...@@ -23,4 +26,12 @@
= render "events/event_last_push", :event => @last_push = render "events/event_last_push", :event => @last_push
.content_list= render @events .content_list= render @events
:javascript
$(function(){
var link_sel = ".project_clone_holder a";
$(link_sel).bind("click", function() {
$(link_sel).removeClass("active");
$(this).addClass("active");
$("#project_clone").val($(this).attr("data-clone"));
})
})
# Gitlab application config file # # # # # # # # # # # # # # # # # #
# Gitlab application config file #
# # # # # # # # # # # # # # # # # #
#
# 1. Common settings
# ==========================
# Web application specific settings
web:
host: localhost
port: 80
https: false
# Email used for notification # Email used for notification
# about new issues, comments # about new issues, comments
email: email:
from: notify@gitlabhq.com from: notify@localhost
host: gitlabhq.com
# Application specific settings
# Like default project limit for user etc
app:
default_projects_limit: 10
# Protocol used for links in email letters
# Value can be http or https #
protocol: http # or https # 2. Advanced settings:
# ==========================
# Git Hosting configuration # Git Hosting configuration
git_host: git_host:
system: gitolite
admin_uri: git@localhost:gitolite-admin admin_uri: git@localhost:gitolite-admin
base_path: /home/git/repositories/ base_path: /home/git/repositories/
host: localhost # host: localhost
git_user: git git_user: git
upload_pack: true upload_pack: true
receive_pack: true receive_pack: true
...@@ -31,7 +47,3 @@ git: ...@@ -31,7 +47,3 @@ git:
git_max_size: 5242880 # 5.megabytes git_max_size: 5242880 # 5.megabytes
# Git timeout to read commit, in seconds # Git timeout to read commit, in seconds
git_timeout: 10 git_timeout: 10
# Gitlab settings
gitlab:
default_projects_limit: 10
GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"]
EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"]
GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"]
GITLAB_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitlab"]
GITLAB_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitlab"]
class Settings < Settingslogic
source "#{Rails.root}/config/gitlab.yml"
class << self
def web_protocol
self.web['protocol'] ||= web.https ? "https://" : "http://"
end
def web_host
self.web['host'] ||= 'localhost'
end
def email_from
self.email['from'] ||= "notify@" + web_host
end
def url
self['url'] ||= build_url
end
def build_url
raw_url = self.web_protocol
raw_url << web.host
raw_url << ":#{web.port}" if web.port.to_i != 80
end
def ssh_port
git_host['port'] || 22
end
def ssh_user
git_host['git_user'] || 'git'
end
def ssh_host
git_host['host'] || web_host || 'localhost'
end
def ssh_path
if ssh_port != 22
"ssh://#{ssh_user}@#{ssh_host}:#{ssh_port}/"
else
"#{ssh_user}@#{ssh_host}:"
end
end
def git_base_path
git_host['base_path'] || '/home/git/repositories/'
end
def git_upload_pack
if git_host['upload_pack'] == false
false
else
true
end
end
def git_receive_pack
if git_host['receive_pack'] == false
false
else
true
end
end
def git_bin_path
git['path'] || '/usr/bin/git'
end
def git_max_size
git['git_max_size'] || 5242880 # 5.megabytes
end
def git_timeout
git['git_timeout'] || 10
end
def gitolite_admin_uri
git['admin_uri'] || 'git@localhost:gitolite-admin'
end
def default_projects_limit
app['default_projects_limit'] || 10
end
end
end
module Gitlab module Gitlab
Version = File.read(Rails.root.join("VERSION")) Version = File.read(Rails.root.join("VERSION"))
Revision = `git log --pretty=format:'%h' -n 1` Revision = `git log --pretty=format:'%h' -n 1`
def self.config
Settings
end
end end
require 'grit' require 'grit'
require 'pygments' require 'pygments'
Grit::Git.git_timeout = GIT_OPTS["git_timeout"] Grit::Git.git_timeout = Gitlab.config.git_timeout
Grit::Git.git_max_size = GIT_OPTS["git_max_size"] Grit::Git.git_max_size = Gitlab.config.git_max_size
Grit::Blob.class_eval do Grit::Blob.class_eval do
include Linguist::BlobHelper include Linguist::BlobHelper
......
...@@ -4,7 +4,7 @@ Devise.setup do |config| ...@@ -4,7 +4,7 @@ Devise.setup do |config|
# ==> Mailer Configuration # ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer, # Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class with default "from" parameter. # note that it will be overwritten if you use your own mailer class with default "from" parameter.
config.mailer_sender = EMAIL_OPTS["from"] config.mailer_sender = Gitlab.config.email_from
# Configure the class responsible to send e-mails. # Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer" # config.mailer = "Devise::Mailer"
......
...@@ -14,10 +14,10 @@ Gitlab::Application.routes.draw do ...@@ -14,10 +14,10 @@ Gitlab::Application.routes.draw do
# Enable Grack support # Enable Grack support
mount Grack::Bundle.new({ mount Grack::Bundle.new({
git_path: GIT_OPTS['path'], git_path: Gitlab.config.git_bin_path,
project_root: GIT_HOST['base_path'], project_root: Gitlab.config.git_base_path,
upload_pack: GIT_HOST['upload_pack'], upload_pack: Gitlab.config.git_upload_pack,
receive_pack: GIT_HOST['receive_pack'] receive_pack: Gitlab.config.git_receive_pack
}), at: '/:path', constraints: { path: /[\w-]+\.git/ } }), at: '/:path', constraints: { path: /[\w-]+\.git/ }
# #
......
...@@ -7,15 +7,11 @@ module Gitlab ...@@ -7,15 +7,11 @@ module Gitlab
end end
def self.admin_uri def self.admin_uri
GIT_HOST["admin_uri"] Gitlab.config.git_host.admin_uri
end end
def self.url_to_repo(path) def self.url_to_repo(path)
if !GIT_HOST["port"] or GIT_HOST["port"] == 22 Gitlab.config.ssh_path + "#{path}.git"
"#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{path}.git"
else
"ssh://#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{GIT_HOST["port"]}/#{path}.git"
end
end end
end end
end end
...@@ -33,7 +33,7 @@ module Gitlab ...@@ -33,7 +33,7 @@ module Gitlab
end end
def configure def configure
Timeout::timeout(20) do Timeout::timeout(30) do
File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f| File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f|
begin begin
f.flock(File::LOCK_EX) f.flock(File::LOCK_EX)
......
...@@ -3,6 +3,7 @@ namespace :gitlab do ...@@ -3,6 +3,7 @@ namespace :gitlab do
desc "GITLAB | Check gitlab installation status" desc "GITLAB | Check gitlab installation status"
task :status => :environment do task :status => :environment do
puts "Starting diagnostic" puts "Starting diagnostic"
git_base_path = Gitlab.config.git_base_path
print "config/database.yml............" print "config/database.yml............"
if File.exists?(File.join Rails.root, "config", "database.yml") if File.exists?(File.join Rails.root, "config", "database.yml")
...@@ -20,17 +21,16 @@ namespace :gitlab do ...@@ -20,17 +21,16 @@ namespace :gitlab do
return return
end end
GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"] print "#{git_base_path}............"
print "#{GIT_HOST['base_path']}............" if File.exists?(git_base_path)
if File.exists?(GIT_HOST['base_path'])
puts "exists".green puts "exists".green
else else
puts "missing".red puts "missing".red
return return
end end
print "#{GIT_HOST['base_path']} is writable?............" print "#{git_base_path} is writable?............"
if File.stat(GIT_HOST['base_path']).writable? if File.stat(git_base_path).writable?
puts "YES".green puts "YES".green
else else
puts "NO".red puts "NO".red
...@@ -38,7 +38,7 @@ namespace :gitlab do ...@@ -38,7 +38,7 @@ namespace :gitlab do
end end
begin begin
`git clone #{GIT_HOST["admin_uri"]} /tmp/gitolite_gitlab_test` `git clone #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite_gitlab_test`
FileUtils.rm_rf("/tmp/gitolite_gitlab_test") FileUtils.rm_rf("/tmp/gitolite_gitlab_test")
print "Can clone gitolite-admin?............" print "Can clone gitolite-admin?............"
puts "YES".green puts "YES".green
...@@ -49,7 +49,7 @@ namespace :gitlab do ...@@ -49,7 +49,7 @@ namespace :gitlab do
end end
print "UMASK for .gitolite.rc is 0007? ............" print "UMASK for .gitolite.rc is 0007? ............"
unless open("#{GIT_HOST['base_path']}/../.gitolite.rc").grep(/REPO_UMASK = 0007/).empty? unless open("#{git_base_path}/../.gitolite.rc").grep(/REPO_UMASK = 0007/).empty?
puts "YES".green puts "YES".green
else else
puts "NO".red puts "NO".red
......
...@@ -5,7 +5,7 @@ describe Notify do ...@@ -5,7 +5,7 @@ describe Notify do
include EmailSpec::Matchers include EmailSpec::Matchers
before :all do before :all do
default_url_options[:host] = EMAIL_OPTS['host'] default_url_options[:host] = Gitlab.config.web_host
end end
let(:recipient) { Factory.create(:user, :email => 'recipient@example.com') } let(:recipient) { Factory.create(:user, :email => 'recipient@example.com') }
......
...@@ -56,7 +56,7 @@ describe Project do ...@@ -56,7 +56,7 @@ describe Project do
it "returns the full web URL for this repo" do it "returns the full web URL for this repo" do
project = Project.new(:code => "somewhere") project = Project.new(:code => "somewhere")
project.web_url.should == "#{GIT_HOST['host']}/somewhere" project.web_url.should == "#{Gitlab.config.url}/somewhere"
end end
describe :valid_repo? do describe :valid_repo? do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment