mirror of
https://github.com/YunoHost-Apps/gitlab_ynh.git
synced 2024-09-03 18:36:35 +02:00
Merge pull request #21 from YunoHost-Apps/testing
Format files, fix restore
This commit is contained in:
Kayou
GitHub
commit
151d6d43c4
9 changed files with 137 additions and 126 deletions
|
|
@ -7,7 +7,7 @@ gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block
|
|||
host: 'localhost'
|
||||
port: 389
|
||||
uid: 'uid'
|
||||
method: 'plain' # "tls" or "ssl" or "plain"
|
||||
encryption: 'plain' # "start_tls" or "simple_tls" or "plain"
|
||||
bind_dn: ''
|
||||
password: ''
|
||||
active_directory: false
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"nginx"
|
||||
],
|
||||
"arguments": {
|
||||
"install" : [
|
||||
"install": [
|
||||
{
|
||||
"name": "domain",
|
||||
"type": "domain",
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
},
|
||||
{
|
||||
"name": "admin",
|
||||
"type": "user",
|
||||
"type": "user",
|
||||
"ask": {
|
||||
"en": "Choose an admin user",
|
||||
"fr": "Choisissez l’administrateur"
|
||||
|
|
|
|||
|
|
@ -27,18 +27,20 @@ fi
|
|||
# CREATE FOLDERS
|
||||
#=================================================
|
||||
create_dir() {
|
||||
mkdir -p "$config_path"
|
||||
mkdir -p "$config_path"
|
||||
}
|
||||
|
||||
#=================================================
|
||||
# CONFIGURATION FILE FOR GITLAB
|
||||
#=================================================
|
||||
config_gitlab() {
|
||||
create_dir
|
||||
ynh_print_info "Configuring Gitlab..."
|
||||
|
||||
create_dir
|
||||
|
||||
gitlab_conf_path="$config_path/gitlab.rb"
|
||||
|
||||
ynh_backup_if_checksum_is_different $gitlab_conf_path
|
||||
ynh_backup_if_checksum_is_different $gitlab_conf_path
|
||||
|
||||
# Gitlab configuration
|
||||
cp -f ../conf/gitlab.rb $gitlab_conf_path
|
||||
|
|
@ -47,13 +49,15 @@ config_gitlab() {
|
|||
ynh_replace_string "__PORT__" "$port" $gitlab_conf_path
|
||||
ynh_replace_string "__PORTUNICORN__" "$portUnicorn" $gitlab_conf_path
|
||||
|
||||
ynh_store_file_checksum $gitlab_conf_path
|
||||
ynh_store_file_checksum $gitlab_conf_path
|
||||
}
|
||||
|
||||
#=================================================
|
||||
# REMOVE THE CONFIGURATION FILE FOR GITLAB
|
||||
#=================================================
|
||||
remove_config_gitlab() {
|
||||
ynh_print_info "Removing the configuration file..."
|
||||
|
||||
ynh_secure_remove "$config_path/gitlab.rb"
|
||||
}
|
||||
|
||||
|
|
@ -76,51 +80,52 @@ update_src_version() {
|
|||
#=================================================
|
||||
# This function is inspired by the ynh_setup_source function, adapted to deal with .deb files
|
||||
setup_source() {
|
||||
local src_id=${1:-app} # If the argument is not given, source_id equals "app"
|
||||
local src_id=${1:-app} # If the argument is not given, source_id equals "app"
|
||||
|
||||
update_src_version # Update source file
|
||||
update_src_version # Update source file
|
||||
|
||||
# Load value from configuration file (see above for a small doc about this file
|
||||
# format)
|
||||
local src_url=$(grep 'SOURCE_URL=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_sum=$(grep 'SOURCE_SUM=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_format=$(grep 'SOURCE_FORMAT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_extract=$(grep 'SOURCE_EXTRACT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
# Load value from configuration file (see above for a small doc about this file
|
||||
# format)
|
||||
local src_url=$(grep 'SOURCE_URL=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_sum=$(grep 'SOURCE_SUM=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_format=$(grep 'SOURCE_FORMAT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_extract=$(grep 'SOURCE_EXTRACT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
|
||||
|
||||
# Default value
|
||||
src_sumprg=${src_sumprg:-sha256sum}
|
||||
src_in_subdir=${src_in_subdir:-true}
|
||||
src_format=${src_format:-tar.gz}
|
||||
src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]')
|
||||
src_extract=${src_extract:-true}
|
||||
if [ "$src_filename" = "" ] ; then
|
||||
src_filename="${src_id}.${src_format}"
|
||||
fi
|
||||
local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}"
|
||||
# Default value
|
||||
src_sumprg=${src_sumprg:-sha256sum}
|
||||
src_in_subdir=${src_in_subdir:-true}
|
||||
src_format=${src_format:-tar.gz}
|
||||
src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]')
|
||||
src_extract=${src_extract:-true}
|
||||
if [ "$src_filename" = "" ]; then
|
||||
src_filename="${src_id}.${src_format}"
|
||||
fi
|
||||
local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}"
|
||||
|
||||
if test -e "$local_src"
|
||||
then # Use the local source file if it is present
|
||||
cp $local_src $src_filename
|
||||
else # If not, download the source
|
||||
local out=`wget -nv -O $src_filename $src_url 2>&1` || ynh_print_err $out
|
||||
fi
|
||||
ynh_print_info "Downloading Gitlab files..."
|
||||
|
||||
# Check the control sum
|
||||
echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \
|
||||
|| ynh_die "Corrupt source"
|
||||
if test -e "$local_src"; then # Use the local source file if it is present
|
||||
cp $local_src $src_filename
|
||||
else # If not, download the source
|
||||
wget -q --show-progress -O $src_filename $src_url
|
||||
fi
|
||||
|
||||
#Fix for the CI
|
||||
if sudo grep -qa container=lxc /proc/1/environ;
|
||||
then
|
||||
dpkg -i $src_filename || true # This command will fail in lxc env
|
||||
sed -i 's/command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"/command \"cat \/etc\/sysctl.conf\"/g' $final_path/embedded/cookbooks/package/resources/sysctl.rb
|
||||
dpkg --configure gitlab-ce || true
|
||||
else
|
||||
dpkg -i $src_filename || true
|
||||
fi;
|
||||
# Check the control sum
|
||||
echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status ||
|
||||
ynh_die "Corrupt source"
|
||||
|
||||
ynh_print_info "Installing Gitlab..."
|
||||
#Fix for the CI
|
||||
if sudo grep -qa container=lxc /proc/1/environ; then
|
||||
dpkg -i $src_filename || true # This command will fail in lxc env
|
||||
sed -i 's/command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"/command \"cat \/etc\/sysctl.conf\"/g' $final_path/embedded/cookbooks/package/resources/sysctl.rb
|
||||
dpkg --configure gitlab-ce || true
|
||||
else
|
||||
dpkg -i $src_filename || true
|
||||
fi
|
||||
}
|
||||
|
||||
#=================================================
|
||||
|
|
@ -129,42 +134,37 @@ setup_source() {
|
|||
# This function is inspired by the ynh_systemd_action function
|
||||
waiting_to_start() {
|
||||
|
||||
echo "Start Waiting"
|
||||
ynh_print_info "Waiting for a response from Gitlab..."
|
||||
|
||||
log_path="/var/log/gitlab/unicorn/current"
|
||||
log_path="/var/log/gitlab/unicorn/current"
|
||||
|
||||
if [ ! -f "$log_path" ]
|
||||
then
|
||||
return 0
|
||||
fi
|
||||
if [ ! -f "$log_path" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
line_match_new="adopted new unicorn master"
|
||||
line_match_existing="adopted existing unicorn master"
|
||||
line_match_new="adopted new unicorn master"
|
||||
line_match_existing="adopted existing unicorn master"
|
||||
|
||||
clean_check_starting() {
|
||||
# Stop the execution of tail
|
||||
kill -s 15 $pid_tail 2>&1
|
||||
ynh_secure_remove "$templog" 2>&1
|
||||
}
|
||||
clean_check_starting() {
|
||||
# Stop the execution of tail
|
||||
kill -s 15 $pid_tail 2>&1
|
||||
ynh_secure_remove "$templog" 2>&1
|
||||
}
|
||||
|
||||
# Following the starting of the app in its log
|
||||
local templog="$(mktemp)"
|
||||
tail -F -n1 "$log_path" > "$templog" &
|
||||
# get the PID of the tail command
|
||||
local pid_tail=$!
|
||||
# Following the starting of the app in its log
|
||||
local templog="$(mktemp)"
|
||||
tail -F -n1 "$log_path" >"$templog" &
|
||||
# get the PID of the tail command
|
||||
local pid_tail=$!
|
||||
|
||||
for i in $(seq 1 500)
|
||||
do
|
||||
if grep --quiet "${line_match_new}" $templog || grep --quiet "${line_match_existing}" $templog
|
||||
then
|
||||
echo "Gitlab has correctly started." >&2
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
echo -n "." >&2
|
||||
done
|
||||
for i in $(seq 1 500); do
|
||||
if grep --quiet "${line_match_new}" $templog || grep --quiet "${line_match_existing}" $templog; then
|
||||
echo "Gitlab has correctly started." >&2
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
echo -n "." >&2
|
||||
done
|
||||
|
||||
echo "Stop Waiting"
|
||||
|
||||
clean_check_starting
|
||||
clean_check_starting
|
||||
}
|
||||
|
|
@ -16,9 +16,9 @@ source ../settings/scripts/_common.sh
|
|||
# MANAGE SCRIPT FAILURE
|
||||
#=================================================
|
||||
|
||||
ynh_clean_setup () {
|
||||
ynh_clean_setup() {
|
||||
|
||||
rm /var/opt/gitlab/backups/*_gitlab_backup.tar
|
||||
rm /var/opt/gitlab/backups/*_gitlab_backup.tar
|
||||
true
|
||||
}
|
||||
|
||||
|
|
@ -44,6 +44,8 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
|
|||
# BACKUP GITLAB DATABASE
|
||||
#=================================================
|
||||
|
||||
ynh_print_info "Backuping of Gitlab..."
|
||||
|
||||
# Use gitlab-rake to backup
|
||||
gitlab-rake gitlab:backup:create
|
||||
|
||||
|
|
@ -53,5 +55,7 @@ ynh_backup "/var/opt/$app/backups/"
|
|||
# BACKUP CONF FILES
|
||||
#=================================================
|
||||
|
||||
ynh_print_info "Backuping configuration files of Gitlab..."
|
||||
|
||||
ynh_backup "$config_path/gitlab-secrets.json"
|
||||
ynh_backup "$config_path/gitlab.rb"
|
||||
|
|
|
|||
|
|
@ -51,14 +51,12 @@ path_url="$new_path"
|
|||
#=================================================
|
||||
|
||||
change_domain=0
|
||||
if [ "$old_domain" != "$new_domain" ]
|
||||
then
|
||||
if [ "$old_domain" != "$new_domain" ]; then
|
||||
change_domain=1
|
||||
fi
|
||||
|
||||
change_path=0
|
||||
if [ "$old_path" != "$new_path" ]
|
||||
then
|
||||
if [ "$old_path" != "$new_path" ]; then
|
||||
change_path=1
|
||||
fi
|
||||
|
||||
|
|
@ -73,14 +71,15 @@ fi
|
|||
# Gitlab configuration
|
||||
nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
|
||||
|
||||
if [ $change_path -eq 1 ]
|
||||
then
|
||||
sudo gitlab-ctl stop unicorn
|
||||
sudo gitlab-ctl stop sidekiq
|
||||
if [ $change_path -eq 1 ]; then
|
||||
ynh_print_info "Changing path..."
|
||||
|
||||
# Make a backup of the original nginx config file if modified
|
||||
sudo gitlab-ctl stop unicorn
|
||||
sudo gitlab-ctl stop sidekiq
|
||||
|
||||
# Make a backup of the original nginx config file if modified
|
||||
ynh_backup_if_checksum_is_different "$nginx_conf_path"
|
||||
# Set global variables for nginx helper
|
||||
# Set global variables for nginx helper
|
||||
domain="$old_domain"
|
||||
path_url="$new_path"
|
||||
# Create a dedicated nginx config
|
||||
|
|
@ -88,9 +87,10 @@ then
|
|||
fi
|
||||
|
||||
# Change the domain for nginx
|
||||
if [ $change_domain -eq 1 ]
|
||||
then
|
||||
# Delete file checksum for the old conf file location
|
||||
if [ $change_domain -eq 1 ]; then
|
||||
ynh_print_info "Changing domain..."
|
||||
|
||||
# Delete file checksum for the old conf file location
|
||||
ynh_delete_file_checksum "$nginx_conf_path"
|
||||
mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
|
||||
# Store file checksum for the new config file location
|
||||
|
|
@ -105,10 +105,9 @@ config_gitlab
|
|||
|
||||
sudo gitlab-ctl reconfigure
|
||||
|
||||
if [ $change_path -eq 1 ]
|
||||
then
|
||||
sudo gitlab-ctl restart
|
||||
sudo gitlab-ctl restart unicorn
|
||||
if [ $change_path -eq 1 ]; then
|
||||
sudo gitlab-ctl restart
|
||||
sudo gitlab-ctl restart unicorn
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ ynh_webpath_register $app $domain $path_url
|
|||
#=================================================
|
||||
|
||||
# Check user parameter
|
||||
ynh_user_exists "$admin" \
|
||||
|| ynh_die "The chosen admin user does not exist."
|
||||
ynh_user_exists "$admin" ||
|
||||
ynh_die "The chosen admin user does not exist."
|
||||
|
||||
#=================================================
|
||||
# STORE SETTINGS FROM MANIFEST
|
||||
|
|
@ -58,6 +58,8 @@ ynh_app_setting_set $app use_web_account $use_web_account
|
|||
# FIND AND OPEN PORTS
|
||||
#=================================================
|
||||
|
||||
ynh_print_info "Getting ports..."
|
||||
|
||||
# Find free ports
|
||||
port=$(ynh_find_port 8080)
|
||||
portUnicorn=$(ynh_find_port $(($port + 1)))
|
||||
|
|
@ -99,6 +101,8 @@ setup_source $architecture
|
|||
# GETTING ADMIN INFO AND ADD AS A GITLAB USER AND CONFIGURE SIGN IN SYSTEM
|
||||
#=================================================
|
||||
|
||||
ynh_print_info "Creating an administrator user..."
|
||||
|
||||
mailadmin=$(ynh_user_get_info $admin mail)
|
||||
rdmPass=$(ynh_string_random 30)
|
||||
|
||||
|
|
@ -107,7 +111,7 @@ newuser.admin = true
|
|||
newuser.confirmed_at = Time.now
|
||||
newuser.confirmation_token = nil
|
||||
newuser.save
|
||||
ApplicationSetting.last.update_attributes(password_authentication_enabled_for_web: $use_web_account, signup_enabled: $use_web_account)" | sudo gitlab-rails console
|
||||
ApplicationSetting.last.update_attributes(password_authentication_enabled_for_web: $use_web_account, signup_enabled: $use_web_account)" | sudo gitlab-rails console
|
||||
|
||||
#=================================================
|
||||
# RESTART TO TAKE INTO ACCOUNT CHANGES
|
||||
|
|
@ -121,8 +125,8 @@ sudo gitlab-ctl reconfigure
|
|||
|
||||
# If app is public, add url to SSOWat conf as skipped_uris
|
||||
if [[ $is_public -eq 1 ]]; then
|
||||
# unprotected_uris allows SSO credentials to be passed anyway.
|
||||
ynh_app_setting_set "$app" unprotected_uris "/"
|
||||
# unprotected_uris allows SSO credentials to be passed anyway.
|
||||
ynh_app_setting_set "$app" unprotected_uris "/"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -28,8 +28,10 @@ portUnicorn=$(ynh_app_setting_get "$app" unicorn_port)
|
|||
# REMOVE GITLAB
|
||||
#=================================================
|
||||
|
||||
ynh_print_info "Removing Gitlab..."
|
||||
|
||||
# Remove gitlab
|
||||
dpkg --remove gitlab-ce
|
||||
dpkg --remove gitlab-ce
|
||||
|
||||
#=================================================
|
||||
# REMOVE CONF GILE
|
||||
|
|
@ -59,14 +61,12 @@ ynh_secure_remove "/var/log/$app"
|
|||
# CLOSE PORTS
|
||||
#=================================================
|
||||
|
||||
if yunohost firewall list | grep -q "\- $port$"
|
||||
then
|
||||
if yunohost firewall list | grep -q "\- $port$"; then
|
||||
echo "Close port $port" >&2
|
||||
yunohost firewall disallow TCP $port 2>&1
|
||||
fi
|
||||
|
||||
if yunohost firewall list | grep -q "\- $portUnicorn$"
|
||||
then
|
||||
if yunohost firewall list | grep -q "\- $portUnicorn$"; then
|
||||
echo "Close port $portUnicorn" >&2
|
||||
yunohost firewall disallow TCP $portUnicorn 2>&1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ if [ ! -e _common.sh ]; then
|
|||
cp ../settings/scripts/_common.sh ./_common.sh
|
||||
mkdir ./upgrade.d
|
||||
mkdir ../conf
|
||||
cp ../settings/scripts/upgrade.d/*.sh ./upgrade.d/*.sh
|
||||
cp ../settings/scripts/upgrade.d/*.sh ./upgrade.d/
|
||||
cp ../settings/conf/*.default ../conf/
|
||||
chmod a+rx _common.sh upgrade.d/*.sh
|
||||
chmod a+rx _common.sh upgrade.d/*
|
||||
fi
|
||||
|
||||
# Load common variables and helpers
|
||||
|
|
@ -29,9 +29,9 @@ source _common.sh
|
|||
# MANAGE SCRIPT FAILURE
|
||||
#=================================================
|
||||
|
||||
ynh_clean_setup () {
|
||||
ynh_clean_setup() {
|
||||
|
||||
rm /var/opt/gitlab/backups/*_gitlab_backup.tar
|
||||
rm /var/opt/gitlab/backups/*_gitlab_backup.tar
|
||||
true
|
||||
}
|
||||
|
||||
|
|
@ -47,10 +47,10 @@ path_url=$(ynh_app_setting_get "$app" path_url)
|
|||
# CHECK IF THE APP CAN BE RESTORED
|
||||
#=================================================
|
||||
|
||||
ynh_webpath_available $domain $path_url \
|
||||
|| ynh_die "Path not available: ${domain}${path_url}"
|
||||
test ! -d $final_path \
|
||||
|| ynh_die "There is already a directory: $final_path "
|
||||
ynh_webpath_available $domain $path_url ||
|
||||
ynh_die "Path not available: ${domain}${path_url}"
|
||||
test ! -d $final_path ||
|
||||
ynh_die "There is already a directory: $final_path "
|
||||
|
||||
#=================================================
|
||||
# STANDARD RESTORATION STEPS
|
||||
|
|
@ -70,6 +70,8 @@ ynh_install_app_dependencies openssh-server
|
|||
# RESTORE CONF FILES
|
||||
#=================================================
|
||||
|
||||
ynh_print_info "Restoring configuration files of Gitlab..."
|
||||
|
||||
ynh_restore_file "$config_path/gitlab-secrets.json"
|
||||
ynh_restore_file "$config_path/gitlab.rb"
|
||||
|
||||
|
|
@ -87,6 +89,8 @@ ynh_restore_file "/var/opt/$app/backups/"
|
|||
# RESTORE GITLAB DATABASE
|
||||
#=================================================
|
||||
|
||||
ynh_print_info "Restoring Gitlab..."
|
||||
|
||||
fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1)
|
||||
basename="/var/opt/gitlab/backups/"
|
||||
filename=$(basename -- "$fullfile")
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ portUnicorn=$(ynh_app_setting_get "$app" unicorn_port)
|
|||
|
||||
# Backup the current version of the app
|
||||
ynh_backup_before_upgrade
|
||||
ynh_clean_setup () {
|
||||
ynh_clean_setup() {
|
||||
# restore it if the upgrade fails
|
||||
ynh_restore_upgradebackup
|
||||
}
|
||||
|
|
@ -84,8 +84,8 @@ setup_source $architecture
|
|||
|
||||
# If app is public, add url to SSOWat conf as skipped_uris
|
||||
if [[ $is_public -eq 1 ]]; then
|
||||
# See install script
|
||||
ynh_app_setting_set "$app" unprotected_uris "/"
|
||||
# See install script
|
||||
ynh_app_setting_set "$app" unprotected_uris "/"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue