mirror of
https://github.com/YunoHost-Apps/gitlab_ynh.git
synced 2024-09-03 18:36:35 +02:00
Use add config
This commit is contained in:
parent
3c5fe31619
commit
4fee2f95db
8 changed files with 49 additions and 90 deletions
|
@ -1,6 +1,6 @@
|
||||||
SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb
|
SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__GITLAB_DEBIAN_VERSION__/gitlab-ce___GITLAB_VERSION__-ce.0_armhf.deb/download.deb
|
||||||
SOURCE_SUM=__SHA256_SUM__
|
SOURCE_SUM=__GITLAB_SOURCE_SHA256__
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FILENAME=__SOURCE_FILENAME__
|
SOURCE_FILENAME=__GITLAB_FILENAME__
|
||||||
SOURCE_EXTRACT=false
|
SOURCE_EXTRACT=false
|
||||||
SOURCE_FORMAT=deb
|
SOURCE_FORMAT=deb
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_arm64.deb/download.deb
|
SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__GITLAB_DEBIAN_VERSION__/gitlab-ce___GITLAB_VERSION__-ce.0_arm64.deb/download.deb
|
||||||
SOURCE_SUM=__SHA256_SUM__
|
SOURCE_SUM=__GITLAB_SOURCE_SHA256__
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FILENAME=__SOURCE_FILENAME__
|
SOURCE_FILENAME=__GITLAB_FILENAME__
|
||||||
SOURCE_EXTRACT=false
|
SOURCE_EXTRACT=false
|
||||||
SOURCE_FORMAT=deb
|
SOURCE_FORMAT=deb
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb
|
SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__GITLAB_DEBIAN_VERSION__/gitlab-ce___GITLAB_VERSION__-ce.0_amd64.deb/download.deb
|
||||||
SOURCE_SUM=__SHA256_SUM__
|
SOURCE_SUM=__GITLAB_SOURCE_SHA256__
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FILENAME=__SOURCE_FILENAME__
|
SOURCE_FILENAME=__GITLAB_FILENAME__
|
||||||
SOURCE_EXTRACT=false
|
SOURCE_EXTRACT=false
|
||||||
SOURCE_FORMAT=deb
|
SOURCE_FORMAT=deb
|
||||||
|
|
|
@ -8,6 +8,14 @@
|
||||||
"fr": "Gestionnaire de dépôts Git."
|
"fr": "Gestionnaire de dépôts Git."
|
||||||
},
|
},
|
||||||
"url": "https://gitlab.com",
|
"url": "https://gitlab.com",
|
||||||
|
"upstream": {
|
||||||
|
"license": "MIT",
|
||||||
|
"website": "https://gitlab.com",
|
||||||
|
"demo": "https://gitlab.com/explore",
|
||||||
|
"admindoc": "https://docs.gitlab.com/",
|
||||||
|
"userdoc": "https://yunohost.org/fr/app_gitlab",
|
||||||
|
"code": "https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab"
|
||||||
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"maintainer": {
|
"maintainer": {
|
||||||
"name": "kay0u",
|
"name": "kay0u",
|
||||||
|
@ -25,38 +33,22 @@
|
||||||
{
|
{
|
||||||
"name": "domain",
|
"name": "domain",
|
||||||
"type": "domain",
|
"type": "domain",
|
||||||
"ask": {
|
|
||||||
"en": "Choose a domain name for GitLab",
|
|
||||||
"fr": "Choisissez un nom de domaine pour GitLab"
|
|
||||||
},
|
|
||||||
"example": "example.com"
|
"example": "example.com"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "path",
|
"name": "path",
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"ask": {
|
|
||||||
"en": "Choose a path for GitLab",
|
|
||||||
"fr": "Choisissez un chemin pour GitLab"
|
|
||||||
},
|
|
||||||
"example": "/gitlab",
|
"example": "/gitlab",
|
||||||
"default": "/gitlab"
|
"default": "/gitlab"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "admin",
|
"name": "admin",
|
||||||
"type": "user",
|
"type": "user",
|
||||||
"ask": {
|
|
||||||
"en": "Choose an admin user",
|
|
||||||
"fr": "Choisissez l’administrateur"
|
|
||||||
},
|
|
||||||
"example": "johndoe"
|
"example": "johndoe"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "is_public",
|
"name": "is_public",
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"ask": {
|
|
||||||
"en": "Is it a public application?",
|
|
||||||
"fr": "Est-ce une application publique ?"
|
|
||||||
},
|
|
||||||
"default": true
|
"default": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,8 +29,8 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
|
||||||
# Needed for helper "ynh_add_nginx_config"
|
# Needed for helper "ynh_add_nginx_config"
|
||||||
config_path=$(ynh_app_setting_get --app=$app --key=config_path)
|
config_path=$(ynh_app_setting_get --app=$app --key=config_path)
|
||||||
port=$(ynh_app_setting_get --app="$app" --key=web_port)
|
port=$(ynh_app_setting_get --app="$app" --key=web_port)
|
||||||
portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port)
|
puma_port=$(ynh_app_setting_get --app="$app" --key=puma_port)
|
||||||
portSidekiq=$(ynh_app_setting_get --app="$app" --key=sidekiq_port)
|
sidekiq_port=$(ynh_app_setting_get --app="$app" --key=sidekiq_port)
|
||||||
puma_worker_processes=$(ynh_app_setting_get --app="$app" --key=puma_workers)
|
puma_worker_processes=$(ynh_app_setting_get --app="$app" --key=puma_workers)
|
||||||
puma_min_threads=$(ynh_app_setting_get --app="$app" --key=puma_min_threads)
|
puma_min_threads=$(ynh_app_setting_get --app="$app" --key=puma_min_threads)
|
||||||
puma_max_threads=$(ynh_app_setting_get --app="$app" --key=puma_max_threads)
|
puma_max_threads=$(ynh_app_setting_get --app="$app" --key=puma_max_threads)
|
||||||
|
@ -118,16 +118,9 @@ ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
||||||
domain="$new_domain"
|
domain="$new_domain"
|
||||||
path_url="$new_path"
|
path_url="$new_path"
|
||||||
|
|
||||||
ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb"
|
generated_external_url="https://$domain${path_url%/}"
|
||||||
ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb"
|
ynh_add_config --template="$YNH_APP_BASEDIR/conf/gitlab.rb" --destination="$config_path/gitlab.rb"
|
||||||
ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__MODIFY_KERNEL_PARAMETERS__" --replace_string="$modify_kernel_parameters" --target_file="$config_path/gitlab.rb"
|
|
||||||
|
|
||||||
ynh_store_file_checksum --file="$config_path/gitlab.rb"
|
ynh_store_file_checksum --file="$config_path/gitlab.rb"
|
||||||
|
|
||||||
|
@ -142,7 +135,7 @@ gitlab-ctl reconfigure
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Waiting for GitLab..." --weight=15
|
ynh_script_progression --message="Waiting for GitLab..." --weight=15
|
||||||
|
|
||||||
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$portPuma" --timeout=300
|
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# GENERIC FINALISATION
|
# GENERIC FINALISATION
|
||||||
|
|
|
@ -86,12 +86,12 @@ ynh_script_progression --message="Find internal port..." --weight=1
|
||||||
|
|
||||||
# Find free ports
|
# Find free ports
|
||||||
port=$(ynh_find_port --port=8080)
|
port=$(ynh_find_port --port=8080)
|
||||||
portPuma=$(ynh_find_port --port=$(($port + 1)))
|
puma_port=$(ynh_find_port --port=$(($port + 1)))
|
||||||
portSidekiq=$(ynh_find_port --port=$(($portPuma + 1)))
|
sidekiq_port=$(ynh_find_port --port=$(($port_puma + 1)))
|
||||||
|
|
||||||
ynh_app_setting_set --app=$app --key=web_port --value=$port
|
ynh_app_setting_set --app=$app --key=web_port --value=$port
|
||||||
ynh_app_setting_set --app=$app --key=puma_port --value=$portPuma
|
ynh_app_setting_set --app=$app --key=puma_port --value=$puma_port
|
||||||
ynh_app_setting_set --app=$app --key=sidekiq_port --value=$portSidekiq
|
ynh_app_setting_set --app=$app --key=sidekiq_port --value=$sidekiq_port
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# INSTALL DEPENDENCIES
|
# INSTALL DEPENDENCIES
|
||||||
|
@ -174,16 +174,9 @@ chown admin: "$config_path/gitlab-persistent.rb"
|
||||||
cp -f $YNH_APP_BASEDIR/conf/gitlab.rb "$config_path/gitlab.rb"
|
cp -f $YNH_APP_BASEDIR/conf/gitlab.rb "$config_path/gitlab.rb"
|
||||||
ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
||||||
|
|
||||||
ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb"
|
generated_external_url="https://$domain${path_url%/}"
|
||||||
ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb"
|
ynh_add_config --template="$YNH_APP_BASEDIR/conf/gitlab.rb" --destination="$config_path/gitlab.rb"
|
||||||
ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__MODIFY_KERNEL_PARAMETERS__" --replace_string="$modify_kernel_parameters" --target_file="$config_path/gitlab.rb"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STORE THE CONFIG FILE CHECKSUM
|
# STORE THE CONFIG FILE CHECKSUM
|
||||||
|
@ -197,11 +190,7 @@ ynh_store_file_checksum --file="$config_path/gitlab.rb"
|
||||||
ynh_script_progression --message="Setting up source files..." --weight=50
|
ynh_script_progression --message="Setting up source files..." --weight=50
|
||||||
|
|
||||||
source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
|
source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
|
||||||
cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src
|
ynh_add_config --template="$YNH_APP_BASEDIR/conf/$architecture.src.default" --destination="$YNH_APP_BASEDIR/conf/$architecture.src"
|
||||||
ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
|
|
||||||
tempdir="$(mktemp -d)"
|
tempdir="$(mktemp -d)"
|
||||||
|
|
||||||
|
@ -274,7 +263,7 @@ ynh_systemd_action --action=reload --service_name=nginx
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Restarting GitLab..." --weight=15
|
ynh_script_progression --message="Restarting GitLab..." --weight=15
|
||||||
|
|
||||||
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$portPuma" --timeout=300
|
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# END OF SCRIPT
|
# END OF SCRIPT
|
||||||
|
|
|
@ -33,7 +33,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||||
config_path=$(ynh_app_setting_get --app=$app --key=config_path)
|
config_path=$(ynh_app_setting_get --app=$app --key=config_path)
|
||||||
portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port)
|
puma_port=$(ynh_app_setting_get --app="$app" --key=puma_port)
|
||||||
architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
|
architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -97,11 +97,7 @@ ynh_restore_file --origin_path="$config_path/gitlab-persistent.rb"
|
||||||
ynh_script_progression --message="Reinstalling GitLab..." --weight=50
|
ynh_script_progression --message="Reinstalling GitLab..." --weight=50
|
||||||
|
|
||||||
source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
|
source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
|
||||||
cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src
|
ynh_add_config --template="$YNH_APP_BASEDIR/conf/$architecture.src.default" --destination="$YNH_APP_BASEDIR/conf/$architecture.src"
|
||||||
ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
|
|
||||||
tempdir="$(mktemp -d)"
|
tempdir="$(mktemp -d)"
|
||||||
|
|
||||||
|
@ -149,7 +145,7 @@ yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/applica
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Waiting for GitLab..." --weight=14
|
ynh_script_progression --message="Waiting for GitLab..." --weight=14
|
||||||
|
|
||||||
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$portPuma" --timeout=300
|
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# CHECK THE RESTORED DATA
|
# CHECK THE RESTORED DATA
|
||||||
|
|
|
@ -22,8 +22,8 @@ is_public=$(ynh_app_setting_get --app="$app" --key=is_public)
|
||||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||||
config_path=$(ynh_app_setting_get --app=$app --key=config_path)
|
config_path=$(ynh_app_setting_get --app=$app --key=config_path)
|
||||||
port=$(ynh_app_setting_get --app="$app" --key=web_port)
|
port=$(ynh_app_setting_get --app="$app" --key=web_port)
|
||||||
portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port)
|
puma_port=$(ynh_app_setting_get --app="$app" --key=puma_port)
|
||||||
portSidekiq=$(ynh_app_setting_get --app="$app" --key=sidekiq_port)
|
sidekiq_port=$(ynh_app_setting_get --app="$app" --key=sidekiq_port)
|
||||||
architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
|
architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
|
||||||
puma_worker_processes=$(ynh_app_setting_get --app="$app" --key=puma_workers)
|
puma_worker_processes=$(ynh_app_setting_get --app="$app" --key=puma_workers)
|
||||||
puma_min_threads=$(ynh_app_setting_get --app="$app" --key=puma_min_threads)
|
puma_min_threads=$(ynh_app_setting_get --app="$app" --key=puma_min_threads)
|
||||||
|
@ -126,19 +126,19 @@ if [ -z "$port" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If port doesn't exist, retrieve it
|
# If port doesn't exist, retrieve it
|
||||||
if [ -z "$portPuma" ]; then
|
if [ -z "$puma_port" ]; then
|
||||||
if [ -z "$(ynh_app_setting_get --app="$app" --key=unicorn_port)" ]; then
|
if [ -z "$(ynh_app_setting_get --app="$app" --key=unicorn_port)" ]; then
|
||||||
portPuma=$(grep -F "unicorn['port']" "/etc/gitlab/gitlab.rb" | cut -d' ' -f3)
|
puma_port=$(grep -F "unicorn['port']" "/etc/gitlab/gitlab.rb" | cut -d' ' -f3)
|
||||||
else
|
else
|
||||||
portPuma=$(ynh_app_setting_get --app="$app" --key=unicorn_port)
|
puma_port=$(ynh_app_setting_get --app="$app" --key=unicorn_port)
|
||||||
fi
|
fi
|
||||||
ynh_app_setting_set --app=$app --key=puma_port --value=$portPuma
|
ynh_app_setting_set --app=$app --key=puma_port --value=$puma_port
|
||||||
ynh_app_setting_delete --app=$app --key=unicorn_port
|
ynh_app_setting_delete --app=$app --key=unicorn_port
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$portSidekiq" ]; then
|
if [ -z "$sidekiq_port" ]; then
|
||||||
portSidekiq=$(ynh_find_port $(($portPuma + 1)))
|
sidekiq_port=$(ynh_find_port $(($puma_port + 1)))
|
||||||
ynh_app_setting_set --app=$app --key=sidekiq_port --value=$portSidekiq
|
ynh_app_setting_set --app=$app --key=sidekiq_port --value=$sidekiq_port
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if this source file exist, remove it
|
# if this source file exist, remove it
|
||||||
|
@ -265,11 +265,7 @@ then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src
|
ynh_add_config --template="$YNH_APP_BASEDIR/conf/$architecture.src.default" --destination="$YNH_APP_BASEDIR/conf/$architecture.src"
|
||||||
ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src"
|
|
||||||
|
|
||||||
tempdir="$(mktemp -d)"
|
tempdir="$(mktemp -d)"
|
||||||
|
|
||||||
|
@ -313,16 +309,9 @@ mkdir -p $config_path
|
||||||
cp -f $YNH_APP_BASEDIR/conf/gitlab.rb "$config_path/gitlab.rb"
|
cp -f $YNH_APP_BASEDIR/conf/gitlab.rb "$config_path/gitlab.rb"
|
||||||
ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
||||||
|
|
||||||
ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb"
|
generated_external_url="https://$domain${path_url%/}"
|
||||||
ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb"
|
ynh_add_config --template="$YNH_APP_BASEDIR/conf/gitlab.rb" --destination="$config_path/gitlab.rb"
|
||||||
ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb"
|
|
||||||
ynh_replace_string --match_string="__MODIFY_KERNEL_PARAMETERS__" --replace_string="$modify_kernel_parameters" --target_file="$config_path/gitlab.rb"
|
|
||||||
|
|
||||||
ynh_store_file_checksum --file="$config_path/gitlab.rb"
|
ynh_store_file_checksum --file="$config_path/gitlab.rb"
|
||||||
|
|
||||||
|
@ -362,7 +351,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||||
then
|
then
|
||||||
ynh_script_progression --message="Restarting GitLab..." --weight=15
|
ynh_script_progression --message="Restarting GitLab..." --weight=15
|
||||||
|
|
||||||
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$portPuma" --timeout=300
|
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
Loading…
Reference in a new issue