www-apps/gitlab-ce:
Purge all versions depending on <libgit2:0/26 Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
parent
51843ac93d
commit
2ec309249f
16 changed files with 13 additions and 3868 deletions
|
|
@ -1,97 +0,0 @@
|
|||
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
|
||||
index a33e40e..a3b5ecc 100644
|
||||
--- a/config/database.yml.mysql
|
||||
+++ b/config/database.yml.mysql
|
||||
@@ -3,40 +3,12 @@
|
||||
#
|
||||
production:
|
||||
adapter: mysql2
|
||||
- encoding: utf8
|
||||
- collation: utf8_general_ci
|
||||
+ encoding: utf8mb4
|
||||
+ collation: utf8mb4_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: utf8mb4
|
||||
- collation: utf8mb4_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,102 +0,0 @@
|
|||
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
|
||||
index db1b712..a3b5ecc 100644
|
||||
--- a/config/database.yml.mysql
|
||||
+++ b/config/database.yml.mysql
|
||||
@@ -3,42 +3,12 @@
|
||||
#
|
||||
production:
|
||||
adapter: mysql2
|
||||
- encoding: utf8
|
||||
- collation: utf8_general_ci
|
||||
+ encoding: utf8mb4
|
||||
+ collation: utf8mb4_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"
|
||||
- # host: localhost
|
||||
- # 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: utf8mb4
|
||||
- collation: utf8mb4_general_ci
|
||||
- reconnect: false
|
||||
- database: gitlabhq_test
|
||||
- pool: 5
|
||||
- username: root
|
||||
- password:
|
||||
- # host: localhost
|
||||
- # socket: /tmp/mysql.sock
|
||||
+ # socket: /run/mysqld/mysqld.sock
|
||||
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
|
||||
index c517a4c..28f7993 100644
|
||||
--- a/config/database.yml.postgresql
|
||||
+++ b/config/database.yml.postgresql
|
||||
@@ -4,45 +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:
|
||||
- # host: localhost
|
||||
-
|
||||
-#
|
||||
-# Staging specific
|
||||
-#
|
||||
-staging:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
- database: gitlabhq_staging
|
||||
- pool: 5
|
||||
- username: postgres
|
||||
- password:
|
||||
- # host: localhost
|
||||
-
|
||||
-# 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:
|
||||
- # host: localhost
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
|
||||
index 5f4a6bb..8f75d2b 100644
|
||||
--- a/lib/tasks/gitlab/check.rake
|
||||
+++ b/lib/tasks/gitlab/check.rake
|
||||
@@ -24,7 +24,7 @@ namespace :gitlab do
|
||||
check_tmp_writable
|
||||
check_uploads
|
||||
check_init_script_exists
|
||||
- check_init_script_up_to_date
|
||||
+ #check_init_script_up_to_date Gentoo uses a different init script
|
||||
check_projects_have_namespace
|
||||
check_redis_version
|
||||
check_ruby_version
|
||||
@@ -590,13 +590,6 @@ namespace :gitlab do
|
||||
puts "yes".color(:green)
|
||||
else
|
||||
puts "no".color(:red)
|
||||
- try_fixing_it(
|
||||
- sudo_gitlab("RAILS_ENV=production bin/background_jobs start")
|
||||
- )
|
||||
- for_more_information(
|
||||
- see_installation_guide_section("Install Init Script"),
|
||||
- "see log/sidekiq.log for possible errors"
|
||||
- )
|
||||
fix_and_rerun
|
||||
end
|
||||
end
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
extra_started_commands="check"
|
||||
|
||||
name="GitLab Sidekiq"
|
||||
description="Sidekiq for GitLab"
|
||||
description_check="Runs sanity checks"
|
||||
|
||||
: ${gitlab_user:=@USER@}
|
||||
: ${gitlab_base:="@GITLAB_BASE@"}
|
||||
: ${rails_env:=production}
|
||||
|
||||
: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
|
||||
: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
|
||||
: ${sidekiq_config:="/etc/gitlab/sidekiq_queues.yml"}
|
||||
|
||||
sidekiq_command="/usr/bin/bundle"
|
||||
sidekiq_command_args="exec sidekiq -C ${sidekiq_config} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
|
||||
|
||||
check_command="sudo -u ${gitlab_user} -H /usr/bin/bundle"
|
||||
check_command_args1="exec rake gitlab:env:info RAILS_ENV=${rails_env}"
|
||||
check_command_args2="exec rake gitlab:check RAILS_ENV=${rails_env}"
|
||||
|
||||
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 $?
|
||||
}
|
||||
|
||||
check() {
|
||||
ebegin "Running sanity checks for ${name}"
|
||||
|
||||
cd /opt/gitlab
|
||||
|
||||
${check_command} ${check_command_args1}
|
||||
|
||||
eend $?
|
||||
|
||||
${check_command} ${check_command_args2}
|
||||
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -1,141 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
extra_started_commands="restartsidekiq check"
|
||||
|
||||
name="GitLab"
|
||||
description="GitLab on Unicorns"
|
||||
description_restartsidekiq="Restarts Sidekiq only"
|
||||
description_check="Runs sanity checks"
|
||||
|
||||
: ${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_config:="/etc/gitlab/sidekiq_queues.yml"}
|
||||
|
||||
: ${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 -C ${sidekiq_config} -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"
|
||||
|
||||
check_command="sudo -u ${gitlab_user} -H /usr/bin/bundle"
|
||||
check_command_args1="exec rake gitlab:env:info RAILS_ENV=${rails_env}"
|
||||
check_command_args2="exec rake gitlab:check RAILS_ENV=${rails_env}"
|
||||
|
||||
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 $?
|
||||
}
|
||||
|
||||
check() {
|
||||
ebegin "Running sanity checks for ${name}"
|
||||
|
||||
cd /opt/gitlab
|
||||
|
||||
${check_command} ${check_command_args1}
|
||||
|
||||
eend $?
|
||||
|
||||
${check_command} ${check_command_args2}
|
||||
|
||||
eend $?
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue