From 56a23e2e2b2d6646ebe02172c83047f467786b73 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Wed, 22 Feb 2023 15:52:26 +0100
Subject: [PATCH] update of assets from refresh script

---
 bash/workflow_nextcloud/README.md             |  6 ++++--
 bash/workflow_nextcloud/sync_spaceship.sh     |  4 ++--
 bash/workflow_nextcloud/workflow_variables.sh | 13 ++++++++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/bash/workflow_nextcloud/README.md b/bash/workflow_nextcloud/README.md
index 87afa5d3..e146b0d9 100644
--- a/bash/workflow_nextcloud/README.md
+++ b/bash/workflow_nextcloud/README.md
@@ -9,7 +9,9 @@ idéalement dans:
 ```
 
 # débuter
-Configrer les variables, puis ancer le script d'initialisation
+Configrer les variables, puis lancer le script d'initialisation
 ```bash
 bash ~/Nextcloud/ressources/workflow_nextcloud/init_workflow_tykayn.sh
-```
\ No newline at end of file
+```
+
+# TODO gestion des secrets automatiques pour les rsync
\ No newline at end of file
diff --git a/bash/workflow_nextcloud/sync_spaceship.sh b/bash/workflow_nextcloud/sync_spaceship.sh
index 9b7f0c1b..3ce3881d 100644
--- a/bash/workflow_nextcloud/sync_spaceship.sh
+++ b/bash/workflow_nextcloud/sync_spaceship.sh
@@ -52,8 +52,8 @@ dpkg --get-selections>~/list_of_debian_apt_packages.txt
 logDate 'copy of Nextcloud InstantUpload photos'
 
 mv ~/Nextcloud/InstantUpload/Camera/* "$ARCHIVE_SYNCABLE/photos/a dispatcher" | tee -a $LOG_FILE_BACKUP  2>&1
-mv ~/Nextcloud/inbox/instantUpload/* "$ARCHIVE_SYNCABLE/photos/$CURRENT_YEAR" | tee -a $LOG_FILE_BACKUP  2>&1
-mv ~/Nextcloud/inbox/instantUpload "$ARCHIVE_SYNCABLE/photos/$CURRENT_YEAR" | tee -a $LOG_FILE_BACKUP 2>&1
+mv ~/Nextcloud/inbox/instantUpload/* "$ARCHIVE_SYNCABLE/photos/a dispatcher" | tee -a $LOG_FILE_BACKUP  2>&1
+mv ~/Nextcloud/inbox/instantUpload "$ARCHIVE_SYNCABLE/photos/a dispatcher" | tee -a $LOG_FILE_BACKUP 2>&1
 echo ' ' >> $LOG_FILE_BACKUP_DATES
 echo "### ${today} medias in $ARCHIVE_SYNCABLE/photos/$CURRENT_YEAR" >> $LOG_FILE_BACKUP_DATES
 ls -l "$ARCHIVE_SYNCABLE/photos/$CURRENT_YEAR" | wc -l | tee -a $LOG_FILE_BACKUP  2>&1
diff --git a/bash/workflow_nextcloud/workflow_variables.sh b/bash/workflow_nextcloud/workflow_variables.sh
index fe7c4304..67010a44 100644
--- a/bash/workflow_nextcloud/workflow_variables.sh
+++ b/bash/workflow_nextcloud/workflow_variables.sh
@@ -5,6 +5,11 @@
 #
 #
 export main_user="tykayn"
+
+export main_archive_source_ssh_lan="tykayn@192.168.1.14"
+export backup_laptop_archive_path="/home/poule/backup/encrypted"
+
+
 export WORKFLOW_PATH=~/Nextcloud/ressources/workflow_nextcloud
 export WORKFLOW_PATH_ROOT=/home/$main_user/Nextcloud/ressources/workflow_nextcloud
 export ALIASES_PATH=$WORKFLOW_PATH/install/.bash_custom_aliases
@@ -29,4 +34,10 @@ export BORG_PASSCOMMAND="cat $ARCHIVE_SYNCABLE/.tk-borg-passphrase-light" # get
 export SPACESHIP_BORG_REPO="/home/poule/borg_archives/backup_land4to"
 export LOG_FILE_BACKUP="$ARCHIVE_SYNCABLE/www/backup/log_backup.log"
 # log dates of execution of the script
-export LOG_FILE_BACKUP_DATES="$ARCHIVE_SYNCABLE/www/backup/summary_log_backup.log"
\ No newline at end of file
+export LOG_FILE_BACKUP_DATES="$ARCHIVE_SYNCABLE/www/backup/summary_log_backup.log"
+
+export main_archive_source_sftop_spaceship="/mnt/spaceship_poule"
+export IP_DU_NAS="/mnt/spaceship_poule"
+
+# add custom workflow scripts
+export PATH=$WORKFLOW_PATH:$PATH
\ No newline at end of file