From f92200eb5c8e637dc05b4d0f31436fa93434df25 Mon Sep 17 00:00:00 2001 From: Yann Etrillard Date: Mon, 25 Sep 2023 14:40:00 +0200 Subject: [PATCH 1/2] Modification du chemin de sauvegarde --- gitlab-runner-java_backup.sh | 6 ++++-- gitlab_backup.sh | 35 +++++++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/gitlab-runner-java_backup.sh b/gitlab-runner-java_backup.sh index e44dcfe..de9ce17 100644 --- a/gitlab-runner-java_backup.sh +++ b/gitlab-runner-java_backup.sh @@ -4,7 +4,7 @@ echo "Démarrage du script de sauvegarde de gitlab-runner-java" # Nom du script : gitlab-runner-java-backup.sh # Auteur : S.IBN CHARRADA (QM HENIX) # Date de Création : 31/05/2023 -# Version : 0.0.1 +# Version : 0.0.2 # Descritpion : Script permettant la sauvegarde des données (configuration) de Gitlab # # Historique des mises à jour : @@ -13,6 +13,8 @@ echo "Démarrage du script de sauvegarde de gitlab-runner-java" #-----------+--------+-------------+------------------------------------------------------ # 0.0.1 | 31/05/23 | S.IBN CHARRADA | Initialisation du script #-----------+--------+-------------+------------------------------------------------------ +# 0.0.2 | 21/09/23 | Y.ETRILLARD | Modification de la casse du path +#-----------+--------+-------------+------------------------------------------------------ ############################################################################################### @@ -22,7 +24,7 @@ echo "Démarrage du script de sauvegarde de gitlab-runner-java" DATE=$(date +"%Y%m%d") # Dossier où sauvegarder les backups -BACKUP_DIR="/var/backup/GITLAB_RUNNER" +BACKUP_DIR="/var/BACKUP/GITLAB_RUNNER" # Commande NOMAD #NOMAD=/usr/local/bin/nomad diff --git a/gitlab_backup.sh b/gitlab_backup.sh index f0af9cb..1a2d07e 100644 --- a/gitlab_backup.sh +++ b/gitlab_backup.sh @@ -4,7 +4,7 @@ echo "Démarrage du script de sauvegarde de GitLab" # Nom du script : gitlab-backup.sh # Auteur : E.RIEGEL (QM HENIX) # Date de Création : 22/02/2023 -# Version : 1.0.0 +# Version : 0.0.3 # Descritpion : Script permettant la sauvegarde des données de Gitlab # # Historique des mises à jour : @@ -13,6 +13,10 @@ echo "Démarrage du script de sauvegarde de GitLab" #-----------+--------+-------------+------------------------------------------------------ # 0.0.1 | 22/02/23 | E.RIEGEL | Initialisation du script #-----------+--------+-------------+------------------------------------------------------ +# 0.0.2 | 06/03/23 | E.RIEGEL | Ajout de la sauvegarde de /etc/gitlab +#-----------+--------+-------------+------------------------------------------------------ +# 0.0.3 | 21/09/23 | Y.ETRILLARD | Modification de la casse du path +#-----------+--------+-------------+------------------------------------------------------ # ############################################################################################### @@ -28,11 +32,16 @@ BACKUP_DIR="/var/BACKUP/GITLAB" #NOMAD=/usr/local/bin/nomad NOMAD=$(which nomad) -#Repo PATH To BACKUP in the container -REPO_PATH=/var/opt +#Repo PATH To BACKUP DATA in the container +REPO_PATH_DATA=/var/opt #Archive Name of the backup repo directory BACKUP_REPO_FILENAME="BACKUP_DATA_GITLAB_${DATE}.tar.gz" +#Repo PATH To BACKUP DATA in the container +REPO_PATH_CONF=/etc +#Archive Name of the backup repo directory +BACKUP_CONF_FILENAME="BACKUP_CONF_GITLAB_${DATE}.tar.gz" + # Nombre de jours à garder les dossiers (seront effacés après X jours) RETENTION=3 @@ -45,17 +54,31 @@ mkdir -p $BACKUP_DIR/$DATE # Backup repos echo "Starting backup gitlab data..." -$NOMAD exec -job -task gitlab forge-gitlab tar -cOzv -C $REPO_PATH gitlab > $BACKUP_DIR/$DATE/$BACKUP_REPO_FILENAME +$NOMAD exec -job -task gitlab forge-gitlab tar -cOzv -C $REPO_PATH_DATA gitlab > $BACKUP_DIR/$DATE/$BACKUP_REPO_FILENAME BACKUP_RESULT=$? if [ $BACKUP_RESULT -gt 1 ] then - echo "Backup GitLab failed with error code : ${BACKUP_RESULT}" + echo "Backup GitLab Data failed with error code : ${BACKUP_RESULT}" exit 1 else - echo "Backup GitLab done" + echo "Backup GitLab Data done" +fi + +# Backup conf +echo "Starting backup gitlab conf..." + +$NOMAD exec -job -task gitlab forge-gitlab tar -cOzv -C $REPO_PATH_CONF gitlab > $BACKUP_DIR/$DATE/$BACKUP_CONF_FILENAME +BACKUP_RESULT=$? +if [ $BACKUP_RESULT -gt 1 ] +then + echo "Backup GitLab conf failed with error code : ${BACKUP_RESULT}" + exit 1 +else + echo "Backup GitLab Conf done" fi # Remove files older than X days find $BACKUP_DIR/* -mtime +$RETENTION -exec rm -rf {} \; echo "Backup Gitlab finished" + From e73f09ea0bfbffcbe7ebfd7c6cf86cc6457b6431 Mon Sep 17 00:00:00 2001 From: Yann Etrillard Date: Tue, 26 Sep 2023 17:28:08 +0200 Subject: [PATCH 2/2] Modification de la casse du chemin de sauvegarde --- gitlab-runner-java_backup.sh | 5 ++--- gitlab_backup.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gitlab-runner-java_backup.sh b/gitlab-runner-java_backup.sh index de9ce17..ae53360 100644 --- a/gitlab-runner-java_backup.sh +++ b/gitlab-runner-java_backup.sh @@ -24,7 +24,7 @@ echo "Démarrage du script de sauvegarde de gitlab-runner-java" DATE=$(date +"%Y%m%d") # Dossier où sauvegarder les backups -BACKUP_DIR="/var/BACKUP/GITLAB_RUNNER" +BACKUP_DIR="/var/backup/GITLAB_RUNNER" # Commande NOMAD #NOMAD=/usr/local/bin/nomad @@ -60,5 +60,4 @@ fi # Remove files older than X days find $BACKUP_DIR/* -mtime +$RETENTION -exec rm -rf {} \; -echo "GITLAB_RUNNER finished" - +echo "GITLAB_RUNNER finished" \ No newline at end of file diff --git a/gitlab_backup.sh b/gitlab_backup.sh index 1a2d07e..4a78879 100644 --- a/gitlab_backup.sh +++ b/gitlab_backup.sh @@ -26,7 +26,7 @@ echo "Démarrage du script de sauvegarde de GitLab" DATE=$(date +"%Y%m%d") # Dossier où sauvegarder les backups -BACKUP_DIR="/var/BACKUP/GITLAB" +BACKUP_DIR="/var/backup/GITLAB" # Commande NOMAD #NOMAD=/usr/local/bin/nomad