From 84c4fdf8d5b02b0c1f80257ee0abdd89429a36b2 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Sun, 15 Oct 2023 21:35:33 +0200 Subject: [PATCH] update of assets from refresh script --- assets/org/config.org | 388 +++++++++--------- assets/org/update_calendar.sh | 2 +- bash/workflow_nextcloud/cronjob_nextcloud.sh | 4 +- .../init_workflow_nextcloud.sh | 17 +- .../refresh_from_current_assets.sh | 2 +- bash/workflow_nextcloud/sync_spaceship.sh | 32 +- bash/workflow_nextcloud/update_calendar.sh | 2 +- .../workflow_nextcloud/update_git_projects.sh | 4 +- bash/workflow_nextcloud/workflow_variables.sh | 6 +- 9 files changed, 220 insertions(+), 237 deletions(-) diff --git a/assets/org/config.org b/assets/org/config.org index ba06ff11..58457f28 100755 --- a/assets/org/config.org +++ b/assets/org/config.org @@ -254,171 +254,177 @@ Présentation personnalisée d'agenda, "custom views". #+begin_src emacs-lisp - ;; Custom agenda command definitions -------------------------- - ;; https://orgmode.org/worg/org-tutorials/org-custom-agenda-commands.html + ;; Custom agenda command definitions -------------------------- + ;; https://orgmode.org/worg/org-tutorials/org-custom-agenda-commands.html - (use-package org-super-agenda) - (use-package org-ql) - (bind-key " a" 'org-agenda) - (setq org-return-follows-link t) - (setq org-cycle-include-plain-lists 'integrate) - (defun my-org-agenda-skip-scheduled () - (org-agenda-skip-entry-if 'scheduled 'deadline 'regexp "\n]+>")) + (use-package org-super-agenda) + (use-package org-ql) + (bind-key " a" 'org-agenda) + (setq org-return-follows-link t) + (setq org-cycle-include-plain-lists 'integrate) + (defun my-org-agenda-skip-scheduled () + (org-agenda-skip-entry-if 'scheduled 'deadline 'regexp "\n]+>")) - (setq org-agenda-prefix-format - '((agenda . " %i %-12:c%?-12t% s") - (todo . " ") - (tags . " %i %-12:c") - (search . " %i %-12:c"))) + (setq org-agenda-prefix-format + '((agenda . " %i %-12:c%?-12t% s") + (todo . " ") + (tags . " %i %-12:c") + (search . " %i %-12:c"))) - (setq org-agenda-custom-commands - (quote ( - ;; ("s" "Super Agenda" agenda "FIXXME: does work but w/o super-agenda" - ;; (org-super-agenda-mode) - ;; (org-agenda nil "a")) + (setq org-agenda-custom-commands + (quote + ( + ("c" "Classique Agenda et Todos" + ((agenda "" ((org-agenda-span 2))) + (agenda "" ( + (org-agenda-overriding-header + " ------------ tâches inbox ------------" + ) + (tags-todo "+inbox") + ) + ) + (alltodo + "" + ((org-agenda-overriding-header "") + (org-super-agenda-groups + '( + (:name "Important, unscheduled" + :and (:priority "A" + :scheduled nil) + :order 2) - ("c" "Classique Agenda et Todos" - ((agenda "" ((org-agenda-span 2))) - (alltodo - "" - ((org-agenda-overriding-header "") - (org-super-agenda-groups - '((:name "Important, unscheduled" - :and (:priority "A" - :scheduled nil) - :order 2) - (:name "Inbox" - :file-path "Inbox.org" - :order 1) - (:name "Project-related, unscheduled" - :and (:tag "project" :date nil :todo ("STARTED" "WAITING" "TODO")) - :order 3) - (:name "Waiting" - :and (:todo "WAITING" - :scheduled nil) - :order 4) - (:discard (:todo "SOMEDAY" - :category "cooking" - :date t)) - (:name "Unscheduled" - :scheduled nil - :order 5) - (:discard (:anything t)) - ) - ))) - )) - ("x" "Unscheduled, untagged tasks" tags-todo "-someday-TODO=\"SOMEDAY\"-TODO=\"DELEGATED\"-TODO=\"WAITING\"-project-cooking-routine-evilplans-computer-writing-phone-sewing-home-errands-shopping" - ((org-agenda-skip-function 'my-org-agenda-skip-scheduled) - (org-agenda-view-columns-initially nil) -;; (org-tags-exclude-from-inheritance '("project")) - (org-agenda-overriding-header "Tâches TODO sans schedule: ") - (org-columns-default-format "%50ITEM %TODO %3PRIORITY %Effort{:} %TAGS") - (org-agenda-sorting-strategy '(todo-state-up priority-down effort-up tag-up category-keep)))) + ( + :name "Inbox" + :file-path "incoming_inbox.org" + :order 1) + (:name "Project-related, unscheduled" + :and (:tag "project" :date nil :todo ("STARTED" "WAITING" "TODO")) + :order 3) + (:name "Waiting" + :and (:todo "WAITING" + :scheduled nil) + :order 4) + (:discard (:todo "SOMEDAY" + :category "cooking" + :date t)) + (:name "Unscheduled" + :scheduled nil + :order 5) + (:discard (:anything t)) + ) + ))) + )) + ("x" "Unscheduled, untagged tasks" tags-todo "-someday-TODO=\"SOMEDAY\"-TODO=\"DELEGATED\"-TODO=\"WAITING\"-project-cooking-routine-evilplans-computer-writing-phone-sewing-home-errands-shopping" + ((org-agenda-skip-function 'my-org-agenda-skip-scheduled) + (org-agenda-view-columns-initially nil) + (org-agenda-overriding-header "Tâches TODO sans schedule: ") + (org-columns-default-format "%50ITEM %TODO %3PRIORITY %Effort{:} %TAGS") + (org-agenda-sorting-strategy '(todo-state-up priority-down effort-up tag-up category-keep)))) - ("b" "Boulot" tags-todo "+boulot") - ("c" "Cancelled" tags-todo "+TODO=\"CANCELLED\"") - ("D" "Done tasks" tags-todo "DONE") - ("i" "Inbox to sort" tags "+inbox") - ("g". "GTD Searches") ;; category searches - ("gd" "Daily" - agenda "" ( - (org-agenda-overriding-header "\n-------------- Agenda du jour ------------------\n") - ;; (org-agenda-todo-keyword-format "[ ]") - (org-agenda-span 1) - (tags-todo "+PRIORITY=\"A\"") - ) - ;; montrer aussi ce qui est dans l'inbox pour le trier - (tags-todo "+inbox") - ) - ("gw" "Weekly review" - agenda "" ( - (org-agenda-overriding-header "\n-------------- Revue hebdomadaire\n------------------\n") - (org-agenda-start-day "-7d") - (org-agenda-span 7) - (org-agenda-start-on-weekday 1) - (org-agenda-start-with-log-mode '(closed)) - (org-agenda-archives-mode t) - (org-agenda-todo-keyword-format "[X]") - (org-agenda-skip-function - '(org-agenda-skip-entry-if 'notregexp "^\\*\\* DONE ") - ) - ) - ) - ("g2" "Bi-weekly review" agenda "" ((org-agenda-span 14) (org-agenda-log-mode 1))) - ("0" "Unestimated tasks" tags-todo "EFFORT=\"\"") - ("5" "Quick tasks" tags-todo "EFFORT>=\"5\"&EFFORT<=\"15\"") - ("8" "Medium tasks" tags-todo "EFFORT>=\"15\"&EFFORT<=\"60\"") - ("9" "Unscheduled top 3 by context" my-org-agenda-contexts - ((org-agenda-skip-function 'my-org-agenda-skip-scheduled) - (org-agenda-sorting-strategy '(priority-down effort-down)) - (org-agenda-max-entries 3))) - ("p" "By priority" - ( - (tags-todo "+PRIORITY=\"A\"") - (tags-todo "+PRIORITY=\"B\"") - (tags-todo "+PRIORITY=\"\"") - (tags-todo "+PRIORITY=\"C\"") - ) + ("b" "Boulot" tags-todo "+boulot") + ("c" "Cancelled" tags-todo "+TODO=\"CANCELLED\"") + ("D" "Done tasks" tags-todo "DONE") + ("i" "Inbox to sort" tags "+inbox") + ("g". "GTD Searches") ;; category searches + ("gd" "Daily" + agenda "" ( + (org-agenda-overriding-header "\n-------------- Agenda du jour ------------------\n") - ((org-agenda-prefix-format "%-10c %-10T %e ") - (org-agenda-sorting-strategy '(priority-down tag-up category-keep effort-down)))) - ("P" "Printed paper agenda" - ( - (agenda "" ( - (org-agenda-span 7) ;; overview of appointments - (org-agenda-start-on-weekday nil) ;; calendar begins today - (org-agenda-repeating-timestamp-show-all t) - (org-agenda-entry-types '(:timestamp :sexp)) - ) - ) - (agenda "" ( - (org-agenda-span 1) ; daily agenda - (org-deadline-warning-days 7) ; 7 day advanced warning for deadlines - (org-agenda-todo-keyword-format "[ ]") - (org-agenda-scheduled-leaders '("" "")) - (org-agenda-prefix-format "%t%s") - ) - ) - (todo "TODO" ;; todos sorted by context - ( - (org-agenda-prefix-format "[ ] %T: ") - (org-agenda-sorting-strategy '(tag-up priority-down)) - (org-agenda-todo-keyword-format "") - (org-agenda-overriding-header "\nTasks by Context\n------------------\n") - ) - ) - ) - ((org-agenda-with-colors nil) - (org-agenda-compact-blocks t) - (org-agenda-remove-tags t) - (ps-number-of-columns 2) - (ps-landscape-mode t)) - ("~/agenda.ps")) + (org-agenda-span 1) + (tags-todo "+PRIORITY=\"A\"") + ) + ;; montrer aussi ce qui est dans l'inbox pour le trier + (tags-todo "+inbox") + ) + ("gw" "Weekly review" + agenda "" ( + (org-agenda-overriding-header "\n-------------- Revue hebdomadaire\n------------------\n") + (org-agenda-start-day "-7d") + (org-agenda-span 7) + (org-agenda-start-on-weekday 1) + (org-agenda-start-with-log-mode '(closed)) + (org-agenda-archives-mode t) + (org-agenda-todo-keyword-format "[X]") + (org-agenda-skip-function + '(org-agenda-skip-entry-if 'notregexp "^\\*\\* DONE ") + ) + ) + ) + ("g2" "Bi-weekly review" agenda "" ((org-agenda-span 14) (org-agenda-log-mode 1))) + ("0" "Unestimated tasks" tags-todo "EFFORT=\"\"") + ("5" "Quick tasks" tags-todo "EFFORT>=\"5\"&EFFORT<=\"15\"") + ("8" "Medium tasks" tags-todo "EFFORT>=\"15\"&EFFORT<=\"60\"") + ("9" "Unscheduled top 3 by context" my-org-agenda-contexts + ((org-agenda-skip-function 'my-org-agenda-skip-scheduled) + (org-agenda-sorting-strategy '(priority-down effort-down)) + (org-agenda-max-entries 3))) + ("p" "By priority" + ( + (tags-todo "+PRIORITY=\"A\"") + (tags-todo "+PRIORITY=\"B\"") + (tags-todo "+PRIORITY=\"\"") + (tags-todo "+PRIORITY=\"C\"") + ) - ("f". "Filter Searches") ;; category searches - ("fc" tags "+claire") - ("fh" tags "+helia") - ("fv" tags "+vovo") - ("fs" tags "+social") + ((org-agenda-prefix-format "%-10c %-10T %e ") + (org-agenda-sorting-strategy '(priority-down tag-up category-keep effort-down)))) + ("P" "Printed paper agenda" + ( + (agenda "" ( + (org-agenda-span 7) ;; overview of appointments + (org-agenda-start-on-weekday nil) ;; calendar begins today + (org-agenda-repeating-timestamp-show-all t) + (org-agenda-entry-types '(:timestamp :sexp)) + ) + ) + (agenda "" ( + (org-agenda-span 1) ; daily agenda + (org-deadline-warning-days 7) ; 7 day advanced warning for deadlines + (org-agenda-todo-keyword-format "[ ]") + (org-agenda-scheduled-leaders '("" "")) + (org-agenda-prefix-format "%t%s") + ) + ) + (todo "TODO" ;; todos sorted by context + ( + (org-agenda-prefix-format "[ ] %T: ") + (org-agenda-sorting-strategy '(tag-up priority-down)) + (org-agenda-todo-keyword-format "") + (org-agenda-overriding-header "\nTasks by Context\n------------------\n") + ) + ) + ) + ((org-agenda-with-colors nil) + (org-agenda-compact-blocks t) + (org-agenda-remove-tags t) + (ps-number-of-columns 2) + (ps-landscape-mode t)) + ("~/agenda.ps")) - ("n" "Non boulot" tags-todo "-boulot+TODO=TODO" - (todo "TODO" - ((org-agenda-prefix-format "[ ] %T: ") - (org-agenda-overriding-header "Tâches pour le fun") - (org-agenda-sorting-strategy - '(todo-state-down effort-up category-keep) - )) - ) - ) - ("h" "Habits" tags-todo "STYLE=\"habit\"" - ((org-agenda-overriding-header "Habitudes") - (org-agenda-todo-keyword-format "[ ]") - (org-agenda-sorting-strategy - '(todo-state-down effort-up category-keep))) - ) - ) - ) - ) + ("f". "Filter Searches") ;; category searches + ("fc" tags "+claire") + ("fh" tags "+helia") + ("fv" tags "+vovo") + ("fs" tags "+social") + + ("n" "Non boulot" tags-todo "-boulot+TODO=TODO" + (todo "TODO" + ((org-agenda-prefix-format "[ ] %T: ") + (org-agenda-overriding-header "Tâches pour le fun") + (org-agenda-sorting-strategy + '(todo-state-down effort-up category-keep) + )) + ) + ) + ("h" "Habits" tags-todo "STYLE=\"habit\"" + ((org-agenda-overriding-header "Habitudes") + (org-agenda-todo-keyword-format "[ ]") + (org-agenda-sorting-strategy + '(todo-state-down effort-up category-keep))) + ) + ) + ) + ) #+end_src ** Ménage dans les tâches réalisées @@ -534,45 +540,45 @@ Présentation personnalisée d'agenda, "custom views". #+begin_src emacs-lisp - ;; full screen captures - ;; (add-hook 'org-capture-mode-hook 'delete-other-windows) + ;; full screen captures + ;; (add-hook 'org-capture-mode-hook 'delete-other-windows) - ;;; templates de capture pour les nouvelles tâches - (setq org-capture-templates - '( - ("t" "Todo someday" - entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") - "* SOMEDAY %? \n") - ("d" "Todo this Day" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") - "* TODO %?\nDEADLINE:%T \n") - ("b" "Boulot" entry (file+headline "~/Nextcloud/textes/orgmode/boulot.org" "Inbox") - "* TODO %?\n :boulot:work: \n\n") - ;; (file "~/Nextclod/textes/orgmode/org-roam/20220620110632-meeting_template.org") - ("m" "Meeting" entry (file+datetree "~/Nextcloud/textes/orgmode/reunions.org" "Réunions") - "* Réunion %T - %U \n :[[id:d8636e1d-0137-4502-9384-767b41c892b0][boulot:meeting:]] \n\n**** Gens présents\n**** Notes\n - %?\n**** Choses à investiguer\n -\n**** Prochaines actions\n - Fin de la réunion: \n" - ) - ("e" "E-mail" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") - "* TODO %? :mail:écriture: \n\n") - ("n" "Next Task" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") - "** NEXT %? \nDEADLINE: %t \n\n") - ("p" "Phone call" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Tel") - "* PHONE %? :tel:\n%U \n\n" :clock-in t :clock-resume t) - ("j" "Journal" entry (file+datetree "~/Nextcloud/textes/orgmode/journal.org") - "* %?\nÉcrit le %U\n ") - ;; ajouter une ligne dans un tableau - ("v" "Table" table-line - (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Table") - "| %U | %? | auto-capture |") - ) - ) + ;;; templates de capture pour les nouvelles tâches + (setq org-capture-templates + '( + ("t" "Todo someday" + entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") + "* SOMEDAY %? \n") + ("d" "Todo this Day" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") + "* TODO %?\nDEADLINE:%T \n") + ("b" "Boulot" entry (file+headline "~/Nextcloud/textes/orgmode/boulot.org" "Inbox") + "* TODO %?\n :boulot:work: \n\n") + ;; (file "~/Nextclod/textes/orgmode/org-roam/20220620110632-meeting_template.org") + ("m" "Meeting" entry (file+olp+datetree "~/Nextcloud/textes/orgmode/reunions.org" "Réunions") + "* Réunion %T - %U \n :[[id:d8636e1d-0137-4502-9384-767b41c892b0][boulot:meeting:]] \n\n**** Gens présents\n**** Notes\n - %?\n**** Choses à investiguer\n -\n**** Prochaines actions\n - Fin de la réunion: \n" + ) + ("e" "E-mail" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") + "* TODO %? :mail:écriture: \n\n") + ("n" "Next Task" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Inbox") + "** NEXT %? \nDEADLINE: %t \n\n") + ("p" "Phone call" entry (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Tel") + "* PHONE %? :tel:\n%U \n\n" :clock-in t :clock-resume t) + ("j" "Journal" entry (file+olp+datetree "~/Nextcloud/textes/orgmode/journal.org") + "* %?\nÉcrit le %U\n ") + ;; ajouter une ligne dans un tableau + ("v" "Table" table-line + (file+headline "~/Nextcloud/textes/orgmode/tasks.org" "Table") + "| %U | %? | auto-capture |") + ) + ) - ;; raccourci custom pour clavier sans pavé numérique - (global-set-key (kbd "C-T") 'org-capture) + ;; raccourci custom pour clavier sans pavé numérique + (global-set-key (kbd "C-T") 'org-capture) - ;; raccourci custom pour clavier sans pavé numérique - (global-set-key (kbd "C-T") 'org-capture) + ;; raccourci custom pour clavier sans pavé numérique + (global-set-key (kbd "C-T") 'org-capture) #+end_src diff --git a/assets/org/update_calendar.sh b/assets/org/update_calendar.sh index ae5f04e1..56f96ac0 100644 --- a/assets/org/update_calendar.sh +++ b/assets/org/update_calendar.sh @@ -6,7 +6,7 @@ echo "updating calendar from nextcloud" # public link to orgmode calendar of nextcloud https://cloud.tykayn.fr/index.php/apps/calendar/timeGridWeek/now #URL="https://cloud.tykayn.fr/remote.php/dav/public-calendars/abcdeffffffffffffffffff\?export" -URL_CAL="https://nuage.tykayn.fr/remote.php/dav/public-calendars/cHkSk5rG445MftpZ?export" # calendrier tkwulfi +URL_CAL="https://cloud.tykayn.fr/remote.php/dav/public-calendars/cHkSk5rG445MftpZ?export" # calendrier tkwulfi echo $URL_CAL wget $URL_CAL -O orgcalendar.ics --show-progress diff --git a/bash/workflow_nextcloud/cronjob_nextcloud.sh b/bash/workflow_nextcloud/cronjob_nextcloud.sh index 58d06575..79c1652c 100644 --- a/bash/workflow_nextcloud/cronjob_nextcloud.sh +++ b/bash/workflow_nextcloud/cronjob_nextcloud.sh @@ -4,11 +4,11 @@ # tâche à effectuer régulièrement sur les ordis portables # # @author functions_sync by @tykayn - contact at cipherbliss.com -source ~/Nextcloud/ressources/workflow_nextcloud/workflow_variables.sh +source ~/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh # récupérer les notes du mobile et les stocker dans l'incoming inbox orgmode -bash $WORKFLOW_PATH/archive_from_nextcloud.sh +#bash $WORKFLOW_PATH/archive_from_nextcloud.sh bash $WORKFLOW_PATH/update_calendar_tkwulfi.sh bash $WORKFLOW_PATH/get_nextcloud_notes_todo.sh bash $WORKFLOW_PATH/backup_nextcloud_in_user_home.sh diff --git a/bash/workflow_nextcloud/init_workflow_nextcloud.sh b/bash/workflow_nextcloud/init_workflow_nextcloud.sh index c194648b..e5a667a9 100644 --- a/bash/workflow_nextcloud/init_workflow_nextcloud.sh +++ b/bash/workflow_nextcloud/init_workflow_nextcloud.sh @@ -1,6 +1,9 @@ #!/bin/bash echo "========== init de workflow par Tykayn =======" -source ~/Nextcloud/ressources/workflow_nextcloud/workflow_variables.sh + +mkdir -p ~/Nextcloud/ressources/workflow_nextcloud/ + +source ~/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh if ! -d ~/Nextcloud/ressources/workflow_nextcloud/ ; then echo "création du dossier nextcloud workflow_nextcloud" @@ -18,15 +21,15 @@ fi ansible-galaxy install coglinev3.veracrypt echo "vérification et installation des paquets requis" -sudo ansible-playbook "/home/tykayn/Nextcloud/ressources/workflow_nextcloud/ansible/tk_softwares.yml" +sudo ansible-playbook "$WORKFLOW_PATH_PUBLIC/ansible/tk_softwares.yml" -ansible-playbook "/home/tykayn/Nextcloud/ressources/workflow_nextcloud/ansible/pip_modules.yml" -sudo ansible-playbook "/home/tykayn/Nextcloud/ressources/workflow_nextcloud/ansible/snaps.yml" -ansible-playbook "/home/tykayn/Nextcloud/ressources/workflow_nextcloud/ansible/node_packages.yml" +ansible-playbook "$WORKFLOW_PATH_PUBLIC/ansible/pip_modules.yml" +sudo ansible-playbook "$WORKFLOW_PATH_PUBLIC/ansible/snaps.yml" +ansible-playbook "$WORKFLOW_PATH_PUBLIC/ansible/node_packages.yml" -ansible-playbook "/home/tykayn/Nextcloud/ressources/workflow_nextcloud/ansible/cronjob_workflow.yml" -sudo ansible-playbook "/home/tykayn/Nextcloud/ressources/workflow_nextcloud/ansible/cronjob_workflow_root.yml" +ansible-playbook "$WORKFLOW_PATH_PUBLIC/ansible/cronjob_workflow.yml" +sudo ansible-playbook "$WORKFLOW_PATH_PUBLIC/ansible/cronjob_workflow_root.yml" sudo apt autoremove -y diff --git a/bash/workflow_nextcloud/refresh_from_current_assets.sh b/bash/workflow_nextcloud/refresh_from_current_assets.sh index 6a69e4d4..545d4b84 100644 --- a/bash/workflow_nextcloud/refresh_from_current_assets.sh +++ b/bash/workflow_nextcloud/refresh_from_current_assets.sh @@ -9,7 +9,7 @@ # */30 * * * * bash /home/tykayn/www/scripts/refresh_from_current_assets.sh # configs -source ~/Nextcloud/ressources/workflow_nextcloud/workflow_variables.sh +source ~/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh echo "mise à jour des assets de référence dans les scripts custom $HOME_OF_SCRIPTS depuis l'ordinateur actuel" diff --git a/bash/workflow_nextcloud/sync_spaceship.sh b/bash/workflow_nextcloud/sync_spaceship.sh index 5cede6b9..27b4524f 100644 --- a/bash/workflow_nextcloud/sync_spaceship.sh +++ b/bash/workflow_nextcloud/sync_spaceship.sh @@ -18,7 +18,7 @@ # functions_sync.sh définit les constantes utiles # le borg backup fait 1.4 To # le stockage syncable fait -source ~/Nextcloud/ressources/workflow_nextcloud/workflow_variables.sh +source ~/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh source ~/Nextcloud/ressources/workflow_nextcloud/install/functions_sync.sh source ~/Nextcloud/ressources/workflow_nextcloud/install/functions_tk.sh @@ -93,32 +93,6 @@ echo "le log de backup se situe dans : $LOG_FILE_BACKUP_DATES" # --------- mettre à jour les borg backup des serveurs distants -------- # # getWebServersBorg; - -# --- maj borg de stockage syncable ---------- # -#upBorg; - - #killall borg - logDate "### --------- SPACESHIP | creating borg archive at $SPACESHIP_NEW_BORG_REPO" - rm -rf ~/.cache/borg/150867528afd85114c8aba98af201a7ad8cf01869c507a87c025d2f8701040a9/lock.exclusive - rm -rf ~/.cache/borg/68b9103c6f35bfd198552cb197f149b1d05309d28ce4429f2bec8df01b453660/lock.exclusive - rm -rf ~/.cache/borg/b822ee0c0c5c7a181a3b3b7cefc6eb4f3baf9965f30bfca364c2ff92f9962de4/lock.exclusive - rm -rf ~/.cache/borg/d1c0552f96686f6d631068bc8bf0c19f2a7ff80f956dc36b0441f3d8aac78a36/lock.exclusive - -# rm -rf SPACESHIP_NEW_BORG_REPO/lock.exclusive - - borg create encrypted_spaceship_{now} $ARCHIVE_SYNCABLE \ - /home/poule/encrypted/installateurs/installateurs_pour_ventoy \ - "${exclude_opts[@]}" --progress --verbose --stats --compression zstd,9 \ - | tee -a $LOG_FILE_BACKUP 2>&1 - - echo " " | tee -a $LOG_FILE_BACKUP 2>&1 - logDate "### --------- ${today} | SPACESHIP | pruning old archives" | tee -a $LOG_FILE_BACKUP 2>&1 - # nettoyage tk_backup - borg prune -v --list --stats --keep-daily=8 --keep-weekly=6 --keep-monthly=3 --keep-yearly=2 | tee -a $LOG_FILE_BACKUP 2>&1 - logDate "### --------- pruning done" - - - # --------- disques avec beaucoup de place -------- # # --------- disques chiffrés -------- # #syncToBigDiskName louisbraille @@ -141,7 +115,7 @@ rm -rf /media/tykayn/chaton/borg_archives/backup_land4to rm -rf /media/tykayn/lilia/borg_archives/backup_land4to rm -rf /media/tykayn/blue/borg_archives/backup_land4to -syncToBigDiskName brossadent +#syncToBigDiskName brossadent syncToBigDiskName moonmoon syncToBigDiskName louisbraille syncToBigDiskName rugged @@ -149,7 +123,7 @@ syncToBigDiskName rugged syncToBigDiskName lilia syncToBigDiskName blue -clearDiskSyncBorgServer brossadent +#clearDiskSyncBorgServer brossadent clearDiskSyncBorgServer moonmoon clearDiskSyncBorgServer louisbraille clearDiskSyncBorgServer rugged diff --git a/bash/workflow_nextcloud/update_calendar.sh b/bash/workflow_nextcloud/update_calendar.sh index ae5f04e1..56f96ac0 100644 --- a/bash/workflow_nextcloud/update_calendar.sh +++ b/bash/workflow_nextcloud/update_calendar.sh @@ -6,7 +6,7 @@ echo "updating calendar from nextcloud" # public link to orgmode calendar of nextcloud https://cloud.tykayn.fr/index.php/apps/calendar/timeGridWeek/now #URL="https://cloud.tykayn.fr/remote.php/dav/public-calendars/abcdeffffffffffffffffff\?export" -URL_CAL="https://nuage.tykayn.fr/remote.php/dav/public-calendars/cHkSk5rG445MftpZ?export" # calendrier tkwulfi +URL_CAL="https://cloud.tykayn.fr/remote.php/dav/public-calendars/cHkSk5rG445MftpZ?export" # calendrier tkwulfi echo $URL_CAL wget $URL_CAL -O orgcalendar.ics --show-progress diff --git a/bash/workflow_nextcloud/update_git_projects.sh b/bash/workflow_nextcloud/update_git_projects.sh index 136590b1..91f9473b 100644 --- a/bash/workflow_nextcloud/update_git_projects.sh +++ b/bash/workflow_nextcloud/update_git_projects.sh @@ -12,13 +12,13 @@ # # ------------------------------------------------------------------------------------------------ ##################################################### -source ~/Nextcloud/ressources/workflow_nextcloud/workflow_variables.sh +source ~/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh ###################################################### # liste de tous les projets pour chaque forge logicielle ##################################################### declare -a list_repos_framagit=("caisse-bliss" "joinfediverse" "date-poll-api" "mastodon" "peertube" "events-liberator" "gitall" "dotclear-importer" "mobilizon" "fanzine-log" "crossed-words" "generator-tk" "circles" "card-deck" "sfprobe" "mastermind" "portfolio" "time-tracker" "cipherbliss.com" "caisse-bliss-frontend" "compta" "trafficjam" "ical-generator" "blueprint-cipherbliss" "dotclear2wordpress" "api" "diaspora" ) -declare -a list_repos_forge_chapril=("transcription" "org-report-stats" "multi-account-post-schedule-mastodon" "framalibre-scraping" "scripts" "melting-pot" "funky-framadate-front" "rss-feeder-mobilizon" "mastodon-archive-stats" "gtg2json" "libreavous-audio-reader" "osm_my_commerce" "fromage-js" "ueberauth_openstreetmap" "events-liberator") +declare -a list_repos_forge_chapril=( "org-report-stats" "mastodon-wall" "melting-pot" "workflow" "mapping-geojson-osm" "rangement" "transcription" "org-report-stats" "multi-account-post-schedule-mastodon" "framalibre-scraping" "scripts" "melting-pot" "funky-framadate-front" "rss-feeder-mobilizon" "mastodon-archive-stats" "gtg2json" "libreavous-audio-reader" "osm_my_commerce" "fromage-js" "ueberauth_openstreetmap" "events-liberator") prefix_framagit='https://framagit.org/tykayn/' prefix_forgechapril='https://forge.chapril.org/tykayn/' diff --git a/bash/workflow_nextcloud/workflow_variables.sh b/bash/workflow_nextcloud/workflow_variables.sh index de0b25a1..9f091d3f 100644 --- a/bash/workflow_nextcloud/workflow_variables.sh +++ b/bash/workflow_nextcloud/workflow_variables.sh @@ -1,7 +1,7 @@ #!/bin/bash # ajouter dans les scripts avec cette ligne: # -# source ~/Nextcloud/ressources/workflow_nextcloud/workflow_variables.sh +# source ~/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh # # export main_user="tykayn" @@ -26,7 +26,7 @@ export stockage_syncable_folder=/home/poule/encrypted/stockage-syncable # dossier où stocker les projets de dev export www_folder=$stockage_syncable_folder/www/development/html/ -export node_version_expected=20 +export node_version_expected="stable" export today=`date` # to log current time export ARCHIVE_SYNCABLE=$stockage_syncable_folder # place where we have our things sorted, other than home @@ -36,7 +36,7 @@ export a_dispatcher="$ARCHIVE_SYNCABLE/photos/a_dispatcher" # dossier où sont export PHOTOS_TO_DISPATCH="$a_dispatcher" export PHOTOS_FOLDER="$ARCHIVE_SYNCABLE/photos/" -export SPACESHIP_BORG_REPO="/home/poule/borg_archives/backup_land4to" +export SPACESHIP_BORG_REPO="/home/poule/borg_archives/borg2" export SPACESHIP_NEW_BORG_REPO="/home/poule/borg_archives/borg2" export BORG_REPO=$SPACESHIP_NEW_BORG_REPO