From 7b12c7e86c6e028ff91eda41e866af668acc88b6 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 27 Oct 2019 18:02:10 +0900 Subject: [PATCH 1/2] remove backup strategy --- scripts/backup | 37 +------------------------------- scripts/config | 58 -------------------------------------------------- 2 files changed, 1 insertion(+), 94 deletions(-) diff --git a/scripts/backup b/scripts/backup index 770025f..b1f6538 100644 --- a/scripts/backup +++ b/scripts/backup @@ -55,45 +55,10 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_script_progression --message="Backuping of Gitlab..." --weight=9 -to_skip="" - -if [ $backup_db -eq 0 ]; then - to_skip="db,"$to_skip -fi - -if [ $backup_uploads -eq 0 ]; then - to_skip="uploads,"$to_skip -fi - -if [ $backup_repositories -eq 0 ]; then - to_skip="repositories,"$to_skip -fi - -if [ $backup_builds -eq 0 ]; then - to_skip="builds,"$to_skip -fi - -if [ $backup_artifacts -eq 0 ]; then - to_skip="artifacts,"$to_skip -fi - -if [ $backup_lfs -eq 0 ]; then - to_skip="lfs,"$to_skip -fi - -if [ $backup_registry -eq 0 ]; then - to_skip="registry,"$to_skip -fi - -if [ $backup_pages -eq 0 ]; then - to_skip="pages,"$to_skip -fi - # Use gitlab-rake to backup # For the complete doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html # For the filename: https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-filename -# For the backup strategy: https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup -gitlab-backup create BACKUP=last SKIP=$to_skip +gitlab-backup create BACKUP=last ynh_backup --src_path="/var/opt/$app/backups/last_gitlab_backup.tar" diff --git a/scripts/config b/scripts/config index efaa386..3c927b5 100644 --- a/scripts/config +++ b/scripts/config @@ -37,31 +37,6 @@ overwrite_nginx="${YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_NGINX:-$old_overwri old_use_web_account="$(ynh_app_setting_get --app=$app --key=use_web_account)" use_web_account="${YNH_CONFIG_MAIN_USERS_USE_WEB_ACCOUNT:-$old_use_web_account}" -# backup_strategy -old_backup_db="$(ynh_app_setting_get --app=$app --key=backup_db)" -backup_db="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_DB:-$old_backup_db}" - -old_backup_uploads="$(ynh_app_setting_get --app=$app --key=backup_uploads)" -backup_uploads="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_UPLOADS:-$old_backup_uploads}" - -old_backup_repositories="$(ynh_app_setting_get --app=$app --key=backup_repositories)" -backup_repositories="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REPOSITORIES:-$old_backup_repositories}" - -old_backup_builds="$(ynh_app_setting_get --app=$app --key=backup_builds)" -backup_builds="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_BUILDS:-$old_backup_builds}" - -old_backup_artifacts="$(ynh_app_setting_get --app=$app --key=backup_artifacts)" -backup_artifacts="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_ARTIFACTS:-$old_backup_artifacts}" - -old_backup_lfs="$(ynh_app_setting_get --app=$app --key=backup_lfs)" -backup_lfs="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_LFS:-$old_backup_lfs}" - -old_backup_registry="$(ynh_app_setting_get --app=$app --key=backup_registry)" -backup_registry="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REGISTRY:-$old_backup_registry}" - -old_backup_pages="$(ynh_app_setting_get --app=$app --key=backup_pages)" -backup_pages="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_PAGES:-$old_backup_pages}" - #================================================= # SHOW_CONFIG FUNCTION FOR 'SHOW' COMMAND #================================================= @@ -75,22 +50,6 @@ show_config() { ynh_return "YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_NGINX=$overwrite_nginx" ynh_return "YNH_CONFIG_MAIN_USERS_USE_WEB_ACCOUNT=$use_web_account" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_DB=$backup_db" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_UPLOADS=$backup_uploads" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REPOSITORIES=$backup_repositories" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_BUILDS=$backup_builds" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_ARTIFACTS=$backup_artifacts" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_LFS=$backup_lfs" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REGISTRY=$backup_registry" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_PAGES=$backup_pages" } #================================================= @@ -106,23 +65,6 @@ apply_config() { # Set overwrite_nginx ynh_app_setting_set --app=$app --key=overwrite_nginx --value="$overwrite_nginx" - - # Set backup_db - ynh_app_setting_set --app=$app --key=backup_db --value="$backup_db" - # Set backup_uploads - ynh_app_setting_set --app=$app --key=backup_uploads --value="$backup_uploads" - # Set backup_repositories - ynh_app_setting_set --app=$app --key=backup_repositories --value="$backup_repositories" - # Set backup_builds - ynh_app_setting_set --app=$app --key=backup_builds --value="$backup_builds" - # Set backup_artifacts - ynh_app_setting_set --app=$app --key=backup_artifacts --value="$backup_artifacts" - # Set backup_lfs - ynh_app_setting_set --app=$app --key=backup_lfs --value="$backup_lfs" - # Set backup_registry - ynh_app_setting_set --app=$app --key=backup_registry --value="$backup_registry" - # Set backup_pages - ynh_app_setting_set --app=$app --key=backup_pages --value="$backup_pages" } #================================================= From d7309caaa53aecb33ade03fa584e91b56e51d48d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 6 Nov 2019 21:48:59 +0900 Subject: [PATCH 2/2] remove remaining code of backup strategy --- config_panel.json | 79 ----------------------------------------------- scripts/backup | 9 ------ scripts/install | 14 --------- scripts/upgrade | 42 ------------------------- 4 files changed, 144 deletions(-) diff --git a/config_panel.json b/config_panel.json index 965a554..e6d4d84 100644 --- a/config_panel.json +++ b/config_panel.json @@ -49,85 +49,6 @@ "default": true } ] - }, - { - "name": "Backup strategy", - "id": "backup_strategy", - "help": "WARNING: If you disable one of these backup, it will not be restored in case of error, use this feature at your own risk", - "options": [ - { - "name": "backup_db", - "ask": { - "en": "Should gitlab backup the database ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_uploads", - "ask": { - "en": "Should gitlab backup attachments ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_repositories", - "ask": { - "en": "Should gitlab backup git repositories data ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_builds", - "ask": { - "en": "Should gitlab backup CI job output logs ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_artifacts", - "ask": { - "en": "Should gitlab backup CI job artifacts ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_lfs", - "ask": { - "en": "Should gitlab backup LFS objects ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_registry", - "ask": { - "en": "Should gitlab backup container registry images ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_pages", - "ask": { - "en": "Should gitlab backup pages content ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - } - ] } ] } diff --git a/scripts/backup b/scripts/backup index b1f6538..895d95e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,15 +32,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) domain=$(ynh_app_setting_get --app=$app --key=domain) -backup_db=$(ynh_app_setting_get --app="$app" --key=backup_db) -backup_uploads=$(ynh_app_setting_get --app="$app" --key=backup_uploads) -backup_repositories=$(ynh_app_setting_get --app="$app" --key=backup_repositories) -backup_builds=$(ynh_app_setting_get --app="$app" --key=backup_builds) -backup_artifacts=$(ynh_app_setting_get --app="$app" --key=backup_artifacts) -backup_lfs=$(ynh_app_setting_get --app="$app" --key=backup_lfs) -backup_registry=$(ynh_app_setting_get --app="$app" --key=backup_registry) -backup_pages=$(ynh_app_setting_get --app="$app" --key=backup_pages) - #================================================= # STANDARD BACKUP STEPS #================================================= diff --git a/scripts/install b/scripts/install index 52657de..a4257ea 100644 --- a/scripts/install +++ b/scripts/install @@ -221,20 +221,6 @@ newuser.confirmation_token = nil newuser.save ApplicationSetting.last.update_attributes(password_authentication_enabled_for_web: $use_web_account, signup_enabled: $use_web_account)" | gitlab-rails console - -#================================================= -# DEFINE THE BACKUP STRATEGY: https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup -#================================================= - -ynh_app_setting_set --app=$app --key=backup_db --value=1 -ynh_app_setting_set --app=$app --key=backup_uploads --value=1 -ynh_app_setting_set --app=$app --key=backup_repositories --value=1 -ynh_app_setting_set --app=$app --key=backup_builds --value=1 -ynh_app_setting_set --app=$app --key=backup_artifacts --value=1 -ynh_app_setting_set --app=$app --key=backup_lfs --value=1 -ynh_app_setting_set --app=$app --key=backup_registry --value=1 -ynh_app_setting_set --app=$app --key=backup_pages --value=1 - #================================================= # RECONFIGURE TO TAKE INTO ACCOUNT CHANGES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index eb0fe70..3f95394 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,15 +33,6 @@ unicorn_worker_processes=$(ynh_app_setting_get --app="$app" --key=unicorn_worker client_max_body_size=$(ynh_app_setting_get --app="$app" --key=client_max_body_size) overwrite_nginx=$(ynh_app_setting_get --app="$app" --key=overwrite_nginx) -backup_db=$(ynh_app_setting_get --app="$app" --key=backup_db) -backup_uploads=$(ynh_app_setting_get --app="$app" --key=backup_uploads) -backup_repositories=$(ynh_app_setting_get --app="$app" --key=backup_repositories) -backup_builds=$(ynh_app_setting_get --app="$app" --key=backup_builds) -backup_artifacts=$(ynh_app_setting_get --app="$app" --key=backup_artifacts) -backup_lfs=$(ynh_app_setting_get --app="$app" --key=backup_lfs) -backup_registry=$(ynh_app_setting_get --app="$app" --key=backup_registry) -backup_pages=$(ynh_app_setting_get --app="$app" --key=backup_pages) - #================================================= # CHECK VERSION #================================================= @@ -155,39 +146,6 @@ if [ -e "/etc/apt/sources.list.d/gitlab-ce.list" ]; then ynh_secure_remove --file="/etc/apt/sources.list.d/gitlab-ce.list" fi -# Define the backup strategy: https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup -if [ -z "$backup_db" ]; then - ynh_app_setting_set --app=$app --key=backup_db --value=1 -fi - -if [ -z "$backup_uploads" ]; then - ynh_app_setting_set --app=$app --key=backup_uploads --value=1 -fi - -if [ -z "$backup_repositories" ]; then - ynh_app_setting_set --app=$app --key=backup_repositories --value=1 -fi - -if [ -z "$backup_builds" ]; then - ynh_app_setting_set --app=$app --key=backup_builds --value=1 -fi - -if [ -z "$backup_artifacts" ]; then - ynh_app_setting_set --app=$app --key=backup_artifacts --value=1 -fi - -if [ -z "$backup_lfs" ]; then - ynh_app_setting_set --app=$app --key=backup_lfs --value=1 -fi - -if [ -z "$backup_registry" ]; then - ynh_app_setting_set --app=$app --key=backup_registry --value=1 -fi - -if [ -z "$backup_pages" ]; then - ynh_app_setting_set --app=$app --key=backup_pages --value=1 -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #=================================================