1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/archivist_ynh.git synced 2024-09-03 18:15:55 +02:00

Merge pull request #55 from YunoHost-Apps/testing

Testing : v1.34 + better logs
This commit is contained in:
lapineige 2024-01-14 10:41:56 +00:00 committed by GitHub
commit 8f36f34fae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 92 deletions

View file

@ -24,7 +24,7 @@ Archivist is automatically launched periodicaly to update your backups and send
**Shipped version:** 1.3.3~ynh1 **Shipped version:** 1.3.4~ynh1
## Disclaimers / important information ## Disclaimers / important information
## Configuration ## Configuration

View file

@ -23,7 +23,7 @@ Vos sauvegardes peuvent être envoyées à de nombreux autres endroits, locaux o
Archivist est automatiquement lancé périodiquement pour mettre à jour vos sauvegardes et envoyer les modifications aux autres emplacements. Archivist est automatiquement lancé périodiquement pour mettre à jour vos sauvegardes et envoyer les modifications aux autres emplacements.
**Version incluse :** 1.3.3~ynh1 **Version incluse :** 1.3.4~ynh1
## Avertissements / informations importantes ## Avertissements / informations importantes
## Configuration ## Configuration

View file

@ -1,9 +1,9 @@
;; Test complet ;; Test complet
; Manifest ; Manifest
encrypt=1 encrypt=true
encryption_pwd="password" encryption_pwd="password"
core_backup=1 core_backup=true
apps_backup=1 apps_backup=true
frequency="Weekly" frequency="Weekly"
; Checks ; Checks
pkg_linter=1 pkg_linter=1

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/maniackcrudelis/archivist/archive/refs/tags/v1.3.3.tar.gz SOURCE_URL=https://github.com/maniackcrudelis/archivist/archive/refs/tags/v1.3.4.tar.gz
SOURCE_SUM=30fc33e5091f7e388004324da5f43b067ccb69e522a12ca298a2d969688094ee SOURCE_SUM=97df967d79ee2acd0bfae929a9feccea4df0f5943f14101a20a066470142fe89
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

View file

@ -1,78 +0,0 @@
version = "1.0"
name = "Archivist configuration panel"
[main]
name = "Archivist configuration"
[main.encryption]
name = "Encryption"
[main.encryption.encrypt]
ask = "Do you want to encrypt your backups ?"
type = "boolean"
default = true
[main.encryption.encryption_pwd]
ask = "Set the password for encryption"
type = "password"
optional = true
help = "A password is needed if encryption is activated."
[main.compression]
name = "Compression algorithm"
[main.compression.ynh]
ask = "Choose the compression algorithm for YunoHost backups"
choices = ["gzip", "lzop", "zstd", "bzip2", "lzma", "lzip", "xz", "No compression"]
default = "gzip"
[main.compression.files]
ask = "Choose the compression algorithm for files and directories backups"
choices = ["gzip", "lzop", "zstd", "bzip2", "lzma", "lzip", "xz", "No compression"]
default = "gzip"
[main.backup_types]
name = "Backup"
[main.backup_types.core_backup]
ask = "Would you like to backup your YunoHost core ?"
type = "boolean"
default = true
[main.backup_types.apps_backup]
ask = "Would you like to backup your apps ?"
type = "boolean"
default = true
help = "WARNING: Changing this value will either remove backup for all apps or add all current apps to the backup."
[main.backup_options]
name = "Backup options"
[main.backup_options.frequency]
ask = "Choose the frequency of your backups ?"
choices = ["Daily", "Each 3 days", "Weekly", "Biweekly", "Monthly"]
default = "Weekly"
[main.backup_options.max_size]
ask = "Max size for each backup in Mb"
type = "number"
default = 500
help = "Specify the max size of each backup for the following option file_to_backup.</br>This option is a soft limit, that means the script will try to limit each backup to this max size if it can.</br>But there's 2 limitations, for a single directory, it can't makes more than one backup file, even if the files in this directory exceed this maximum size.</br>And, if there's some files in a directory, next to subdirectories, it'll make only one backup for this files.</br>So this limit will be applied to split the backup by its subdirectories to avoid to have only one big backup."
[main.overwrite_files]
name = "Overwriting config files"
[main.overwrite_files.overwrite_cron]
ask = "Overwrite the cron file during the upgrade ?"
type = "boolean"
default = true
help = "If the file is overwritten, a backup will be created."
[main.global_config]
name = "Global configuration"
[main.global_config.email_type]
ask = "Send HTML email to admin ?"
type = "boolean"
default = true
help = "Allow app scripts to send HTML mails instead of plain text."

