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 #21 from YunoHost-Apps/testing

Browse source 
Format files, fix restore
This commit is contained in:
Kayou 2019-01-27 00:34:04 +01:00 • committed by GitHub
commit 151d6d43c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 137 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/gitlab.rb
View file

@ -7,7 +7,7 @@ gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block
host: 'localhost' host: 'localhost'
port: 389 port: 389
uid: 'uid' uid: 'uid'
method: 'plain' # "tls" or "ssl" or "plain" encryption: 'plain' # "start_tls" or "simple_tls" or "plain"
bind_dn: '' bind_dn: ''
password: '' password: ''
active_directory: false active_directory: false

6
manifest.json
View file

@ -22,7 +22,7 @@
"nginx" "nginx"
], ],
"arguments": { "arguments": {
"install" : [ "install": [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain",
@ -44,7 +44,7 @@
}, },
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user",
"ask": { "ask": {
"en": "Choose an admin user", "en": "Choose an admin user",
"fr": "Choisissez l’administrateur" "fr": "Choisissez l’administrateur"
@ -71,4 +71,4 @@
} }
] ]
} }
} }

150
scripts/_common.sh
View file

@ -27,18 +27,20 @@ fi
# CREATE FOLDERS # CREATE FOLDERS
#================================================= #=================================================
create_dir() { create_dir() {
mkdir -p "$config_path" mkdir -p "$config_path"
} }
#================================================= #=================================================
# CONFIGURATION FILE FOR GITLAB # CONFIGURATION FILE FOR GITLAB
#================================================= #=================================================
config_gitlab() { config_gitlab() {
create_dir ynh_print_info "Configuring Gitlab..."
create_dir
gitlab_conf_path="$config_path/gitlab.rb" 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 # Gitlab configuration
cp -f ../conf/gitlab.rb $gitlab_conf_path 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 "__PORT__" "$port" $gitlab_conf_path
ynh_replace_string "__PORTUNICORN__" "$portUnicorn" $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 THE CONFIGURATION FILE FOR GITLAB
#================================================= #=================================================
remove_config_gitlab() { remove_config_gitlab() {
ynh_print_info "Removing the configuration file..."
ynh_secure_remove "$config_path/gitlab.rb" 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 # This function is inspired by the ynh_setup_source function, adapted to deal with .deb files
setup_source() { 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 # Load value from configuration file (see above for a small doc about this file
# format) # format)
local src_url=$(grep 'SOURCE_URL=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) 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_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_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_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_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_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-) local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
# Default value # Default value
src_sumprg=${src_sumprg:-sha256sum} src_sumprg=${src_sumprg:-sha256sum}
src_in_subdir=${src_in_subdir:-true} src_in_subdir=${src_in_subdir:-true}
src_format=${src_format:-tar.gz} src_format=${src_format:-tar.gz}
src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]') src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]')
src_extract=${src_extract:-true} src_extract=${src_extract:-true}
if [ "$src_filename" = "" ] ; then if [ "$src_filename" = "" ]; then
src_filename="${src_id}.${src_format}" src_filename="${src_id}.${src_format}"
fi fi
local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}" local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}"
if test -e "$local_src" ynh_print_info "Downloading Gitlab files..."
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
# Check the control sum if test -e "$local_src"; then # Use the local source file if it is present
echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \ cp $local_src $src_filename
|| ynh_die "Corrupt source" else # If not, download the source
wget -q --show-progress -O $src_filename $src_url
fi
#Fix for the CI # Check the control sum
if sudo grep -qa container=lxc /proc/1/environ; echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status ||
then ynh_die "Corrupt source"
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 ynh_print_info "Installing Gitlab..."
dpkg --configure gitlab-ce || true #Fix for the CI
else if sudo grep -qa container=lxc /proc/1/environ; then
dpkg -i $src_filename || true dpkg -i $src_filename || true # This command will fail in lxc env
fi; 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 # This function is inspired by the ynh_systemd_action function
waiting_to_start() { 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" ] if [ ! -f "$log_path" ]; then
then return 0
return 0 fi
fi
line_match_new="adopted new unicorn master" line_match_new="adopted new unicorn master"
line_match_existing="adopted existing unicorn master" line_match_existing="adopted existing unicorn master"
clean_check_starting() { clean_check_starting() {
# Stop the execution of tail # Stop the execution of tail
kill -s 15 $pid_tail 2>&1 kill -s 15 $pid_tail 2>&1
ynh_secure_remove "$templog" 2>&1 ynh_secure_remove "$templog" 2>&1
} }
# Following the starting of the app in its log # Following the starting of the app in its log
local templog="$(mktemp)" local templog="$(mktemp)"
tail -F -n1 "$log_path" > "$templog" & tail -F -n1 "$log_path" >"$templog" &
# get the PID of the tail command # get the PID of the tail command
local pid_tail=$! local pid_tail=$!
for i in $(seq 1 500) for i in $(seq 1 500); do
do if grep --quiet "${line_match_new}" $templog || grep --quiet "${line_match_existing}" $templog; then
if grep --quiet "${line_match_new}" $templog || grep --quiet "${line_match_existing}" $templog echo "Gitlab has correctly started." >&2
then break
echo "Gitlab has correctly started." >&2 fi
break sleep 1
fi echo -n "." >&2
sleep 1 done
echo -n "." >&2
done
echo "Stop Waiting" clean_check_starting
}
clean_check_starting
}

10
scripts/backup
View file

@ -16,9 +16,9 @@ source ../settings/scripts/_common.sh
# MANAGE SCRIPT FAILURE # 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 true
} }
@ -44,6 +44,8 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
# BACKUP GITLAB DATABASE # BACKUP GITLAB DATABASE
#================================================= #=================================================
ynh_print_info "Backuping of Gitlab..."
# Use gitlab-rake to backup # Use gitlab-rake to backup
gitlab-rake gitlab:backup:create gitlab-rake gitlab:backup:create
@ -53,5 +55,7 @@ ynh_backup "/var/opt/$app/backups/"
# BACKUP CONF FILES # BACKUP CONF FILES
#================================================= #=================================================
ynh_print_info "Backuping configuration files of Gitlab..."
ynh_backup "$config_path/gitlab-secrets.json" ynh_backup "$config_path/gitlab-secrets.json"
ynh_backup "$config_path/gitlab.rb" ynh_backup "$config_path/gitlab.rb"

