diff options
Diffstat (limited to 'www/gitlab-ce/files')
| -rw-r--r-- | www/gitlab-ce/files/gitlab.in | 570 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 144 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 56 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_initializers_1__settings.rb | 17 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_unicorn.rb.example | 34 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-lib_support_nginx_gitlab | 20 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl | 20 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-lib_tasks_gitlab_setup.rake | 12 |
8 files changed, 873 insertions, 0 deletions
diff --git a/www/gitlab-ce/files/gitlab.in b/www/gitlab-ce/files/gitlab.in new file mode 100644 index 000000000000..0411c0912b45 --- /dev/null +++ b/www/gitlab-ce/files/gitlab.in @@ -0,0 +1,570 @@ +#! /bin/sh + +# $FreeBSD$ + +### BEGIN INIT INFO +# Provides: gitlab +# Required-Start: $local_fs $remote_fs $network $syslog redis-server +# Required-Stop: $local_fs $remote_fs $network $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: GitLab git repository management +# Description: GitLab git repository management +# chkconfig: - 85 14 +### END INIT INFO + +# Maintainer: Torsten Zuehlsdorff <ports@toco-domains.de> +# Based on work of: @charlienewey, rovanion.luckey@gmail.com, @randx + +# PROVIDE: gitlab +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable GitLab: +# +# gitlab_enable="YES" + +PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" + +. /etc/rc.subr + +name=gitlab +rcvar=gitlab_enable +extra_commands=status + +status_cmd="print_status" +start_cmd="start_gitlab" +stop_cmd="stop_gitlab" +restart_cmd="restart_gitlab" + +: ${gitlab_enable:="NO"} +: ${gitlab_authBackend:="http://127.0.0.1:8080"} +: ${gitlab_workhorse_tcp:="NO"} +: ${gitlab_workhorse_addr:="127.0.0.1:8181"} +: ${gitlab_mail_room_enable:="NO"} + +load_rc_config $name + +### Environment variables +RAILS_ENV="production" + +# Script variable names should be lower-case not to conflict with +# internal /bin/sh variables such as PATH, EDITOR or SHELL. +app_user="git" +app_root="/usr/local/www/gitlab-ce" +pid_path="$app_root/tmp/pids" +socket_path="$app_root/tmp/sockets" +rails_socket="$socket_path/gitlab.socket" +web_server_pid_path="$pid_path/unicorn.pid" +sidekiq_pid_path="$pid_path/sidekiq.pid" +if checkyesno gitlab_mail_room_enable; then + mail_room_enabled=true +else + mail_room_enabled=false +fi +mail_room_pid_path="$pid_path/mail_room.pid" +gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd) +gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid" +if checkyesno gitlab_workhorse_tcp; then + gitlab_workhorse_listen="-listenNetwork tcp -listenAddr $gitlab_workhorse_addr" +else + gitlab_workhorse_listen="-listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket" +fi +gitlab_workhorse_options="-listenUmask 0 $gitlab_workhorse_listen -authBackend $gitlab_authBackend -authSocket $rails_socket -documentRoot $app_root/public" +gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log" +gitlab_pages_enabled=false +gitlab_pages_dir=$(cd $app_root/../gitlab-pages 2> /dev/null && pwd) +gitlab_pages_pid_path="$pid_path/gitlab-pages.pid" +gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090" +gitlab_pages_log="$app_root/log/gitlab-pages.log" +shell_path="/bin/bash" +gitaly_enabled=true +gitaly_dir="/usr/local/share/gitaly" +gitaly_pid_path="$pid_path/gitaly.pid" +gitaly_log="$app_root/log/gitaly.log" + +# Read configuration variable file if it is present +test -f /etc/default/gitlab && . /etc/default/gitlab + +# Switch to the app_user if it is not he/she who is running the script. +if [ "$USER" != "$app_user" ]; then + # Regenerate the Gemfile.lock for all related products + echo "Regenerate Gitlab Gemfile.lock" + rm -f "${app_root}"/Gemfile.lock + if ! su -l ${app_user} -c "cd ${app_root} && /usr/local/bin/bundle install --local --quiet"; then + echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" + exit 1 + fi + echo "Regenerate Gitaly Gemfile.lock" + rm -f "${gitaly_dir}"/ruby/Gemfile.lock + if ! su -l root -c "cd ${gitaly_dir}/ruby && /usr/local/bin/bundle install --local --quiet"; then + echo "Could not create Gemfile.lock for gitaly, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" + exit 1 + fi + + eval su - "$app_user" -c $(echo \")/usr/local/etc/rc.d/gitlab "$@"$(echo \"); exit; +fi + +# Switch to the gitlab path, exit on failure. +if ! cd "$app_root" ; then + echo "Failed to cd into $app_root, exiting!"; exit 1 +fi + + +### Init Script functions + +## Gets the pids from the files +check_pids(){ + if ! mkdir -p "$pid_path"; then + echo "Could not create the path $pid_path needed to store the pids." + exit 1 + fi + # If there exists a file which should hold the value of the Unicorn pid: read it. + if [ -f "$web_server_pid_path" ]; then + wpid=$(cat "$web_server_pid_path") + else + wpid=0 + fi + if [ -f "$sidekiq_pid_path" ]; then + spid=$(cat "$sidekiq_pid_path") + else + spid=0 + fi + if [ -f "$gitlab_workhorse_pid_path" ]; then + hpid=$(cat "$gitlab_workhorse_pid_path") + else + hpid=0 + fi + if [ "$mail_room_enabled" = true ]; then + if [ -f "$mail_room_pid_path" ]; then + mpid=$(cat "$mail_room_pid_path") + else + mpid=0 + fi + fi + if [ "$gitlab_pages_enabled" = true ]; then + if [ -f "$gitlab_pages_pid_path" ]; then + gppid=$(cat "$gitlab_pages_pid_path") + else + gppid=0 + fi + fi + if [ "$gitaly_enabled" = true ]; then + if [ -f "$gitaly_pid_path" ]; then + gapid=$(cat "$gitaly_pid_path") + else + gapid=0 + fi + fi +} + +## Called when we have started the two processes and are waiting for their pid files. +wait_for_pids(){ + # We are sleeping a bit here mostly because sidekiq is slow at writing its pid + i=0; + while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || [ ! -f $gitlab_workhorse_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ]; } || { [ "$gitlab_pages_enabled" = true ] && [ ! -f $gitlab_pages_pid_path ]; } || { [ "$gitaly_enabled" = true ] && [ ! -f $gitaly_pid_path ]; }; do + sleep 0.1; + i=$((i+1)) + if [ $((i%10)) = 0 ]; then + echo -n "." + elif [ $((i)) = 301 ]; then + echo "Waited 30s for the processes to write their pids, something probably went wrong." + exit 1; + fi + done + echo +} + +# We use the pids in so many parts of the script it makes sense to always check them. +# Only after start() is run should the pids change. Sidekiq sets its own pid. +check_pids + + +## Checks whether the different parts of the service are already running or not. +check_status(){ + check_pids + # If the web server is running kill -0 $wpid returns true, or rather 0. + # Checks of *_status should only check for == 0 or != 0, never anything else. + if [ $wpid -ne 0 ]; then + kill -0 "$wpid" 2>/dev/null + web_status="$?" + else + web_status="-1" + fi + if [ $spid -ne 0 ]; then + kill -0 "$spid" 2>/dev/null + sidekiq_status="$?" + else + sidekiq_status="-1" + fi + if [ $hpid -ne 0 ]; then + kill -0 "$hpid" 2>/dev/null + gitlab_workhorse_status="$?" + else + gitlab_workhorse_status="-1" + fi + if [ "$mail_room_enabled" = true ]; then + if [ $mpid -ne 0 ]; then + kill -0 "$mpid" 2>/dev/null + mail_room_status="$?" + else + mail_room_status="-1" + fi + fi + if [ "$gitlab_pages_enabled" = true ]; then + if [ $gppid -ne 0 ]; then + kill -0 "$gppid" 2>/dev/null + gitlab_pages_status="$?" + else + gitlab_pages_status="-1" + fi + fi + if [ "$gitaly_enabled" = true ]; then + if [ $gapid -ne 0 ]; then + kill -0 "$gapid" 2>/dev/null + gitaly_status="$?" + else + gitaly_status="-1" + fi + fi + if [ $web_status = 0 ] && [ $sidekiq_status = 0 ] && [ $gitlab_workhorse_status = 0 ] && { [ "$mail_room_enabled" != true ] || [ $mail_room_status = 0 ]; } && { [ "$gitlab_pages_enabled" != true ] || [ $gitlab_pages_status = 0 ]; } && { [ "$gitaly_enabled" != true ] || [ $gitaly_status = 0 ]; }; then + gitlab_status=0 + else + # http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html + # code 3 means 'program is not running' + gitlab_status=3 + fi +} + +## Check for stale pids and remove them if necessary. +check_stale_pids(){ + check_status + # If there is a pid it is something else than 0, the service is running if + # *_status is == 0. + if [ "$wpid" != "0" ] && [ "$web_status" != "0" ]; then + echo "Removing stale Unicorn web server pid. This is most likely caused by the web server crashing the last time it ran." + if ! rm "$web_server_pid_path"; then + echo "Unable to remove stale pid, exiting." + exit 1 + fi + fi + if [ "$spid" != "0" ] && [ "$sidekiq_status" != "0" ]; then + echo "Removing stale Sidekiq job dispatcher pid. This is most likely caused by Sidekiq crashing the last time it ran." + if ! rm "$sidekiq_pid_path"; then + echo "Unable to remove stale pid, exiting" + exit 1 + fi + fi + if [ "$hpid" != "0" ] && [ "$gitlab_workhorse_status" != "0" ]; then + echo "Removing stale GitLab Workhorse pid. This is most likely caused by GitLab Workhorse crashing the last time it ran." + if ! rm "$gitlab_workhorse_pid_path"; then + echo "Unable to remove stale pid, exiting" + exit 1 + fi + fi + if [ "$mail_room_enabled" = true ] && [ "$mpid" != "0" ] && [ "$mail_room_status" != "0" ]; then + echo "Removing stale MailRoom job dispatcher pid. This is most likely caused by MailRoom crashing the last time it ran." + if ! rm "$mail_room_pid_path"; then + echo "Unable to remove stale pid, exiting" + exit 1 + fi + fi + if [ "$gitlab_pages_enabled" = true ] && [ "$gppid" != "0" ] && [ "$gitlab_pages_status" != "0" ]; then + echo "Removing stale GitLab Pages job dispatcher pid. This is most likely caused by GitLab Pages crashing the last time it ran." + if ! rm "$gitlab_pages_pid_path"; then + echo "Unable to remove stale pid, exiting" + exit 1 + fi + fi + if [ "$gitaly_enabled" = true ] && [ "$gapid" != "0" ] && [ "$gitaly_status" != "0" ]; then + echo "Removing stale Gitaly pid. This is most likely caused by Gitaly crashing the last time it ran." + if ! rm "$gitaly_pid_path"; then + echo "Unable to remove stale pid, exiting" + exit 1 + fi + fi +} + +## If no parts of the service is running, bail out. +exit_if_not_running(){ + check_stale_pids + if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" != "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" != "0" ]; }; then + echo "GitLab is not running." + exit + fi +} + +## Starts Unicorn and Sidekiq if they're not running. +start_gitlab() { + check_stale_pids + + if [ "$web_status" != "0" ]; then + echo "Starting GitLab Unicorn" + fi + if [ "$sidekiq_status" != "0" ]; then + echo "Starting GitLab Sidekiq" + fi + if [ "$gitlab_workhorse_status" != "0" ]; then + echo "Starting GitLab Workhorse" + fi + if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" != "0" ]; then + echo "Starting GitLab MailRoom" + fi + if [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" != "0" ]; then + echo "Starting GitLab Pages" + fi + if [ "$gitaly_enabled" = true ] && [ "$gitaly_status" != "0" ]; then + echo "Starting Gitaly" + fi + + # Then check if the service is running. If it is: don't start again. + if [ "$web_status" = "0" ]; then + echo "The Unicorn web server already running with pid $wpid, not restarting." + else + # Remove old socket if it exists + rm -f "$socket_path"/gitlab.socket 2>/dev/null + # Start the web server + RAILS_ENV=$RAILS_ENV bin/web start + fi + + # If sidekiq is already running, don't start it again. + if [ "$sidekiq_status" = "0" ]; then + echo "The Sidekiq job dispatcher is already running with pid $spid, not restarting" + else + RAILS_ENV=$RAILS_ENV bin/background_jobs start & + fi + + if [ "$gitlab_workhorse_status" = "0" ]; then + echo "The GitLab Workhorse is already running with pid $hpid, not restarting" + else + # No need to remove a socket, gitlab-workhorse does this itself. + # Because gitlab-workhorse has multiple executables we need to fix + # the PATH. + $app_root/bin/daemon_with_pidfile $gitlab_workhorse_pid_path \ + /usr/bin/env PATH=$gitlab_workhorse_dir:$PATH \ + gitlab-workhorse $gitlab_workhorse_options \ + >> $gitlab_workhorse_log 2>&1 & + fi + + if [ "$mail_room_enabled" = true ]; then + # If MailRoom is already running, don't start it again. + if [ "$mail_room_status" = "0" ]; then + echo "The MailRoom email processor is already running with pid $mpid, not restarting" + else + RAILS_ENV=$RAILS_ENV bin/mail_room start & + fi + fi + + if [ "$gitlab_pages_enabled" = true ]; then + if [ "$gitlab_pages_status" = "0" ]; then + echo "The GitLab Pages is already running with pid $gppid, not restarting" + else + $app_root/bin/daemon_with_pidfile $gitlab_pages_pid_path \ + $gitlab_pages_dir/gitlab-pages $gitlab_pages_options \ + >> $gitlab_pages_log 2>&1 & + fi + fi + + if [ "$gitaly_enabled" = true ]; then + if [ "$gitaly_status" = "0" ]; then + echo "Gitaly is already running with pid $gapid, not restarting" + else + $app_root/bin/daemon_with_pidfile $gitaly_pid_path \ + $gitaly_dir/bin/gitaly $gitaly_dir/config.toml >> $gitaly_log 2>&1 & + fi + fi + + # Wait for the pids to be planted + wait_for_pids + # Finally check the status to tell wether or not GitLab is running + print_status +} + +## Asks Unicorn, Sidekiq and MailRoom if they would be so kind as to stop, if not kills them. +stop_gitlab() { + exit_if_not_running + + if [ "$web_status" = "0" ]; then + echo "Shutting down GitLab Unicorn" + RAILS_ENV=$RAILS_ENV bin/web stop + fi + if [ "$sidekiq_status" = "0" ]; then + echo "Shutting down GitLab Sidekiq" + RAILS_ENV=$RAILS_ENV bin/background_jobs stop + fi + if [ "$gitlab_workhorse_status" = "0" ]; then + echo "Shutting down GitLab Workhorse" + kill -- $(cat $gitlab_workhorse_pid_path) + fi + if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; then + echo "Shutting down GitLab MailRoom" + RAILS_ENV=$RAILS_ENV bin/mail_room stop + fi + if [ "$gitlab_pages_status" = "0" ]; then + echo "Shutting down gitlab-pages" + kill -- $(cat $gitlab_pages_pid_path) + fi + if [ "$gitaly_status" = "0" ]; then + echo "Shutting down Gitaly" + kill -- $(cat $gitaly_pid_path) + fi + + # If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script. + while [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; } || { [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" = "0" ]; } || { [ "$gitaly_enabled" = true ] && [ "$gitaly_status" = "0" ]; }; do + sleep 1 + check_status + printf "." + if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" != "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" != "0" ]; }; then + printf "\n" + break + fi + done + + sleep 1 + # Cleaning up unused pids + rm "$web_server_pid_path" 2>/dev/null + # rm "$sidekiq_pid_path" 2>/dev/null # Sidekiq seems to be cleaning up its own pid. + rm -f "$gitlab_workhorse_pid_path" + if [ "$mail_room_enabled" = true ]; then + rm "$mail_room_pid_path" 2>/dev/null + fi + rm -f "$gitlab_pages_pid_path" + rm -f "$gitaly_pid_path" + + print_status +} + +## Prints the status of GitLab and its components. +print_status() { + check_status + if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" != "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" != "0" ]; }; then + echo "GitLab is not running." + return + fi + if [ "$web_status" = "0" ]; then + echo "The GitLab Unicorn web server with pid $wpid is running." + else + printf "The GitLab Unicorn web server is \033[31mnot running\033[0m.\n" + fi + if [ "$sidekiq_status" = "0" ]; then + echo "The GitLab Sidekiq job dispatcher with pid $spid is running." + else + printf "The GitLab Sidekiq job dispatcher is \033[31mnot running\033[0m.\n" + fi + if [ "$gitlab_workhorse_status" = "0" ]; then + echo "The GitLab Workhorse with pid $hpid is running." + else + printf "The GitLab Workhorse is \033[31mnot running\033[0m.\n" + fi + if [ "$mail_room_enabled" = true ]; then + if [ "$mail_room_status" = "0" ]; then + echo "The GitLab MailRoom email processor with pid $mpid is running." + else + printf "The GitLab MailRoom email processor is \033[31mnot running\033[0m.\n" + fi + fi + if [ "$gitlab_pages_enabled" = true ]; then + if [ "$gitlab_pages_status" = "0" ]; then + echo "The GitLab Pages with pid $gppid is running." + else + printf "The GitLab Pages is \033[31mnot running\033[0m.\n" + fi + fi + if [ "$gitaly_enabled" = true ]; then + if [ "$gitaly_status" = "0" ]; then + echo "Gitaly with pid $gapid is running." + else + printf "Gitaly is \033[31mnot running\033[0m.\n" + fi + fi + if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && [ "$gitlab_workhorse_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" = "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" = "0" ]; }; then + printf "GitLab and all its components are \033[32mup and running\033[0m.\n" + fi +} + +## Tells unicorn to reload its config and Sidekiq to restart +reload_gitlab(){ + exit_if_not_running + if [ "$wpid" = "0" ];then + echo "The GitLab Unicorn Web server is not running thus its configuration can't be reloaded." + exit 1 + fi + printf "Reloading GitLab Unicorn configuration... " + RAILS_ENV=$RAILS_ENV bin/web reload + echo "Done." + + echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..." + RAILS_ENV=$RAILS_ENV bin/background_jobs restart + + if [ "$mail_room_enabled" != true ]; then + echo "Restarting GitLab MailRoom since it isn't capable of reloading its config..." + RAILS_ENV=$RAILS_ENV bin/mail_room restart + fi + + wait_for_pids + print_status +} + +## Restarts Sidekiq and Unicorn. +restart_gitlab(){ + check_status + if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; } || { [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" = "0" ]; } || { [ "$gitaly_enabled" = true ] && [ "$gitaly_status" = "0" ]; }; then + stop_gitlab + fi + start_gitlab +} + + +### Finally the input handling. + +case $gitlab_enable in + [yY][eE][sS]) + case "$1" in + start|quietstart|faststart) + start_gitlab + ;; + stop|faststop) + stop_gitlab + ;; + restart) + restart_gitlab + ;; + reload|force-reload) + reload_gitlab + ;; + status) + print_status + exit $gitlab_status + ;; + *) + echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}" + exit 1 + ;; + esac + ;; + *) + case "$1" in + onestart) + start_gitlab + ;; + onestop) + stop_gitlab + ;; + onerestart) + restart_gitlab + ;; + onreload) + reload_gitlab + ;; + status) + print_status + exit $gitlab_status + ;; + *) + echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}" + exit 1 + ;; + esac +esac + +exit diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile new file mode 100644 index 000000000000..523782b272f4 --- /dev/null +++ b/www/gitlab-ce/files/patch-Gemfile @@ -0,0 +1,144 @@ +--- Gemfile.orig 2018-06-21 15:14:17 UTC ++++ Gemfile +@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' + gem 'default_value_for', gem_versions['default_value_for'] + + # Supported DBs +-gem 'mysql2', '~> 0.4.10', group: :mysql ++gem 'mysql2', '>= 0.4.10', group: :mysql + gem 'pg', '~> 0.18.2', group: :postgres + + gem 'rugged', '~> 0.27' +@@ -123,7 +123,7 @@ gem 'fog-rackspace', '~> 0.1.1' + gem 'fog-aliyun', '~> 0.2.0' + + # for Google storage +-gem 'google-api-client', '~> 0.19.8' ++gem 'google-api-client', '>= 0.19.8' + + # for aws storage + gem 'unf', '~> 0.1.4' +@@ -177,7 +177,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req + gem 'rufus-scheduler', '~> 3.4' + + # HTTP requests +-gem 'httparty', '~> 0.13.3' ++gem 'httparty', '>= 0.13.3' + + # Colored output to console + gem 'rainbow', '~> 2.2' +@@ -291,7 +291,7 @@ gem 'batch-loader', '~> 1.2.1' + # Perf bar + gem 'peek', '~> 1.0.1' + gem 'peek-gc', '~> 0.0.2' +-gem 'peek-mysql2', '~> 1.1.0', group: :mysql ++gem 'peek-mysql2', '>= 1.1.0', group: :mysql + gem 'peek-pg', '~> 1.3.0', group: :postgres + gem 'peek-rblineprof', '~> 0.2.0' + gem 'peek-redis', '~> 1.2.0' +@@ -299,96 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3' + + # Metrics + group :metrics do +- gem 'allocations', '~> 1.0', require: false, platform: :mri +- gem 'method_source', '~> 0.8', require: false +- gem 'influxdb', '~> 0.2', require: false +- + # Prometheus + gem 'prometheus-client-mmap', '~> 0.9.3' + gem 'raindrops', '~> 0.18' + end + +-group :development do +- gem 'foreman', '~> 0.84.0' +- gem 'brakeman', '~> 4.2', require: false +- +- gem 'letter_opener_web', '~> 1.3.0' +- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false +- +- # Better errors handler +- gem 'better_errors', '~> 2.1.0' +- gem 'binding_of_caller', '~> 0.7.2' +- +- # thin instead webrick +- gem 'thin', '~> 1.7.0' +-end +- +-group :development, :test do +- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] +- gem 'pry-byebug', '~> 3.4.1', platform: :mri +- gem 'pry-rails', '~> 0.3.4' +- +- gem 'awesome_print', require: false +- gem 'fuubar', '~> 2.2.0' +- +- gem 'database_cleaner', '~> 1.5.0' +- gem 'factory_bot_rails', '~> 4.8.2' +- gem 'rspec-rails', '~> 3.6.0' +- gem 'rspec-retry', '~> 0.4.5' +- gem 'rspec_profiling', '~> 0.0.5' +- gem 'rspec-set', '~> 0.1.3' +- gem 'rspec-parameterized', require: false +- +- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) +- gem 'minitest', '~> 5.7.0' +- +- # Generate Fake data +- gem 'ffaker', '~> 2.4' +- +- gem 'capybara', '~> 2.15' +- gem 'capybara-screenshot', '~> 1.0.0' +- gem 'selenium-webdriver', '~> 3.12' +- +- gem 'spring', '~> 2.0.0' +- gem 'spring-commands-rspec', '~> 1.0.4' +- +- gem 'gitlab-styles', '~> 2.3', require: false +- # Pin these dependencies, otherwise a new rule could break the CI pipelines +- gem 'rubocop', '~> 0.52.1' +- gem 'rubocop-rspec', '~> 1.22.1' +- +- gem 'scss_lint', '~> 0.56.0', require: false +- gem 'haml_lint', '~> 0.26.0', require: false +- gem 'simplecov', '~> 0.14.0', require: false +- gem 'flay', '~> 2.10.0', require: false +- gem 'bundler-audit', '~> 0.5.0', require: false +- +- gem 'benchmark-ips', '~> 2.3.0', require: false +- +- gem 'license_finder', '~> 3.1', require: false +- gem 'knapsack', '~> 1.16' +- +- gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] +- +- gem 'stackprof', '~> 0.2.10', require: false +- +- gem 'simple_po_parser', '~> 1.1.2', require: false +- +- gem 'timecop', '~> 0.8.0' +-end +- +-group :test do +- gem 'shoulda-matchers', '~> 3.1.2', require: false +- gem 'email_spec', '~> 2.2.0' +- gem 'json-schema', '~> 2.8.0' +- gem 'webmock', '~> 2.3.2' +- gem 'rails-controller-testing' if rails5? # Rails5 only gem. +- gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. +- gem 'sham_rack', '~> 1.3.6' +- gem 'concurrent-ruby', '~> 1.0.5' +- gem 'test-prof', '~> 0.2.5' +-end +- + gem 'octokit', '~> 4.9' + + gem 'mail_room', '~> 0.9.1' +@@ -419,7 +334,7 @@ group :ed25519 do + end + + # Gitaly GRPC client +-gem 'gitaly-proto', '~> 0.100.0', require: 'gitaly' ++gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' + gem 'grpc', '~> 1.11.0' + + # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example new file mode 100644 index 000000000000..be7cd37caa31 --- /dev/null +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -0,0 +1,56 @@ +--- config/gitlab.yml.example.orig 2018-06-21 15:14:17 UTC ++++ config/gitlab.yml.example +@@ -218,7 +218,7 @@ production: &base + # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages + # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages + admin: +- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) ++ address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) + + ## Mattermost + ## For enabling Add to Mattermost button +@@ -577,7 +577,7 @@ production: &base + # Gitaly settings + gitaly: + # Path to the directory containing Gitaly client executables. +- client_path: /home/git/gitaly/bin ++ client_path: /usr/local/share/gitaly/bin + # Default Gitaly authentication token. Can be overriden per storage. Can + # be left blank when Gitaly is running locally on a Unix socket, which + # is the normal way to deploy Gitaly. +@@ -595,8 +595,8 @@ production: &base + # real path not the symlink. + storages: # You must have at least a `default` storage path. + default: +- path: /home/git/repositories/ +- gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) ++ path: /usr/home/git/repositories/ ++ gitaly_address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) + # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. + + ## Backup settings +@@ -624,12 +624,12 @@ production: &base + + ## GitLab Shell settings + gitlab_shell: +- path: /home/git/gitlab-shell/ +- hooks_path: /home/git/gitlab-shell/hooks/ ++ path: /usr/local/share/gitlab-shell/ ++ hooks_path: /usr/local/share/gitlab-shell/hooks/ + + # File that contains the secret key for verifying access for gitlab-shell. + # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). +- # secret_file: /home/git/gitlab/.gitlab_shell_secret ++ # secret_file: /usr/home/git/gitlab/.gitlab_shell_secret + + # Git over HTTP + upload_pack: true +@@ -650,7 +650,7 @@ production: &base + # CAUTION! + # Use the default values unless you really know what you are doing + git: +- bin_path: /usr/bin/git ++ bin_path: /usr/local/bin/git + + ## Webpack settings + # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb new file mode 100644 index 000000000000..787483567f20 --- /dev/null +++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb @@ -0,0 +1,17 @@ +--- config/initializers/1_settings.rb.orig 2018-06-06 20:30:27 UTC ++++ config/initializers/1_settings.rb +@@ -125,12 +125,8 @@ Settings.gitlab['email_subject_suffix'] + Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) + Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) + Settings.gitlab['user'] ||= 'git' +-Settings.gitlab['user_home'] ||= begin +- Etc.getpwnam(Settings.gitlab['user']).dir +-rescue ArgumentError # no user configured +- '/home/' + Settings.gitlab['user'] +-end +-Settings.gitlab['time_zone'] ||= nil ++Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user'] ++Settings.gitlab['time_zone'] ||= nil + Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? + Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? + Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) diff --git a/www/gitlab-ce/files/patch-config_unicorn.rb.example b/www/gitlab-ce/files/patch-config_unicorn.rb.example new file mode 100644 index 000000000000..63c49ea60042 --- /dev/null +++ b/www/gitlab-ce/files/patch-config_unicorn.rb.example @@ -0,0 +1,34 @@ +--- config/unicorn.rb.example.orig 2017-06-07 20:58:14 UTC ++++ config/unicorn.rb.example +@@ -33,12 +33,12 @@ worker_processes 3 + + # Help ensure your application will always spawn in the symlinked + # "current" directory that Capistrano sets up. +-working_directory "/home/git/gitlab" # available in 0.94.0+ ++working_directory "/usr/local/www/gitlab-ce" # available in 0.94.0+ + + # Listen on both a Unix domain socket and a TCP port. + # If you are load-balancing multiple Unicorn masters, lower the backlog + # setting to e.g. 64 for faster failover. +-listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024 ++listen "/usr/local/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024 + listen "127.0.0.1:8080", :tcp_nopush => true + + # nuke workers after 30 seconds instead of 60 seconds (the default) +@@ -59,13 +59,13 @@ listen "127.0.0.1:8080", :tcp_nopush => + timeout 60 + + # feel free to point this anywhere accessible on the filesystem +-pid "/home/git/gitlab/tmp/pids/unicorn.pid" ++pid "/usr/local/www/gitlab-ce/tmp/pids/unicorn.pid" + + # By default, the Unicorn logger will write to stderr. + # Additionally, some applications/frameworks log to stderr or stdout, + # so prevent them from going to /dev/null when daemonized here: +-stderr_path "/home/git/gitlab/log/unicorn.stderr.log" +-stdout_path "/home/git/gitlab/log/unicorn.stdout.log" ++stderr_path "/usr/local/www/gitlab-ce/log/unicorn.stderr.log" ++stdout_path "/usr/local/www/gitlab-ce/log/unicorn.stdout.log" + + # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings + # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow diff --git a/www/gitlab-ce/files/patch-lib_support_nginx_gitlab b/www/gitlab-ce/files/patch-lib_support_nginx_gitlab new file mode 100644 index 000000000000..577803428fd6 --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_support_nginx_gitlab @@ -0,0 +1,20 @@ +--- lib/support/nginx/gitlab.orig 2018-02-22 10:46:29 UTC ++++ lib/support/nginx/gitlab +@@ -19,7 +19,7 @@ + upstream gitlab-workhorse { + # Gitlab socket file, + # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket +- server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; ++ server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; + } + + map $http_upgrade $connection_upgrade_gitlab { +@@ -114,7 +114,7 @@ server { + location ~ ^/(404|422|500|502|503)\.html$ { + # Location to the Gitlab's public directory, + # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public. +- root /home/git/gitlab/public; ++ root /usr/local/www/gitlab-ce/public; + internal; + } + diff --git a/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl new file mode 100644 index 000000000000..db4a605d02bc --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl @@ -0,0 +1,20 @@ +--- lib/support/nginx/gitlab-ssl.orig 2018-02-22 10:46:29 UTC ++++ lib/support/nginx/gitlab-ssl +@@ -23,7 +23,7 @@ + upstream gitlab-workhorse { + # Gitlab socket file, + # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket +- server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; ++ server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; + } + + map $http_upgrade $connection_upgrade_gitlab_ssl { +@@ -164,7 +164,7 @@ server { + location ~ ^/(404|422|500|502|503)\.html$ { + # Location to the Gitlab's public directory, + # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public +- root /home/git/gitlab/public; ++ root /usr/local/www/gitlab-ce/public; + internal; + } + } diff --git a/www/gitlab-ce/files/patch-lib_tasks_gitlab_setup.rake b/www/gitlab-ce/files/patch-lib_tasks_gitlab_setup.rake new file mode 100644 index 000000000000..23c8fb945ec0 --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_tasks_gitlab_setup.rake @@ -0,0 +1,12 @@ +--- lib/tasks/gitlab/setup.rake.orig 2018-06-21 08:18:34 UTC ++++ lib/tasks/gitlab/setup.rake +@@ -1,7 +1,8 @@ + namespace :gitlab do + desc "GitLab | Setup production application" + task setup: :gitlab_environment do +- check_gitaly_connection ++ # Remove this check, see https://gitlab.com/gitlab-org/gitlab-ce/issues/47483 ++ #check_gitaly_connection + setup_db + end + |