From 43cb68a8cd7a7d8b9624537a64cef6d7056502f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 23:11:03 +0100 Subject: [PATCH] cleaning --- doc/ADMIN.md | 2 +- manifest.toml | 12 ++++++++---- scripts/_common.sh | 21 +-------------------- scripts/backup | 2 +- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index aeec11a..d1e0cf4 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -47,4 +47,4 @@ For calendar, task and addressbook activeSync has been configured but not yet te - You need to create an identity before send an email. - To create this go in the settings wheel > Preferences > Global Preferences > Personal Information. - Complete the form and save it. -- You might be able to sed an email now. +- You might be able to send an email now. diff --git a/manifest.toml b/manifest.toml index 1501582..61050b7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,7 +23,7 @@ multi_instance = true ldap = false sso = false disk = "50M" -ram.build = "50M" +ram.build = "500M" ram.runtime = "50M" [install] @@ -36,7 +36,7 @@ ram.runtime = "50M" [install.init_main_permission] type = "group" - default = false + default = "visitors" [install.language] ask.en = "Choose the application language" @@ -49,28 +49,32 @@ ram.runtime = "50M" type = "user" [install.service_autodiscovery] - ask.en = "Would you like to enable the caldDav/cardDAV service autodiscovery?" - ask.fr = "Voulez-vous activer l'autodécouverte des services calDAV/cardDAV?" + ask.en = "Enable the caldDav/cardDAV service autodiscovery?" + ask.fr = "Activer l'autodécouverte des services calDAV/cardDAV ?" type = "boolean" default = false [install.whups_install] ask.en = "Install a ticket-tracking system (Whups)?" + ask.fr = "Installer un système de suivi des tickets (Whups) ?" type = "boolean" default = false [install.sesha_install] ask.en = "Install a Inventory Manager (Sesha)?" + ask.fr = "Installer un gestionnaire d'inventaire (Sesha) ?" type = "boolean" default = false [install.ansel_install] ask.en = "Install a full featured photo management (Ansel)?" + ask.fr = "Installer un gestion de photos (Ansel) ?" type = "boolean" default = false [install.wicked_install] ask.en = "Install a Wiki (Wicked)?" + ask.fr = "Installer un Wiki (Wicked) ?" type = "boolean" default = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 26a3ef2..430ca09 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -23,31 +23,12 @@ config_horde() { ynh_backup_if_checksum_is_different --file "$install_dir/horde/gollem/config/backends.local.php" ynh_backup_if_checksum_is_different --file "$install_dir/horde/ingo/config/backends.local.php" - #cp ../conf/horde_conf.php "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __DOMAIN__ --replace_string "$domain" --target_file "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __PATH__ --replace_string "$path" --target_file "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __INSTALL_DIR__ --replace_string "$install_dir" --target_file "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __DB_NAME__ --replace_string "$db_name" --target_file "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __DB_USER__ --replace_string "$db_user" --target_file "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __DB_PWD__ --replace_string "$db_pwd" --target_file "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __ADMIN__ --replace_string "$admin" --target_file "$install_dir/horde/config/conf.php" - #ynh_replace_string --match_string __SECRET_KEY__ --replace_string "$secret_key" --target_file "$install_dir/horde/config/conf.php" - + ynh_add_config --template="horde_conf.php" --destination="$install_dir/horde/config/conf.php" - ynh_add_config --template="/horde_imp_conf.php" --destination="$install_dir/horde/imp/config/conf.php" - #cp ../conf/horde_imp_conf.php "$install_dir/horde/imp/config/conf.php" - ynh_add_config --template="horde_registry.php" --destination="$install_dir/horde/config/registry.local.php" - #cp ../conf/horde_registry.php "$install_dir/horde/config/registry.local.php" - #ynh_replace_string --match_string __PATH__ --replace_string "$path" --target_file "$install_dir/horde/config/registry.local.php" - ynh_add_config --template="gollem_backends.php" --destination="$install_dir/horde/gollem/config/backends.local.php" - #cp ../conf/gollem_backends.php "$install_dir/horde/gollem/config/backends.local.php" - #ynh_replace_string --match_string __DATA_DIR__ --replace_string "$data_dir" --target_file "$install_dir/horde/gollem/config/backends.local.php" - ynh_add_config --template="ingo_backends.php" --destination="$install_dir/horde/ingo/config/backends.local.php" - #cp ../conf/ingo_backends.php "$install_dir/horde/ingo/config/backends.local.php" ynh_store_file_checksum --file "$install_dir/horde/config/conf.php" ynh_store_file_checksum --file "$install_dir/horde/imp/config/conf.php" diff --git a/scripts/backup b/scripts/backup index 144a7e8..7792996 100755 --- a/scripts/backup +++ b/scripts/backup @@ -25,7 +25,7 @@ ynh_backup --src_path="$install_dir" # BACKUP THE DATA DIR #================================================= -ynh_backup --src_path="$gollem_data_dir" +ynh_backup --src_path="$data_dir" --is_big #================================================= # BACKUP THE NGINX CONFIGURATION