35
scripts/change_url
View file

@ -51,14 +51,12 @@ path_url="$new_path"
#================================================= #=================================================
change_domain=0 change_domain=0
if [ "$old_domain" != "$new_domain" ] if [ "$old_domain" != "$new_domain" ]; then
then
change_domain=1 change_domain=1
fi fi
change_path=0 change_path=0
if [ "$old_path" != "$new_path" ] if [ "$old_path" != "$new_path" ]; then
then
change_path=1 change_path=1
fi fi
@ -73,14 +71,15 @@ fi
# Gitlab configuration # Gitlab configuration
nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
if [ $change_path -eq 1 ] if [ $change_path -eq 1 ]; then
then ynh_print_info "Changing path..."
sudo gitlab-ctl stop unicorn
sudo gitlab-ctl stop sidekiq
# 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" ynh_backup_if_checksum_is_different "$nginx_conf_path"
# Set global variables for nginx helper # Set global variables for nginx helper
domain="$old_domain" domain="$old_domain"
path_url="$new_path" path_url="$new_path"
# Create a dedicated nginx config # Create a dedicated nginx config
@ -88,9 +87,10 @@ then
fi fi
# Change the domain for nginx # Change the domain for nginx
if [ $change_domain -eq 1 ] if [ $change_domain -eq 1 ]; then
then ynh_print_info "Changing domain..."
# Delete file checksum for the old conf file location
# Delete file checksum for the old conf file location
ynh_delete_file_checksum "$nginx_conf_path" ynh_delete_file_checksum "$nginx_conf_path"
mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
# Store file checksum for the new config file location # Store file checksum for the new config file location
@ -105,10 +105,9 @@ config_gitlab
sudo gitlab-ctl reconfigure sudo gitlab-ctl reconfigure
if [ $change_path -eq 1 ] if [ $change_path -eq 1 ]; then
then sudo gitlab-ctl restart
sudo gitlab-ctl restart sudo gitlab-ctl restart unicorn
sudo gitlab-ctl restart unicorn
fi fi
#================================================= #=================================================
@ -123,4 +122,4 @@ systemctl reload nginx
# WAIT # WAIT
#================================================= #=================================================
waiting_to_start waiting_to_start

16
scripts/install
View file

@ -40,8 +40,8 @@ ynh_webpath_register $app $domain $path_url
#================================================= #=================================================
# Check user parameter # Check user parameter
ynh_user_exists "$admin" \ ynh_user_exists "$admin" ||
|| ynh_die "The chosen admin user does not exist." ynh_die "The chosen admin user does not exist."
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
@ -58,6 +58,8 @@ ynh_app_setting_set $app use_web_account $use_web_account
# FIND AND OPEN PORTS # FIND AND OPEN PORTS
#================================================= #=================================================
ynh_print_info "Getting ports..."
# Find free ports # Find free ports
port=$(ynh_find_port 8080) port=$(ynh_find_port 8080)
portUnicorn=$(ynh_find_port $(($port + 1))) 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 # 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) mailadmin=$(ynh_user_get_info $admin mail)
rdmPass=$(ynh_string_random 30) rdmPass=$(ynh_string_random 30)
@ -107,7 +111,7 @@ newuser.admin = true
newuser.confirmed_at = Time.now newuser.confirmed_at = Time.now
newuser.confirmation_token = nil newuser.confirmation_token = nil
newuser.save 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 # 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 app is public, add url to SSOWat conf as skipped_uris
if [[ $is_public -eq 1 ]]; then if [[ $is_public -eq 1 ]]; then
# unprotected_uris allows SSO credentials to be passed anyway. # unprotected_uris allows SSO credentials to be passed anyway.
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"
fi fi
#================================================= #=================================================
@ -137,4 +141,4 @@ systemctl reload nginx
# WAIT # WAIT
#================================================= #=================================================
waiting_to_start waiting_to_start

12
scripts/remove
View file

@ -28,8 +28,10 @@ portUnicorn=$(ynh_app_setting_get "$app" unicorn_port)
# REMOVE GITLAB # REMOVE GITLAB
#================================================= #=================================================
ynh_print_info "Removing Gitlab..."
# Remove gitlab # Remove gitlab
dpkg --remove gitlab-ce dpkg --remove gitlab-ce
#================================================= #=================================================
# REMOVE CONF GILE # REMOVE CONF GILE
@ -59,14 +61,12 @@ ynh_secure_remove "/var/log/$app"
# CLOSE PORTS # CLOSE PORTS
#================================================= #=================================================
if yunohost firewall list | grep -q "\- $port$" if yunohost firewall list | grep -q "\- $port$"; then
then
echo "Close port $port" >&2 echo "Close port $port" >&2
yunohost firewall disallow TCP $port 2>&1 yunohost firewall disallow TCP $port 2>&1
fi fi
if yunohost firewall list | grep -q "\- $portUnicorn$" if yunohost firewall list | grep -q "\- $portUnicorn$"; then
then
echo "Close port $portUnicorn" >&2 echo "Close port $portUnicorn" >&2
yunohost firewall disallow TCP $portUnicorn 2>&1 yunohost firewall disallow TCP $portUnicorn 2>&1
fi fi
@ -81,4 +81,4 @@ ynh_remove_nginx_config
# REMOVE LOGROTATE CONFIGURATION # REMOVE LOGROTATE CONFIGURATION
#================================================= #=================================================
#ynh_remove_logrotate #ynh_remove_logrotate

24
scripts/restore
View file

@ -17,9 +17,9 @@ if [ ! -e _common.sh ]; then
cp ../settings/scripts/_common.sh ./_common.sh cp ../settings/scripts/_common.sh ./_common.sh
mkdir ./upgrade.d mkdir ./upgrade.d
mkdir ../conf mkdir ../conf
cp ../settings/scripts/upgrade.d/*.sh ./upgrade.d/*.sh cp ../settings/scripts/upgrade.d/*.sh ./upgrade.d/
cp ../settings/conf/*.default ../conf/ cp ../settings/conf/*.default ../conf/
chmod a+rx _common.sh upgrade.d/*.sh chmod a+rx _common.sh upgrade.d/*
fi fi
# Load common variables and helpers # Load common variables and helpers
@ -29,9 +29,9 @@ source _common.sh
# MANAGE SCRIPT FAILURE # 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 true
} }
@ -47,10 +47,10 @@ path_url=$(ynh_app_setting_get "$app" path_url)
# CHECK IF THE APP CAN BE RESTORED # CHECK IF THE APP CAN BE RESTORED
#================================================= #=================================================
ynh_webpath_available $domain $path_url \ ynh_webpath_available $domain $path_url ||
|| ynh_die "Path not available: ${domain}${path_url}" ynh_die "Path not available: ${domain}${path_url}"
test ! -d $final_path \ test ! -d $final_path ||
|| ynh_die "There is already a directory: $final_path " ynh_die "There is already a directory: $final_path "
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
@ -70,6 +70,8 @@ ynh_install_app_dependencies openssh-server
# RESTORE CONF FILES # 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-secrets.json"
ynh_restore_file "$config_path/gitlab.rb" ynh_restore_file "$config_path/gitlab.rb"
@ -87,6 +89,8 @@ ynh_restore_file "/var/opt/$app/backups/"
# RESTORE GITLAB DATABASE # RESTORE GITLAB DATABASE
#================================================= #=================================================
ynh_print_info "Restoring Gitlab..."
fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1)
basename="/var/opt/gitlab/backups/" basename="/var/opt/gitlab/backups/"
filename=$(basename -- "$fullfile") filename=$(basename -- "$fullfile")
@ -107,4 +111,4 @@ gitlab-rake gitlab:check SANITIZE=true
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================
systemctl reload nginx systemctl reload nginx

8
scripts/upgrade
View file

@ -32,7 +32,7 @@ portUnicorn=$(ynh_app_setting_get "$app" unicorn_port)
# Backup the current version of the app # Backup the current version of the app
ynh_backup_before_upgrade ynh_backup_before_upgrade
ynh_clean_setup () { ynh_clean_setup() {
# restore it if the upgrade fails # restore it if the upgrade fails
ynh_restore_upgradebackup ynh_restore_upgradebackup
} }
@ -84,8 +84,8 @@ setup_source $architecture
# If app is public, add url to SSOWat conf as skipped_uris # If app is public, add url to SSOWat conf as skipped_uris
if [[ $is_public -eq 1 ]]; then if [[ $is_public -eq 1 ]]; then
# See install script # See install script
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"
fi fi
#================================================= #=================================================
@ -99,4 +99,4 @@ systemctl reload nginx
# WAIT # WAIT
#================================================= #=================================================
waiting_to_start waiting_to_start