From d62ba26215f79808c10d52a05b099908bc2e3a6e Mon Sep 17 00:00:00 2001
From: matthias <matthias@mitscherlich.nl>
Date: Sun, 31 May 2026 21:38:02 +0200
Subject: [PATCH] updated db script afte rdefault script

---
 jenkins/nextcloud_database.yml | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/jenkins/nextcloud_database.yml b/jenkins/nextcloud_database.yml
index 092b534..6ae9537 100644
--- a/jenkins/nextcloud_database.yml
+++ b/jenkins/nextcloud_database.yml
@@ -1,30 +1,21 @@
 pipeline {
     agent any
     parameters {
-        booleanParam(name: 'UseLocationPrefix', defaultValue:  params.backuplocally ?: true, description: 'Use the environmental backup location')
-        string(name: 'directory', defaultValue: params.directory ?: ' ', description: 'The directory that should be handled')
+        string(name: 'directory', defaultValue: params.directory ?: ' ', description: 'The directory that should be handled - either at the environmental location or fill in a custom absolute path')
+        string(name: 'name', defaultValue: params.name ?: ' ', description: 'The name of the job/repository that should be handled')
         string(name: 'agentname', defaultValue: params.agentname ?: 'julien', description: 'The agent to run this backup on')
     }
    environment {
         BORG_RELOCATED_REPO_ACCESS_IS_OK = 'yes'
-        backdirectory = "${directory}"
+        from_dir = "${directory}"
+        to_dir = "${env.borglocation}" + "/" + "${name}"
     }    
-    stages {        
-        stage('Run Preparation') {
-            steps {
-                script {
-                    if (params.UseLocationPrefix) {
-                         backdirectory = env.borglocation + "/" + "${directory}"
-                    }
-                }
-            }
-        }
-    
+    stages {           
         stage('Run MariaDB') {
             agent {
                 docker {
                     image 'mariadb:latest'
-                    args "-v '${backdirectory}':/data/ --entrypoint=''"
+                    args "-v '${from_dir}':/data/ --entrypoint=''"
                     reuseNode false
                 }
             }
@@ -39,9 +30,9 @@ pipeline {
             steps {
                 script {
                     withCredentials([string(credentialsId: 'cbce976a-0d98-4f35-8ea2-1f7818931bc3', variable: 'BORG_PASSPHRASE')]) {
-                      sh "borg create --progress --stats ${env.borglocation}/nextcloud_database::${java.time.LocalDateTime.now().format(java.time.format.DateTimeFormatter.ofPattern('dd-MM-yyyy_HH:mm'))} ${backdirectory}"
-                      sh "borg prune --list --keep-daily 31 --keep-weekly 48 ${env.borglocation}/nextcloud_database"
-                      sh "rm -rf ${backdirectory}"
+                      sh "borg create --progress --stats ${to_dir}::${java.time.LocalDateTime.now().format(java.time.format.DateTimeFormatter.ofPattern('dd-MM-yyyy_HH:mm'))} ${from_dir}"
+                      sh "borg prune --list --keep-daily 31 --keep-weekly 48 ${to_dir}"
+                      sh "rm -rf ${from_dir}"
                     }
                 }
             }