YunoHost-Apps/gitlab_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/gitlab_ynh.git synced 2024-09-03 18:36:35 +02:00
Code Issues Activity Actions

Merge pull request #154 from YunoHost-Apps/fix-paths

Browse source 
fix paths
This commit is contained in:
Kayou 2021-05-16 10:40:11 +02:00 committed by GitHub
commit 08309753ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/change_url
View file

@ -112,7 +112,7 @@ ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb"
mkdir -p $config_path mkdir -p $config_path
cp -f ../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+")
domain="$new_domain" domain="$new_domain"

14
scripts/install
View file

@ -171,7 +171,7 @@ mkdir -p $config_path
touch "$config_path/gitlab-persistent.rb" touch "$config_path/gitlab-persistent.rb"
chown admin: "$config_path/gitlab-persistent.rb" chown admin: "$config_path/gitlab-persistent.rb"
cp -f ../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" ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb"
@ -196,12 +196,12 @@ 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 ./upgrade.d/upgrade.last.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
cp ../conf/$architecture.src.default ../conf/$architecture.src cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src
ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../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="../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="../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="../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)"

12
scripts/restore
View file

@ -96,12 +96,12 @@ 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 ../settings/scripts/upgrade.d/upgrade.last.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
cp ../settings/conf/$architecture.src.default ../settings/conf/$architecture.src cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src
ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../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="../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="../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="../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)"

30
scripts/upgrade
View file

@ -223,17 +223,17 @@ then
current_version=$(grep gitlab-ce /opt/gitlab/version-manifest.txt | cut -d' ' -f2) current_version=$(grep gitlab-ce /opt/gitlab/version-manifest.txt | cut -d' ' -f2)
# Load the last available version # Load the last available version
source ./upgrade.d/upgrade.last.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
last_version=$gitlab_version last_version=$gitlab_version
source_current_major_version () { source_current_major_version () {
if [ -e "./upgrade.d/upgrade.$current_major_version.first.sh" ]; then if [ -e "$YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.$current_major_version.first.sh" ]; then
source ./upgrade.d/upgrade.$current_major_version.first.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.$current_major_version.first.sh
elif [ -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then elif [ -e "$YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.$current_major_version.last.sh" ]; then
source ./upgrade.d/upgrade.$current_major_version.last.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.$current_major_version.last.sh
# Finish with the last migration if the file doesn't exist # Finish with the last migration if the file doesn't exist
else else
source ./upgrade.d/upgrade.last.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
fi fi
} }
@ -254,10 +254,10 @@ then
# to the current version, and if the version stored in the upgrade.$current_major_version.last.sh file # to the current version, and if the version stored in the upgrade.$current_major_version.last.sh file
# increment the major version to upgrade to the next version # increment the major version to upgrade to the next version
if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then
if [ -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then if [ -e "$YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.$current_major_version.last.sh" ]; then
source ./upgrade.d/upgrade.$current_major_version.last.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.$current_major_version.last.sh
else else
source ./upgrade.d/upgrade.last.sh source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh
fi fi
if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then
current_major_version=$(($current_major_version + 1)) current_major_version=$(($current_major_version + 1))
@ -265,11 +265,11 @@ then
fi fi
fi fi
cp ../conf/$architecture.src.default ../conf/$architecture.src cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src
ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../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="../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="../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="../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)"
@ -310,7 +310,7 @@ ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb"
mkdir -p $config_path mkdir -p $config_path
cp -f ../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" ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb"