From 123aad138c4087dda3e2e011c617267862b61272 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Mon, 13 Jan 2025 12:00:58 +0100 Subject: [PATCH] up docs --- README.md | 2 +- assets/.bash_aliases | 6 +-- assets/.bash_custom_aliases | 38 ++++++++----------- doc/examples/secrets_example.sh | 2 +- doc/sections.md | 5 ++- .../partials/check_folder_integrity.sh | 2 +- variables.sh | 6 +-- workflow_variables.sh | 4 +- 8 files changed, 30 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 5f166fe..803caff 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Workflow avec Nextcloud +# Workflow avec Nextcloud Gérer ses flux de travaux et autres gestion de projets avec des scripts. J'unifie le comportement de mes stations de travail avec une gestion syncronisée de certains scripts pemettant d'installer certains programmes avec des configurations par défaut. diff --git a/assets/.bash_aliases b/assets/.bash_aliases index 1ac9be6..c69f34d 100644 --- a/assets/.bash_aliases +++ b/assets/.bash_aliases @@ -1,8 +1,8 @@ #!/bin/bash -# these bash aliases are meant to be added in your user folder, -# in a file named: .bash_aliases (with the dot at the beginning) +# these bash aliases are meant to be added in your user folder, +# in a file named: .bash_aliases (with the dot at the beginning) # done for my blog http://www.cipherbliss.com # -# load variables +# load variables source ~/Nextcloud/ressources/workflow_nextcloud/workflow_variables.sh source $ALIASES_PATH \ No newline at end of file diff --git a/assets/.bash_custom_aliases b/assets/.bash_custom_aliases index 20abec1..0578df5 100644 --- a/assets/.bash_custom_aliases +++ b/assets/.bash_custom_aliases @@ -5,20 +5,13 @@ # # load variables # echo "bash custom aliases: load functions to sync files" -source ~/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh +source $HOME/Nextcloud/ressources/workflow_nextcloud/public_workflow/workflow_variables.sh ############################ current alias work="cd $www_folder/scripts/mapping_geojson_to_osm_tags" ########## lieux ########### -alias dok="docker-compose" -alias dc="docker-compose" - -# tuer tous les conteneurs docker -function dckill() { - docker container kill $(docker container ls -q) -} alias gow="cd $WORKFLOW_PATH" # go to folder of nextcloud where i store my scripts ###### lieux locaux @@ -78,7 +71,7 @@ alias yre="yarn run encore --dev" alias yrep="yarn run encore --production" ################ system without graphic interface - command line ################ -alias basha="gedit $ALIASES_PATH" # éditer les alisas +alias basha="echo $ALIASES_PATH && gedit $ALIASES_PATH" # éditer les alisas alias bashare="source $ALIASES_PATH" # recharger les alias alias ainstall="sudo apt-get install" # installer un programme @@ -128,8 +121,7 @@ alias ft="filetags --tagtrees --tagtrees-handle-no-tag \"has_no_tag\" --tagtrees alias netre="sudo service network-manager restart" # syncronisations -alias getrise="rsync root@proxmox.coussinet.org:/poule/encrypted /home/poule/borg_archives/production-servers-backup/rise/ -avzPW --inplace --delete-before --exclude borgbackup_tkland" # get the backups of the riseup server -alias getrisefromjuvisy="rsync tykayn@proxmox.coussinet.org:/poule/encrypted/* /media/tykayn/disque_usb/backup_rise/encrypted -rvzPW --delete-before --exclude borgbackup_tkland --no-perms --no-group --exclude borg2 --exclude=do_not_sync_back" +alias getrise="rsync root@proxmox.coussinet.org:/poule/encrypted /home/poule/borg_archives/production-servers-backup/rise/ -avzPW --inplace --delete-before --exclude borgbackup_tkland" alias ascan="sudo arp-scan --local" @@ -163,8 +155,13 @@ export PATH="$WORKFLOW_PUBLIC_PATH/bin:$HOME/.emacs.d/bin:$HOME/.symfony/bin:$PA export RAILS_ENV=development # ---------------------------------------------------------------------- +# logiciels +alias ws="bash $HOME/Nextcloud/ressources/ide/WebStorm-2023.2.8/bin/webstorm.sh &" +alias j="java -jar $HOME/Nextcloud/ressources/logiciels/josm-tested.jar" +alias jup="wget https://josm.openstreetmap.de/josm-tested.jar -O $HOME/Nextcloud/ressources/logiciels/josm-tested.jar" +alias dok="docker-compose" +alias dc="docker-compose" -alias ws="nohup bash $HOME/Téléchargements/WebStorm-232.10335.13/bin/bin/webstorm.sh &" export HISTTIMEFORMAT="%d/%m/%y %T " export EDITOR=nano export HUGO_BASE_DIR="~/Nextcloud/textes/hugo" @@ -176,7 +173,7 @@ source $WORKFLOW_PATH/install/functions_sync.sh source $WORKFLOW_PATH/install/functions_tk.sh export HISTTIMEFORMAT="%d/%m/%y %T " -# node version manager +# node version manager if command -v nvm &> /dev/null then # echo "nvm chargé" @@ -199,11 +196,14 @@ if [ "$(id -u)" = 0 ]; then echo "root: partition ZFS déchiffrée et montée" fi - # tempo notif alias tempo="python ~/Nextcloud/tempo.py" +# tuer tous les conteneurs docker +function dckill() { + docker container kill $(docker container ls -q) +} # créer un post de blog: new cipher bliss ncb(){ python /home/poule/encrypted/stockage-syncable/www/development/html/orgmode-to-gemini-blog/new_article.py cipherbliss_blog fr "$@" @@ -214,14 +214,8 @@ function gc() { git commit -m "$1" git push } -# tempo - -# gestion datagouv - -export API="https://www.data.gouv.fr/api/1/" -export API_KEY="eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyIjoiNjM2ZTEzZDM0ZTA5ZGNlNGNiMzNiNmE1IiwidGltZSI6MTczMjIxMjQ1My44OTA2MzE0fQ.To5OUIqaZD7843RbygPAtQoLM85Tax9t91gntbgcmO6hLRHHdlTXm5UdCEhplkhZu2ZyvS5XQDFtUoF-HqtAHA" #api key pour cipherbliss datagouv https://www.data.gouv.fr/fr/admin/me/#apikey -export PATH=~/.npm-global/bin:$PATH - +export PATH="~/.npm-global/bin:$PATH" +export PATH="$HOME/.symfony5/bin:$PATH" diff --git a/doc/examples/secrets_example.sh b/doc/examples/secrets_example.sh index 404fede..1e90f75 100644 --- a/doc/examples/secrets_example.sh +++ b/doc/examples/secrets_example.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# variables à ne pas versionner +# variables à ne pas versionner # export secret_key="bidule" \ No newline at end of file diff --git a/doc/sections.md b/doc/sections.md index 4c27edd..709776d 100644 --- a/doc/sections.md +++ b/doc/sections.md @@ -9,13 +9,14 @@ Pour récupérer seulement les alias de commande sans prendre toutes les section cd wget https://forge.chapril.org/tykayn/workflow/raw/branch/main/assets/.bashrc wget https://forge.chapril.org/tykayn/workflow/raw/branch/main/assets/.bash_custom_aliases -O .bash_aliases +source .bash_aliases ``` ## Installation de programmes ```shell -sudo apt install ansible python3-pip arp-scan borgbackup curl docker docker-compose etckeeper git gnupg jq meld nano ncdu nginx restic npm pandoc php python3 python3-pip tig zsh testdisk texlive rbenv htop btop python3-setuptools autopostgresqlbackup automysqlbackup certbot smartmontools fail2ban snapd unattended-upgrades php php-fpm php-xml php-mysql rsync php-dom php-curl vrms syncthing sshfs geeqie -pip install yt-dlp +sudo apt install ansible python3-pip arp-scan borgbackup curl docker docker-compose etckeeper git gnupg jq meld nano ncdu nginx restic npm pandoc php python3 python3-pip tig zsh testdisk texlive rbenv htop btop python3-setuptools autopostgresqlbackup automysqlbackup certbot smartmontools fail2ban snapd unattended-upgrades php php-fpm php-xml php-mysql rsync php-dom php-curl vrms syncthing sshfs geeqie calibre +pip install yt-dlp --user ``` ### Installation de configuration de programmes diff --git a/initialization/partials/check_folder_integrity.sh b/initialization/partials/check_folder_integrity.sh index 8ee627a..f9a84d1 100644 --- a/initialization/partials/check_folder_integrity.sh +++ b/initialization/partials/check_folder_integrity.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# vérifier que les dossiers nécessaires au workflow existent, +# vérifier que les dossiers nécessaires au workflow existent, # les créer au besoin, # alerter sur l'impossibilité de créer en ajoutant une tâche orgmode au dossier de textes # diff --git a/variables.sh b/variables.sh index 770f54b..baeccc6 100644 --- a/variables.sh +++ b/variables.sh @@ -1,6 +1,6 @@ #!/bin/bash -# variables globales qui seront importées dans chaque terminal ouvert par l'utilisateur +# variables globales qui seront importées dans chaque terminal ouvert par l'utilisateur if [ "$debug" = true ]; then echo "# chargement des variables de public workflow ..." fi @@ -48,7 +48,7 @@ export today=`date` # to log current time export ARCHIVE_SYNCABLE=$stockage_syncable_folder # place where we have our things sorted, other than home export BORG_PASSCOMMAND="cat $ARCHIVE_SYNCABLE/.tk-borg-passphrase-light" # get the borg repo pass -export a_dispatcher="$ARCHIVE_SYNCABLE/photos/a_dispatcher" # dossier où sont stockées les photos en provenance du smartphone +export a_dispatcher="$ARCHIVE_SYNCABLE/photos/a_dispatcher" # dossier où sont stockées les photos en provenance du smartphone export PHOTOS_TO_DISPATCH="$a_dispatcher" export PHOTOS_FOLDER="$ARCHIVE_SYNCABLE/photos/" @@ -70,7 +70,7 @@ export CURRENT_YEAR=$(date +%Y) export PATH=$WORKFLOW_PATH:$PATH -########## colors for logging ######### +########## colors for logging ######### # https://wiki.archlinux.org/title/Bash/Prompt_customization#List_of_colors_for_prompt_and_Bash # # echo -e "${txtred}asd${txtwht}" diff --git a/workflow_variables.sh b/workflow_variables.sh index 71140f9..206b392 100644 --- a/workflow_variables.sh +++ b/workflow_variables.sh @@ -43,7 +43,7 @@ if [ -z ${load_only_once+x} ]; then export ARCHIVE_SYNCABLE=$stockage_syncable_folder # place where we have our things sorted, other than home export BORG_PASSCOMMAND="cat $ARCHIVE_SYNCABLE/.tk-borg-passphrase-light" # get the borg repo pass - export a_dispatcher="$ARCHIVE_SYNCABLE/photos/a_dispatcher" # dossier où sont stockées les photos en provenance du smartphone + export a_dispatcher="$ARCHIVE_SYNCABLE/photos/a_dispatcher" # dossier où sont stockées les photos en provenance du smartphone export PHOTOS_TO_DISPATCH="$a_dispatcher" export PHOTOS_FOLDER="$ARCHIVE_SYNCABLE/photos/" @@ -64,7 +64,7 @@ if [ -z ${load_only_once+x} ]; then export PATH=$WORKFLOW_PATH:$PATH - ########## colors for logging ######### + ########## colors for logging ######### # https://wiki.archlinux.org/title/Bash/Prompt_customization#List_of_colors_for_prompt_and_Bash # # echo -e "${txtred}asd${txtwht}"