View file

@ -6,7 +6,7 @@
"en": "Automatic backups", "en": "Automatic backups",
"fr": "Sauvegardes automatiques" "fr": "Sauvegardes automatiques"
}, },
"version": "1.3.3~ynh1", "version": "1.3.4~ynh1",
"url": "https://github.com/maniackcrudelis/archivist", "url": "https://github.com/maniackcrudelis/archivist",
"upstream": { "upstream": {
"license": "GPL-3.0", "license": "GPL-3.0",
@ -22,7 +22,7 @@
"email": "maniackc_dev@crudelis.fr" "email": "maniackc_dev@crudelis.fr"
}], }],
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.2.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [], "services": [],

View file

@ -66,9 +66,9 @@ ynh_core_backup="${YNH_CONFIG_MAIN_BACKUP_TYPES_CORE_BACKUP:-$old_ynh_core_backu
# ynh_app_backup # ynh_app_backup
if [ -n "$(get_config_value ynh_app_backup)" ] if [ -n "$(get_config_value ynh_app_backup)" ]
then then
old_ynh_app_backup="1" old_ynh_app_backup=true
else else
old_ynh_app_backup="0" old_ynh_app_backup=false
fi fi
ynh_app_backup="${YNH_CONFIG_MAIN_BACKUP_TYPES_APPS_BACKUP:-$old_ynh_app_backup}" ynh_app_backup="${YNH_CONFIG_MAIN_BACKUP_TYPES_APPS_BACKUP:-$old_ynh_app_backup}"
@ -124,7 +124,7 @@ apply_config() {
#================================================= #=================================================
# Change the password if needed # Change the password if needed
if [ "$encrypt" = "1" ] if [ "$encrypt" ]
then then
ynh_print_OFF ynh_print_OFF
test -n "$encrypt_password" || ynh_die --message="The password for encryption can't be empty if you choose to enable encryption." test -n "$encrypt_password" || ynh_die --message="The password for encryption can't be empty if you choose to enable encryption."
@ -182,7 +182,7 @@ apply_config() {
ynh_replace_string --match_string="^ynh_core_backup=.*" --replace_string="ynh_core_backup=$ynh_core_backup" --target_file="$config_file" ynh_replace_string --match_string="^ynh_core_backup=.*" --replace_string="ynh_core_backup=$ynh_core_backup" --target_file="$config_file"
# Change ynh_app_backup in the config file # Change ynh_app_backup in the config file
if [ "$ynh_app_backup" = "1" ] && [ "$old_ynh_app_backup" = "0" ] if [ "$ynh_app_backup" = true ] && [ "$old_ynh_app_backup" = false ]
then then
# If ynh_app_backup changed from false to true. # If ynh_app_backup changed from false to true.
# Add all current applications to the backup # Add all current applications to the backup
@ -191,7 +191,7 @@ apply_config() {
ynh_print_info --message="Add a backup for the app $backup_app." ynh_print_info --message="Add a backup for the app $backup_app."
ynh_replace_string --match_string="^ynh_app_backup=$" --replace_string="ynh_app_backup=$backup_app\n&" --target_file="$config_file" ynh_replace_string --match_string="^ynh_app_backup=$" --replace_string="ynh_app_backup=$backup_app\n&" --target_file="$config_file"
done <<< "$(yunohost app list -i | grep id: | sed 's/.*id: //')" done <<< "$(yunohost app list -i | grep id: | sed 's/.*id: //')"
elif [ "$ynh_app_backup" = "0" ] && [ "$old_ynh_app_backup" = "1" ] elif [ "$ynh_app_backup" = false ] && [ "$old_ynh_app_backup" = true ]
then then
# Remove all app currently backup # Remove all app currently backup
# By deleting all line starting by 'ynh_app_backup=' and having something after '=' # By deleting all line starting by 'ynh_app_backup=' and having something after '='