From 7570ab6bac3a18f3ad00edf8343da8795db7a45b Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Sun, 6 Sep 2020 10:42:49 +0200 Subject: Script correction --- duply/.duply/jdr/conf | 28 ---------------------------- duply/.duply/jdr/exclude | 9 --------- duply/.duply/music/conf | 28 ---------------------------- duply/.duply/music/exclude | 9 --------- duply/.duply/seb_jdr/conf | 28 ++++++++++++++++++++++++++++ duply/.duply/seb_jdr/exclude | 9 +++++++++ duply/.duply/seb_music/conf | 28 ++++++++++++++++++++++++++++ duply/.duply/seb_music/exclude | 9 +++++++++ duply/scripts/duplicity/duply_common.sh | 2 +- readme.rst | 20 ++++++++++++++++++-- 10 files changed, 93 insertions(+), 77 deletions(-) delete mode 100644 duply/.duply/jdr/conf delete mode 100644 duply/.duply/jdr/exclude delete mode 100644 duply/.duply/music/conf delete mode 100644 duply/.duply/music/exclude create mode 100644 duply/.duply/seb_jdr/conf create mode 100644 duply/.duply/seb_jdr/exclude create mode 100644 duply/.duply/seb_music/conf create mode 100644 duply/.duply/seb_music/exclude diff --git a/duply/.duply/jdr/conf b/duply/.duply/jdr/conf deleted file mode 100644 index 5353984..0000000 --- a/duply/.duply/jdr/conf +++ /dev/null @@ -1,28 +0,0 @@ -# base directory to backup -SOURCE='/home/sebastien/Documents/jdr' - -# Storage directory -export STORAGE_NAME="jdr" -export PCA_OS_REGION_NAME=GRA -export HOT_OS_REGION_NAME=GRA - -GPG_KEYS_ENC='2421BCBD56473645,933FFFBA5E8867338DF2FF645E23E7695299F9AB' -GPG_KEY_SIGN='F6859BC3CC712DF8' -# set if signing key passphrase differs from encryption (key) passphrase -# NOTE: available since duplicity 0.6.14, translates to SIGN_PASSPHRASE -#GPG_PW_SIGN='' - -# uncomment and set a file path or name force duply to use this gpg executable -# available in duplicity 0.7.04 and above (currently unreleased 06/2015) -#GPG='/usr/local/gpg-2.1/bin/gpg' - -# gpg options passed from duplicity to gpg process (default='') -# e.g. "--trust-model pgp|classic|direct|always" -# or "--compress-algo=bzip2 --bzip2-compress-level=9" -# or "--personal-cipher-preferences AES256,AES192,AES..." -# or "--homedir ~/.duply" - keep keyring and gpg settings duply specific -# or "--pinentry-mode loopback" - needed for GPG 2.1+ _and_ -# also enable allow-loopback-pinentry in your .gnupg/gpg-agent.conf -#GPG_OPTS='' - -. ~/scripts/duplicity/duply_common.sh diff --git a/duply/.duply/jdr/exclude b/duply/.duply/jdr/exclude deleted file mode 100644 index 9558c66..0000000 --- a/duply/.duply/jdr/exclude +++ /dev/null @@ -1,9 +0,0 @@ -# although called exclude, this file is actually a globbing file list -# duplicity accepts some globbing patterns, even including ones here -# here is an example, this incl. only 'dir/bar' except it's subfolder 'foo' -# - dir/bar/foo -# + dir/bar -# - ** -# for more details see duplicity manpage, section File Selection -# http://duplicity.nongnu.org/duplicity.1.html#sect9 - diff --git a/duply/.duply/music/conf b/duply/.duply/music/conf deleted file mode 100644 index d1d726b..0000000 --- a/duply/.duply/music/conf +++ /dev/null @@ -1,28 +0,0 @@ -# base directory to backup -SOURCE='/home/sebastien/Musique' - -# Storage directory -export STORAGE_NAME="music" -export PCA_OS_REGION_NAME=GRA -export HOT_OS_REGION_NAME=GRA - -GPG_KEYS_ENC='2421BCBD56473645,933FFFBA5E8867338DF2FF645E23E7695299F9AB' -GPG_KEY_SIGN='F6859BC3CC712DF8' -# set if signing key passphrase differs from encryption (key) passphrase -# NOTE: available since duplicity 0.6.14, translates to SIGN_PASSPHRASE -#GPG_PW_SIGN='' - -# uncomment and set a file path or name force duply to use this gpg executable -# available in duplicity 0.7.04 and above (currently unreleased 06/2015) -#GPG='/usr/local/gpg-2.1/bin/gpg' - -# gpg options passed from duplicity to gpg process (default='') -# e.g. "--trust-model pgp|classic|direct|always" -# or "--compress-algo=bzip2 --bzip2-compress-level=9" -# or "--personal-cipher-preferences AES256,AES192,AES..." -# or "--homedir ~/.duply" - keep keyring and gpg settings duply specific -# or "--pinentry-mode loopback" - needed for GPG 2.1+ _and_ -# also enable allow-loopback-pinentry in your .gnupg/gpg-agent.conf -#GPG_OPTS='' - -. ~/scripts/duplicity/duply_common.sh diff --git a/duply/.duply/music/exclude b/duply/.duply/music/exclude deleted file mode 100644 index 9558c66..0000000 --- a/duply/.duply/music/exclude +++ /dev/null @@ -1,9 +0,0 @@ -# although called exclude, this file is actually a globbing file list -# duplicity accepts some globbing patterns, even including ones here -# here is an example, this incl. only 'dir/bar' except it's subfolder 'foo' -# - dir/bar/foo -# + dir/bar -# - ** -# for more details see duplicity manpage, section File Selection -# http://duplicity.nongnu.org/duplicity.1.html#sect9 - diff --git a/duply/.duply/seb_jdr/conf b/duply/.duply/seb_jdr/conf new file mode 100644 index 0000000..5353984 --- /dev/null +++ b/duply/.duply/seb_jdr/conf @@ -0,0 +1,28 @@ +# base directory to backup +SOURCE='/home/sebastien/Documents/jdr' + +# Storage directory +export STORAGE_NAME="jdr" +export PCA_OS_REGION_NAME=GRA +export HOT_OS_REGION_NAME=GRA + +GPG_KEYS_ENC='2421BCBD56473645,933FFFBA5E8867338DF2FF645E23E7695299F9AB' +GPG_KEY_SIGN='F6859BC3CC712DF8' +# set if signing key passphrase differs from encryption (key) passphrase +# NOTE: available since duplicity 0.6.14, translates to SIGN_PASSPHRASE +#GPG_PW_SIGN='' + +# uncomment and set a file path or name force duply to use this gpg executable +# available in duplicity 0.7.04 and above (currently unreleased 06/2015) +#GPG='/usr/local/gpg-2.1/bin/gpg' + +# gpg options passed from duplicity to gpg process (default='') +# e.g. "--trust-model pgp|classic|direct|always" +# or "--compress-algo=bzip2 --bzip2-compress-level=9" +# or "--personal-cipher-preferences AES256,AES192,AES..." +# or "--homedir ~/.duply" - keep keyring and gpg settings duply specific +# or "--pinentry-mode loopback" - needed for GPG 2.1+ _and_ +# also enable allow-loopback-pinentry in your .gnupg/gpg-agent.conf +#GPG_OPTS='' + +. ~/scripts/duplicity/duply_common.sh diff --git a/duply/.duply/seb_jdr/exclude b/duply/.duply/seb_jdr/exclude new file mode 100644 index 0000000..9558c66 --- /dev/null +++ b/duply/.duply/seb_jdr/exclude @@ -0,0 +1,9 @@ +# although called exclude, this file is actually a globbing file list +# duplicity accepts some globbing patterns, even including ones here +# here is an example, this incl. only 'dir/bar' except it's subfolder 'foo' +# - dir/bar/foo +# + dir/bar +# - ** +# for more details see duplicity manpage, section File Selection +# http://duplicity.nongnu.org/duplicity.1.html#sect9 + diff --git a/duply/.duply/seb_music/conf b/duply/.duply/seb_music/conf new file mode 100644 index 0000000..d1d726b --- /dev/null +++ b/duply/.duply/seb_music/conf @@ -0,0 +1,28 @@ +# base directory to backup +SOURCE='/home/sebastien/Musique' + +# Storage directory +export STORAGE_NAME="music" +export PCA_OS_REGION_NAME=GRA +export HOT_OS_REGION_NAME=GRA + +GPG_KEYS_ENC='2421BCBD56473645,933FFFBA5E8867338DF2FF645E23E7695299F9AB' +GPG_KEY_SIGN='F6859BC3CC712DF8' +# set if signing key passphrase differs from encryption (key) passphrase +# NOTE: available since duplicity 0.6.14, translates to SIGN_PASSPHRASE +#GPG_PW_SIGN='' + +# uncomment and set a file path or name force duply to use this gpg executable +# available in duplicity 0.7.04 and above (currently unreleased 06/2015) +#GPG='/usr/local/gpg-2.1/bin/gpg' + +# gpg options passed from duplicity to gpg process (default='') +# e.g. "--trust-model pgp|classic|direct|always" +# or "--compress-algo=bzip2 --bzip2-compress-level=9" +# or "--personal-cipher-preferences AES256,AES192,AES..." +# or "--homedir ~/.duply" - keep keyring and gpg settings duply specific +# or "--pinentry-mode loopback" - needed for GPG 2.1+ _and_ +# also enable allow-loopback-pinentry in your .gnupg/gpg-agent.conf +#GPG_OPTS='' + +. ~/scripts/duplicity/duply_common.sh diff --git a/duply/.duply/seb_music/exclude b/duply/.duply/seb_music/exclude new file mode 100644 index 0000000..9558c66 --- /dev/null +++ b/duply/.duply/seb_music/exclude @@ -0,0 +1,9 @@ +# although called exclude, this file is actually a globbing file list +# duplicity accepts some globbing patterns, even including ones here +# here is an example, this incl. only 'dir/bar' except it's subfolder 'foo' +# - dir/bar/foo +# + dir/bar +# - ** +# for more details see duplicity manpage, section File Selection +# http://duplicity.nongnu.org/duplicity.1.html#sect9 + diff --git a/duply/scripts/duplicity/duply_common.sh b/duply/scripts/duplicity/duply_common.sh index fed8481..a1a8866 100644 --- a/duply/scripts/duplicity/duply_common.sh +++ b/duply/scripts/duplicity/duply_common.sh @@ -27,6 +27,6 @@ read() { #Generate the configuration ~/scripts/duplicity/gen_config_remote.sh "${JSON_CONF}" -TARGET="multi:${JSON_CONF}?mode=mirror&onfail=continue" +TARGET="multi:${JSON_CONF}?mode=mirror&onfail=abort" DUPL_PARAMS="$DUPL_PARAMS --file-prefix-manifest 'hot_' --file-prefix-signature 'hot_' --file-prefix-archive 'cold_' " diff --git a/readme.rst b/readme.rst index 845972a..325472f 100644 --- a/readme.rst +++ b/readme.rst @@ -1,9 +1,25 @@ .. -*- mode: rst -*- .. -*- coding: utf-8 -*- +.. default-role:: literal + +Description +=========== + +Ce repo contient l'ensemble des fichiers de configuration pour les différentes +applications. + +Clone et installation +===================== + +.. code-block:: bash + + git clone http://git.chimrod.com/configuration.git/ + Utilisation =========== -Se placer dans le répertoire courant, et lancer la commande pour chaque répertoire +Se placer dans le répertoire courant, et lancer la commande pour chaque +répertoire `stow i3` pour installer les fichiers présents dans le répertoire. -`stow i3` +Voir `man stow` pour plus de détail sur l'Utilisation. -- cgit v1.2.3