Commit 94a55045 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'its-its' into 'master'

Fix spelling of "it's" to "its" where appropriate.

[ci skip]

See merge request !2196
parents c75ac821 9c893af7
...@@ -92,7 +92,7 @@ check_pids(){ ...@@ -92,7 +92,7 @@ check_pids(){
## Called when we have started the two processes and are waiting for their pid files. ## Called when we have started the two processes and are waiting for their pid files.
wait_for_pids(){ wait_for_pids(){
# We are sleeping a bit here mostly because sidekiq is slow at writing it's pid # We are sleeping a bit here mostly because sidekiq is slow at writing its pid
i=0; 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 ]; }; do while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || [ ! -f $gitlab_workhorse_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ]; }; do
sleep 0.1; sleep 0.1;
...@@ -108,7 +108,7 @@ wait_for_pids(){ ...@@ -108,7 +108,7 @@ wait_for_pids(){
} }
# We use the pids in so many parts of the script it makes sense to always check them. # 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 it's own pid. # Only after start() is run should the pids change. Sidekiq sets its own pid.
check_pids check_pids
...@@ -290,7 +290,7 @@ stop_gitlab() { ...@@ -290,7 +290,7 @@ stop_gitlab() {
sleep 1 sleep 1
# Cleaning up unused pids # Cleaning up unused pids
rm "$web_server_pid_path" 2>/dev/null rm "$web_server_pid_path" 2>/dev/null
# rm "$sidekiq_pid_path" 2>/dev/null # Sidekiq seems to be cleaning up it's own pid. # rm "$sidekiq_pid_path" 2>/dev/null # Sidekiq seems to be cleaning up its own pid.
rm -f "$gitlab_workhorse_pid_path" rm -f "$gitlab_workhorse_pid_path"
if [ "$mail_room_enabled" = true ]; then if [ "$mail_room_enabled" = true ]; then
rm "$mail_room_pid_path" 2>/dev/null rm "$mail_room_pid_path" 2>/dev/null
...@@ -299,7 +299,7 @@ stop_gitlab() { ...@@ -299,7 +299,7 @@ stop_gitlab() {
print_status print_status
} }
## Prints the status of GitLab and it's components. ## Prints the status of GitLab and its components.
print_status() { print_status() {
check_status check_status
if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
...@@ -333,7 +333,7 @@ print_status() { ...@@ -333,7 +333,7 @@ print_status() {
fi fi
} }
## Tells unicorn to reload it's config and Sidekiq to restart ## Tells unicorn to reload its config and Sidekiq to restart
reload_gitlab(){ reload_gitlab(){
exit_if_not_running exit_if_not_running
if [ "$wpid" = "0" ];then if [ "$wpid" = "0" ];then
......
...@@ -9,11 +9,11 @@ RAILS_ENV="production" ...@@ -9,11 +9,11 @@ RAILS_ENV="production"
# The default is "git". # The default is "git".
app_user="git" app_user="git"
# app_root defines the folder in which gitlab and it's components are installed. # app_root defines the folder in which gitlab and its components are installed.
# The default is "/home/$app_user/gitlab" # The default is "/home/$app_user/gitlab"
app_root="/home/$app_user/gitlab" app_root="/home/$app_user/gitlab"
# pid_path defines a folder in which the gitlab and it's components place their pids. # pid_path defines a folder in which the gitlab and its components place their pids.
# This variable is also used below to define the relevant pids for the gitlab components. # This variable is also used below to define the relevant pids for the gitlab components.
# The default is "$app_root/tmp/pids" # The default is "$app_root/tmp/pids"
pid_path="$app_root/tmp/pids" pid_path="$app_root/tmp/pids"
......
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