cleaned up gitlab-ce
This commit is contained in:
parent
bfb5c8c9ff
commit
4b59ae35b6
12 changed files with 7 additions and 2631 deletions
|
|
@ -1,92 +0,0 @@
|
|||
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
|
||||
index a99c507..0f081c8 100644
|
||||
--- a/config/database.yml.mysql
|
||||
+++ b/config/database.yml.mysql
|
||||
@@ -6,37 +6,9 @@ production:
|
||||
encoding: utf8
|
||||
collation: utf8_general_ci
|
||||
reconnect: false
|
||||
- database: gitlabhq_production
|
||||
+ database: gitlab
|
||||
pool: 10
|
||||
username: git
|
||||
password: "secure password"
|
||||
# host: localhost
|
||||
- # socket: /tmp/mysql.sock
|
||||
-
|
||||
-#
|
||||
-# Development specific
|
||||
-#
|
||||
-development:
|
||||
- adapter: mysql2
|
||||
- encoding: utf8
|
||||
- collation: utf8_general_ci
|
||||
- reconnect: false
|
||||
- database: gitlabhq_development
|
||||
- pool: 5
|
||||
- username: root
|
||||
- password: "secure password"
|
||||
- # socket: /tmp/mysql.sock
|
||||
-
|
||||
-# Warning: The database defined as "test" will be erased and
|
||||
-# re-generated from your development database when you run "rake".
|
||||
-# Do not set this db to the same as development or production.
|
||||
-test: &test
|
||||
- adapter: mysql2
|
||||
- encoding: utf8
|
||||
- collation: utf8_general_ci
|
||||
- reconnect: false
|
||||
- database: gitlabhq_test
|
||||
- pool: 5
|
||||
- username: root
|
||||
- password:
|
||||
- # socket: /tmp/mysql.sock
|
||||
+ # socket: /run/mysqld/mysqld.sock
|
||||
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
|
||||
index 7067e0f..74af7df 100644
|
||||
--- a/config/database.yml.postgresql
|
||||
+++ b/config/database.yml.postgresql
|
||||
@@ -4,42 +4,9 @@
|
||||
production:
|
||||
adapter: postgresql
|
||||
encoding: unicode
|
||||
- database: gitlabhq_production
|
||||
+ database: gitlab
|
||||
pool: 10
|
||||
# username: git
|
||||
# password:
|
||||
# host: localhost
|
||||
# port: 5432
|
||||
-
|
||||
-#
|
||||
-# Development specific
|
||||
-#
|
||||
-development:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
- database: gitlabhq_development
|
||||
- pool: 5
|
||||
- username: postgres
|
||||
- password:
|
||||
-
|
||||
-#
|
||||
-# Staging specific
|
||||
-#
|
||||
-staging:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
- database: gitlabhq_staging
|
||||
- pool: 5
|
||||
- username: postgres
|
||||
- password:
|
||||
-
|
||||
-# Warning: The database defined as "test" will be erased and
|
||||
-# re-generated from your development database when you run "rake".
|
||||
-# Do not set this db to the same as development or production.
|
||||
-test: &test
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
- database: gitlabhq_test
|
||||
- pool: 5
|
||||
- username: postgres
|
||||
- password:
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
name="GitLab Sidekiq"
|
||||
description="Sidekiq for GitLab"
|
||||
|
||||
: ${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 gitlab-workhorse
|
||||
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 $?
|
||||
}
|
||||
|
|
@ -1,122 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
extra_started_commands="restartsidekiq"
|
||||
|
||||
name="GitLab"
|
||||
description="GitLab on Unicorns"
|
||||
description_restartsidekiq="Restarts Sidekiq only"
|
||||
|
||||
: ${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@"}
|
||||
|
||||
: ${mail_room_pidfile:="/run/gitlab/mail_room.pid"}
|
||||
: ${mail_room_logfile:="/var/log/gitlab/mail_room.log"}
|
||||
: ${mail_room_config:="/etc/gitlab/mail_room.yml"}
|
||||
|
||||
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//,/ -q } -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
|
||||
|
||||
mail_room_command="/usr/bin/bundle"
|
||||
mail_room_command_args="exec mail_room -q -c ${mail_room_config} >> ${mail_room_logfile} 2>&1"
|
||||
|
||||
depend() {
|
||||
provide gitlab
|
||||
need redis gitlab-workhorse
|
||||
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 $?
|
||||
|
||||
if [ -e /etc/default/gitlab ]; then
|
||||
. /etc/default/gitlab
|
||||
if [ "${mail_room_enabled}" == "true" ]; then
|
||||
ebegin "Starting ${name} - mail_room"
|
||||
|
||||
start-stop-daemon --start \
|
||||
--background --quiet \
|
||||
--chdir "${gitlab_base}" \
|
||||
--user=${gitlab_user} \
|
||||
--pidfile="${mail_room_pidfile}" -m \
|
||||
--env RAILS_ENV=${rails_env} \
|
||||
--exec ${mail_room_command} -- ${mail_room_command_args}
|
||||
eend $?
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${name} - mail_room"
|
||||
start-stop-daemon --stop \
|
||||
--signal QUIT \
|
||||
--pidfile=${mail_room_pidfile} \
|
||||
--exec ${mail_room_command}
|
||||
eend $?
|
||||
|
||||
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 $?
|
||||
}
|
||||
|
||||
restartsidekiq() {
|
||||
ebegin "Restarting ${name} - Sidekiq: Stopping"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile=${sidekiq_pidfile} \
|
||||
--exec ${sidekiq_command} \
|
||||
--progress \
|
||||
--retry 180
|
||||
|
||||
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 $?
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue