moved everything into trunk/ subdirectory, as a preparation for the conversion to git
This commit is contained in:
parent
df41424518
commit
52d584b8fb
48 changed files with 0 additions and 0 deletions
43
trunk/www-apps/gitlabhq/files/gitlab-sidekiq.init
Normal file
43
trunk/www-apps/gitlabhq/files/gitlab-sidekiq.init
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
#!/sbin/runscript
|
||||
|
||||
name="GitLab Sidekiq"
|
||||
description="Sidekiq for GitLab @SLOT@"
|
||||
|
||||
: ${gitlab_user:=@USER@}
|
||||
: ${gitlab_base:="@GITLAB_BASE@"}
|
||||
: ${rails_env:=production}
|
||||
|
||||
: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
|
||||
: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
|
||||
: ${sidekiq_queues:="@QUEUES@"}
|
||||
|
||||
sidekiq_command="/usr/bin/bundle"
|
||||
sidekiq_command_args="exec sidekiq -q ${sidekiq_queues} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
|
||||
|
||||
depend() {
|
||||
need redis
|
||||
use net
|
||||
}
|
||||
|
||||
start() {
|
||||
checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
|
||||
|
||||
ebegin "Starting ${name} - Sidekiq"
|
||||
|
||||
start-stop-daemon --start \
|
||||
--background --quiet \
|
||||
--chdir "${gitlab_base}" \
|
||||
--user=${gitlab_user} \
|
||||
--pidfile="${sidekiq_pidfile}" \
|
||||
--env RAILS_ENV=${rails_env} \
|
||||
--exec ${sidekiq_command} -- ${sidekiq_command_args}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${name} - Sidekiq"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile=${sidekiq_pidfile} \
|
||||
--exec ${sidekiq_command}
|
||||
eend $?
|
||||
}
|
||||
67
trunk/www-apps/gitlabhq/files/gitlab-unicorn-6.init
Normal file
67
trunk/www-apps/gitlabhq/files/gitlab-unicorn-6.init
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
#!/sbin/runscript
|
||||
|
||||
name="GitLab-@SLOT@"
|
||||
description="GitLab @SLOT@ on Unicorns"
|
||||
|
||||
: ${gitlab_user:=@USER@}
|
||||
: ${gitlab_base:="@GITLAB_BASE@"}
|
||||
: ${rails_env:=production}
|
||||
|
||||
: ${server_pidfile:="/run/gitlab/unicorn.pid"}
|
||||
|
||||
: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
|
||||
: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
|
||||
: ${sidekiq_queues:="@QUEUES@"}
|
||||
|
||||
server_command="/usr/bin/bundle"
|
||||
server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D"
|
||||
|
||||
sidekiq_command="/usr/bin/bundle"
|
||||
sidekiq_command_args="exec sidekiq -q ${sidekiq_queues} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
|
||||
|
||||
depend() {
|
||||
provide gitlab
|
||||
need redis
|
||||
use net
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${name} - Unicorn servers"
|
||||
|
||||
checkpath -d -o ${gitlab_user} -m755 "$(dirname "${server_pidfile}")"
|
||||
checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
|
||||
|
||||
start-stop-daemon --start \
|
||||
--chdir "${gitlab_base}" \
|
||||
--user=${gitlab_user} \
|
||||
--pidfile="${server_pidfile}" \
|
||||
--env RAILS_ENV=${rails_env} \
|
||||
--exec ${server_command} -- ${server_command_args}
|
||||
eend $?
|
||||
|
||||
ebegin "Starting ${name} - Sidekiq"
|
||||
|
||||
start-stop-daemon --start \
|
||||
--background --quiet \
|
||||
--chdir "${gitlab_base}" \
|
||||
--user=${gitlab_user} \
|
||||
--pidfile="${sidekiq_pidfile}" \
|
||||
--env RAILS_ENV=${rails_env} \
|
||||
--exec ${sidekiq_command} -- ${sidekiq_command_args}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${name} - Sidekiq"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile=${sidekiq_pidfile} \
|
||||
--exec ${sidekiq_command}
|
||||
eend $?
|
||||
|
||||
ebegin "Stopping ${name} - Unicorn servers"
|
||||
start-stop-daemon --stop \
|
||||
--signal QUIT \
|
||||
--pidfile=${server_pidfile} \
|
||||
--exec ${server_command}
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
--- Gemfile.orig 2014-01-17 17:27:47.960000000 +0100
|
||||
+++ Gemfile 2014-01-17 17:28:20.620000000 +0100
|
||||
@@ -134,13 +134,16 @@
|
||||
# Sanitize user input
|
||||
gem "sanitize"
|
||||
|
||||
+# The newer revision of charlock_holmes that is finally fixed to
|
||||
+# be compatible with Gentoo
|
||||
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
|
||||
+
|
||||
# Protect against bruteforcing
|
||||
gem "rack-attack"
|
||||
|
||||
gem "sass-rails"
|
||||
gem "coffee-rails"
|
||||
gem "uglifier"
|
||||
-gem "therubyracer"
|
||||
gem 'turbolinks'
|
||||
gem 'jquery-turbolinks'
|
||||
|
||||
--- Gemfile.lock.orig 2014-01-17 17:29:53.490000000 +0100
|
||||
+++ Gemfile.lock 2014-01-17 17:33:01.660000000 +0100
|
||||
@@ -1,4 +1,11 @@
|
||||
GIT
|
||||
+ remote: https://github.com/brianmario/charlock_holmes.git
|
||||
+ revision: dde194609b3513b0d2369ce8f916ae52566154b4
|
||||
+ ref: dde194609b3513b0d2369ce8f916ae52566154b4
|
||||
+ specs:
|
||||
+ charlock_holmes (0.6.9.4)
|
||||
+
|
||||
+GIT
|
||||
remote: https://github.com/gitlabhq/gon.git
|
||||
revision: 58ca8e17273051cb370182cabd3602d1da6783ab
|
||||
ref: 58ca8e17273051cb370182cabd3602d1da6783ab
|
||||
@@ -72,7 +79,6 @@
|
||||
json (>= 1.7)
|
||||
celluloid (0.15.2)
|
||||
timers (~> 1.1.0)
|
||||
- charlock_holmes (0.6.9.4)
|
||||
chosen-rails (1.0.1)
|
||||
coffee-rails (>= 3.2)
|
||||
compass-rails (>= 1.0)
|
||||
@@ -278,7 +284,6 @@
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.1.2)
|
||||
launchy (~> 2.2)
|
||||
- libv8 (3.16.14.3)
|
||||
listen (2.3.1)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
@@ -412,7 +417,6 @@
|
||||
redis-store (~> 1.1.0)
|
||||
redis-store (1.1.4)
|
||||
redis (>= 2.2)
|
||||
- ref (1.0.5)
|
||||
require_all (1.3.2)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
@@ -499,9 +503,6 @@
|
||||
term-ansicolor (1.2.2)
|
||||
tins (~> 0.8)
|
||||
test_after_commit (0.2.2)
|
||||
- therubyracer (0.12.0)
|
||||
- libv8 (~> 3.16.14.0)
|
||||
- ref
|
||||
thin (1.6.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 1.0.0)
|
||||
@@ -572,6 +573,7 @@
|
||||
bootstrap-sass (~> 2.3)
|
||||
capybara
|
||||
carrierwave
|
||||
+ charlock_holmes!
|
||||
chosen-rails (= 1.0.1)
|
||||
coffee-rails
|
||||
colored
|
||||
@@ -655,7 +657,6 @@
|
||||
stamp
|
||||
state_machine
|
||||
test_after_commit
|
||||
- therubyracer
|
||||
thin
|
||||
tinder (~> 1.9.2)
|
||||
turbolinks
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
--- lib/gitlab/regex.rb.orig 2013-12-23 19:43:59.000000000 +0100
|
||||
+++ lib/gitlab/regex.rb 2014-01-17 17:43:00.020000000 +0100
|
||||
@@ -1,3 +1,5 @@
|
||||
+# encoding: utf-8
|
||||
+
|
||||
module Gitlab
|
||||
module Regex
|
||||
extend self
|
||||
@@ -7,7 +9,7 @@
|
||||
end
|
||||
|
||||
def project_name_regex
|
||||
- /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
|
||||
+ /\A\p{Word}[\p{Word}\-:\. ]*\z/
|
||||
end
|
||||
|
||||
def name_regex
|
||||
--- app/models/project.rb.orig 2014-01-17 17:40:02.050000000 +0100
|
||||
+++ app/models/project.rb 2014-01-17 17:44:09.150000000 +0100
|
||||
@@ -85,7 +85,7 @@
|
||||
validates :description, length: { maximum: 2000 }, allow_blank: true
|
||||
validates :name, presence: true, length: { within: 0..255 },
|
||||
format: { with: Gitlab::Regex.project_name_regex,
|
||||
- message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" }
|
||||
+ message: "only letters, digits, spaces & '_' '-' '.' ':' allowed. Letter or digit should be first" }
|
||||
validates :path, presence: true, length: { within: 0..255 },
|
||||
exclusion: { in: Gitlab::Blacklist.path },
|
||||
format: { with: Gitlab::Regex.path_regex,
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb
|
||||
index 82eb250..10e25e5 100644
|
||||
--- a/config/environments/production.rb
|
||||
+++ b/config/environments/production.rb
|
||||
@@ -73,11 +73,10 @@ Gitlab::Application.configure do
|
||||
# config.active_record.auto_explain_threshold_in_seconds = 0.5
|
||||
|
||||
config.action_mailer.delivery_method = :sendmail
|
||||
- # Defaults to:
|
||||
- # # config.action_mailer.sendmail_settings = {
|
||||
- # # location: '/usr/sbin/sendmail',
|
||||
- # # arguments: '-i -t'
|
||||
- # # }
|
||||
+ config.action_mailer.sendmail_settings = {
|
||||
+ location: '/usr/sbin/sendmail',
|
||||
+ arguments: '-i'
|
||||
+ }
|
||||
config.action_mailer.perform_deliveries = true
|
||||
config.action_mailer.raise_delivery_errors = true
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue