From deeeaacb088bb0d308143fcd5cdf67139599759a Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 29 May 2019 17:00:45 +0200 Subject: [PATCH 1/5] Improve backup process --- scripts/backup | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/backup b/scripts/backup index b205998..e25ab0b 100644 --- a/scripts/backup +++ b/scripts/backup @@ -47,11 +47,9 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Backuping of Gitlab..." --weight=9 # Use gitlab-rake to backup -gitlab-rake gitlab:backup:create > backup.log - -# Searching in backup logs the name of the backup archive created -last_backup=$(grep _gitlab_backup.tar backup.log | cut -d' ' -f4) -mv "/var/opt/$app/backups/$last_backup" "/var/opt/$app/backups/last_gitlab_backup.tar" +# 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 +gitlab-rake gitlab:backup:create BACKUP=last ynh_backup --src_path="/var/opt/$app/backups/last_gitlab_backup.tar" From 641275b0aa5fe5782407e58d9e126aad5d1b5128 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 2 Jun 2019 23:08:21 +0200 Subject: [PATCH 2/5] Update pull_request_template.md --- pull_request_template.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index fc579fa..67278ee 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,9 +13,9 @@ ## Validation --- -- [ ] **Code review** -- [ ] **Approval (LGTM)** -*Code review and approval have to be from a member of @YunoHost/apps group* +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* - **CI succeeded** : [![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/gitlab_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/gitlab_ynh%20PR-NUM-/) *Please replace '-NUM-' in this link by the PR number.* From 6d770dcdcd76de316a134e6b7ab60ce25fab87a5 Mon Sep 17 00:00:00 2001 From: Kayou Date: Mon, 3 Jun 2019 11:06:18 +0200 Subject: [PATCH 3/5] Restore: Add some link to the doc --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index d6acacf..707d3e4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -140,6 +140,7 @@ gitlab-ctl stop unicorn gitlab-ctl stop sidekiq # Use gitlab-rake to backup +# Doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html#restore-for-omnibus-gitlab-installations ynh_exec_warn_less gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup gitlab-rake gitlab:check SANITIZE=true From e07cef669078c11bdc5175839a2797887eaef490 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 4 Jun 2019 09:54:01 +0200 Subject: [PATCH 4/5] 11.11.1 (#59) Upgrade to 11.11.1 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 24c215f..8e6806f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc. -**Shipped version:** 11.11.0 +**Shipped version:** 11.11.1 ## Screenshots diff --git a/manifest.json b/manifest.json index 035695a..20e71b6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "11.11.0~ynh1", + "version": "11.11.1~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 554bd68..a69604b 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ -gitlab_version="11.11.0" +gitlab_version="11.11.1" -gitlab_x86_64_source_sha256="e15df41f1a9d40d23a710352ce1a77b30ebdd075dbc92430aa49dd6c3107f5c6" +gitlab_x86_64_source_sha256="b23af7ec2689e6eff69927e1176e8b009ed01b6b66df4ff80e9ab5da67e0684d" -gitlab_arm_source_sha256="03ce2b720e7266fb5ea6e00b3dc4f71b0c886c336db0669422ec332fe4df4447" +gitlab_arm_source_sha256="4847ae487dcbcb26cf60842cd016b66ccccc5a1e71778582d333010aa0daf7cf" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 8533d8c8e4fac1b0cb3b10fb77c99bc5ad4f3958 Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 5 Jun 2019 00:33:32 +0200 Subject: [PATCH 5/5] check after restart --- scripts/restore | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 707d3e4..d2f1aa9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -143,8 +143,6 @@ gitlab-ctl stop sidekiq # Doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html#restore-for-omnibus-gitlab-installations ynh_exec_warn_less gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup -gitlab-rake gitlab:check SANITIZE=true - #================================================= # GENERIC FINALIZATION #================================================= @@ -160,6 +158,12 @@ ynh_script_progression --message="Waiting for gitlab..." --weight=14 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600 +#================================================= +# CHECK THE RESTORED DATA +#================================================= + +gitlab-rake gitlab:check SANITIZE=true + #================================================= # RELOAD NGINX #=================================================