diff --git a/conf/config_horde.exp b/conf/config_horde.exp index 572d7ab..1730e00 100644 --- a/conf/config_horde.exp +++ b/conf/config_horde.exp @@ -1,13 +1,13 @@ #!/usr/bin/expect set timeout 10 -set final_path [lindex $argv 0] +set install_dir [lindex $argv 0] set db_name [lindex $argv 1] set db_user [lindex $argv 2] set db_password [lindex $argv 3] set admin_user [lindex $argv 4] -spawn php -d include_path=$final_path/pear/php $final_path/pear/webmail-install +spawn php -d include_path=$install_dir/pear/php $install_dir/pear/webmail-install expect "What database backend should we use?" send "mysql\r"; diff --git a/conf/init_horde_install.exp b/conf/init_horde_install.exp index 8aacdde..7bb73bb 100644 --- a/conf/init_horde_install.exp +++ b/conf/init_horde_install.exp @@ -1,10 +1,10 @@ #!/usr/bin/expect set timeout 10 -set final_path [lindex $argv 0] +set install_dir [lindex $argv 0] set horde_path [lindex $argv 1] -spawn $final_path/pear/pear -c $final_path/pear.conf run-scripts horde/horde_role +spawn $install_dir/pear/pear -c $install_dir/pear.conf run-scripts horde/horde_role expect "Filesystem location for the base Horde application" send "$horde_path\r"; diff --git a/conf/nginx.conf b/conf/nginx.conf index cbee582..0316a43 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/horde/; + alias __INSTALL_DIR__/horde/; index index.php; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 38fbc33..f0abc4a 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -358,7 +358,7 @@ request_terminate_timeout = 1d ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot -chdir = __FINALPATH__ +chdir = __INSTALL_DIR__ ; Redirect worker stdout and stderr into main error log. If not set, stdout and ; stderr will be redirected to /dev/null according to FastCGI specs. @@ -430,8 +430,8 @@ catch_workers_output = yes ; php_admin_flag[short_open_tag] = On ; Special settings for Horde -php_value[include_path] = "__FINALPATH__/pear/php:.:__FINALPATH__/horde/lib" -env[PHP_PEAR_SYSCONF_DIR] = __FINALPATH__ +php_value[include_path] = "__INSTALL_DIR__/pear/php:.:__INSTALL_DIR__/horde/lib" +env[PHP_PEAR_SYSCONF_DIR] = __INSTALL_DIR__ php_value[session.gc_divisor] = 20000 php_value[session.gc_probability] = 1 diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..51cd2d2 --- /dev/null +++ b/manifest.toml @@ -0,0 +1,91 @@ +packaging_format = 2 + +id = "horde" +name = "Horde" +description.en = "Groupware (webmail, adressbook, calendar)" +description.fr = "Groupware (webmail, carnet adresses, agenda)" + +version = "5.2.23~ynh1" + +maintainers = ["Josué Tille"] + +[upstream] +license = "LGPL-2.0" +website = "https://www.horde.org" +demo = "http://demo.horde.org" +admindoc = "https://wiki.horde.org" +code = "https://github.com/horde/base" +cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) +fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. + +[integration] +yunohost = ">= 11.0.9" +architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +multi_instance = true +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +[install] + [install.domain] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "domain" + + [install.path] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "path" + default = "/horde" + + [install.init_main_permission] + type = "group" + default = false + + [install.language] + ask.en = "Choose the application language" + ask.fr = "Choisissez la langue de l'application" + type = "string" + choices = ["bg", "de", "en", "es", "fi", "fo", "fr", "hr", "hu", "id", "is", "it", "lt", "lv", "mg", "mk", "mt", "nl", "pl", "pt", "ro", "ru", "sk", "so", "th", "tr", "uz"] + default = "en" + + [install.admin] + # this is a generic question - ask strings are automatically handled by Yunohost's core + 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?" + type = "boolean" + default = false + + [install.whups_install] + ask.en = "Install a ticket-tracking system (Whups)?" + type = "boolean" + default = false + + [install.sesha_install] + ask.en = "Install a Inventory Manager (Sesha)?" + type = "boolean" + default = false + + [install.ansel_install] + ask.en = "Install a full featured photo management (Ansel)?" + type = "boolean" + default = false + + [install.wicked_install] + ask.en = "Install a Wiki (Wicked)?" + type = "boolean" + default = false + +[resources] + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" + + [resources.database] + type = "mysql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 1c226dc..3d0e249 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,12 +6,8 @@ # PHP APP SPECIFIC #================================================= -YNH_PHP_VERSION="7.4" +#REMOVEME? YNH_PHP_VERSION="7.4" -php_dependencies="php-pear php$YNH_PHP_VERSION-imagick php$YNH_PHP_VERSION-tidy php$YNH_PHP_VERSION-bcmath" - -# dependencies used by the app (must be on a single line) -pkg_dependencies="expect php-pear $php_dependencies" #================================================= # PERSONAL HELPERS @@ -19,42 +15,42 @@ pkg_dependencies="expect php-pear $php_dependencies" patch_app() { local old_dir=$(pwd) - (cd "$final_path/horde" && patch -p1 < $YNH_CWD/../sources/sso_auth.patch) || echo "Unable to apply patches" + (cd "$install_dir/horde" && patch -p1 < $YNH_CWD/../sources/sso_auth.patch) || echo "Unable to apply patches" cd $old_dir } config_horde() { - ynh_backup_if_checksum_is_different --file "$final_path/horde/config/conf.php" - ynh_backup_if_checksum_is_different --file "$final_path/horde/imp/config/conf.php" - ynh_backup_if_checksum_is_different --file "$final_path/horde/config/registry.local.php" - ynh_backup_if_checksum_is_different --file "$final_path/horde/gollem/config/backends.local.php" - ynh_backup_if_checksum_is_different --file "$final_path/horde/ingo/config/backends.local.php" + ynh_backup_if_checksum_is_different --file "$install_dir/horde/config/conf.php" + ynh_backup_if_checksum_is_different --file "$install_dir/horde/imp/config/conf.php" + ynh_backup_if_checksum_is_different --file "$install_dir/horde/config/registry.local.php" + 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 "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __DOMAIN__ --replace_string "$domain" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __PATH__ --replace_string "$path_url" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __FINAL_PATH__ --replace_string "$final_path" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __DB_NAME__ --replace_string "$db_name" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __DB_USER__ --replace_string "$db_user" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __DB_PWD__ --replace_string "$db_pwd" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __ADMIN_USER__ --replace_string "$admin" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __SECRET_KEY__ --replace_string "$secret_key" --target_file "$final_path/horde/config/conf.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 __FINAL_PATH__ --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_USER__ --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" - cp ../conf/horde_imp_conf.php "$final_path/horde/imp/config/conf.php" + cp ../conf/horde_imp_conf.php "$install_dir/horde/imp/config/conf.php" - cp ../conf/horde_registry.php "$final_path/horde/config/registry.local.php" - ynh_replace_string --match_string __PATH__ --replace_string "$path_url" --target_file "$final_path/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" - cp ../conf/gollem_backends.php "$final_path/horde/gollem/config/backends.local.php" - ynh_replace_string --match_string __GOLLEM_DATA_DIR__ --replace_string "$gollem_data_dir" --target_file "$final_path/horde/gollem/config/backends.local.php" + cp ../conf/gollem_backends.php "$install_dir/horde/gollem/config/backends.local.php" + ynh_replace_string --match_string __GOLLEM_DATA_DIR__ --replace_string "$gollem_data_dir" --target_file "$install_dir/horde/gollem/config/backends.local.php" - cp ../conf/ingo_backends.php "$final_path/horde/ingo/config/backends.local.php" + cp ../conf/ingo_backends.php "$install_dir/horde/ingo/config/backends.local.php" - ynh_store_file_checksum --file "$final_path/horde/config/conf.php" - ynh_store_file_checksum --file "$final_path/horde/imp/config/conf.php" - ynh_store_file_checksum --file "$final_path/horde/config/registry.local.php" - ynh_store_file_checksum --file "$final_path/horde/gollem/config/backends.local.php" - ynh_store_file_checksum --file "$final_path/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" + ynh_store_file_checksum --file "$install_dir/horde/config/registry.local.php" + ynh_store_file_checksum --file "$install_dir/horde/gollem/config/backends.local.php" + ynh_store_file_checksum --file "$install_dir/horde/ingo/config/backends.local.php" } config_nginx() { @@ -67,35 +63,35 @@ add_nginx_autodiscovery() { nginx_domain_path=/etc/nginx/conf.d/$domain.d/* nginx_config_path="/etc/nginx/conf.d/$domain.d/$app.conf" grep "/Microsoft-Server-ActiveSync" $nginx_domain_path || echo "location /Microsoft-Server-ActiveSync { - return 301 https://\$server_name$path_url/rpc.php; + return 301 https://\$server_name$path/rpc.php; } " >> "$nginx_config_path" grep "/autodiscover/autodiscover.xml" $nginx_domain_path || echo "location /autodiscover/autodiscover.xml { - return 301 https://\$server_name$path_url/rpc.php; + return 301 https://\$server_name$path/rpc.php; } " >> "$nginx_config_path" grep "/Autodiscover/Autodiscover.xml" $nginx_domain_path || echo "location /Autodiscover/Autodiscover.xml { - return 301 https://\$server_name$path_url/rpc.php; + return 301 https://\$server_name$path/rpc.php; } " >> "$nginx_config_path" grep "/.well-known/caldav" $nginx_domain_path || echo "location /.well-known/caldav { - return 301 https://\$server_name$path_url/rpc.php; + return 301 https://\$server_name$path/rpc.php; } " >> "$nginx_config_path" grep "/.well-known/carddav" $nginx_domain_path || echo "location /.well-known/carddav { - return 301 https://\$server_name$path_url/rpc.php; + return 301 https://\$server_name$path/rpc.php; } " >> "$nginx_config_path" } set_permission() { - chown -R www-data:$app $final_path + chown -R www-data:$app $install_dir chown -R www-data:$app $gollem_data_dir - chmod u=rwX,g=rwX,o= -R $final_path + chmod u=rwX,g=rwX,o= -R $install_dir chmod u=rwX,g=rwX,o= -R $gollem_data_dir } diff --git a/scripts/backup b/scripts/backup index 25968d8..9cc47e5 100755 --- a/scripts/backup +++ b/scripts/backup @@ -14,24 +14,24 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Loading installation settings..." +#REMOVEME? ynh_print_info --message="Loading installation settings..." -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -42,7 +42,7 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE DATA DIR diff --git a/scripts/change_url b/scripts/change_url index 45a63ba..c5e898f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -13,63 +13,63 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS #================================================= -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH +#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN +#REMOVEME? old_path=$YNH_APP_OLD_PATH -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH +#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN +#REMOVEME? new_path=$YNH_APP_NEW_PATH -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? # Needed for helper "ynh_add_nginx_config" +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) # Add settings here as needed by your application -admin=$(ynh_app_setting_get --app=$app --key=admin) -port=$(ynh_app_setting_get --app=$app --key=port) -secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) -service_autodiscovery=$(ynh_app_setting_get --app=$app --key=service_autodiscovery) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) +#REMOVEME? admin=$(ynh_app_setting_get --app=$app --key=admin) +#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) +#REMOVEME? secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) +#REMOVEME? service_autodiscovery=$(ynh_app_setting_get --app=$app --key=service_autodiscovery) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +#REMOVEME? gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -change_domain=0 -if [ "$old_domain" != "$new_domain" ] +#REMOVEME? change_domain=0 +#REMOVEME? if [ "$old_domain" != "$new_domain" ] then - change_domain=1 + #REMOVEME? change_domain=1 fi -change_path=0 -if [ "$old_path" != "$new_path" ] +#REMOVEME? change_path=0 +#REMOVEME? if [ "$old_path" != "$new_path" ] then - change_path=1 + #REMOVEME? change_path=1 fi #================================================= @@ -79,33 +79,35 @@ fi #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +ynh_change_url_nginx_config + +#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # Change the path in the NGINX config file if [ $change_path -eq 1 ] then # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" +#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" +#REMOVEME? domain="$old_domain" +#REMOVEME? path="$new_path" # Create a dedicated NGINX config - ynh_add_nginx_config +#REMOVEME? ynh_add_nginx_config fi # Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf +#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" +#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi - +#REMOVEME? domain=$new_domain -path_url=$new_path -config_nginx +path=$new_path +#REMOVEME? config_nginx #================================================= # SPECIFIC MODIFICATIONS @@ -121,9 +123,9 @@ config_horde #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 7d16e63..020165d 100755 --- a/scripts/install +++ b/scripts/install @@ -13,49 +13,49 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC -language=$YNH_APP_ARG_LANGUAGE -admin=$YNH_APP_ARG_ADMIN -service_autodiscovery=$YNH_APP_ARG_SERVICE_AUTODISCOVERY -whups_install=$YNH_APP_ARG_WHUPS_INSTALL -sesha_install=$YNH_APP_ARG_SESHA_INSTALL -ansel_install=$YNH_APP_ARG_ANSEL_INSTALL -wicked_install=$YNH_APP_ARG_WICKED_INSTALL +#REMOVEME? domain=$YNH_APP_ARG_DOMAIN +#REMOVEME? path=$YNH_APP_ARG_PATH +#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC +#REMOVEME? language=$YNH_APP_ARG_LANGUAGE +#REMOVEME? admin=$YNH_APP_ARG_ADMIN +#REMOVEME? service_autodiscovery=$YNH_APP_ARG_SERVICE_AUTODISCOVERY +#REMOVEME? whups_install=$YNH_APP_ARG_WHUPS_INSTALL +#REMOVEME? sesha_install=$YNH_APP_ARG_SESHA_INSTALL +#REMOVEME? ansel_install=$YNH_APP_ARG_ANSEL_INSTALL +#REMOVEME? wicked_install=$YNH_APP_ARG_WICKED_INSTALL -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." +#REMOVEME? ynh_script_progression --message="Validating installation parameters..." -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +#REMOVEME? install_dir=/var/www/$app +#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." +#REMOVEME? ynh_script_progression --message="Storing installation settings..." -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url +#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain +#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path ynh_app_setting_set --app=$app --key=language --value=$language -ynh_app_setting_set --app=$app --key=admin --value=$admin +#REMOVEME? ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=service_autodiscovery --value=$service_autodiscovery ynh_app_setting_set --app=$app --key=whups_install --value=$whups_install ynh_app_setting_set --app=$app --key=sesha_install --value=$sesha_install @@ -101,41 +101,41 @@ fi #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=7 +#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=7 -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # CREATE A MYSQL DATABASE #================================================= -ynh_script_progression --message="Creating a MySQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Creating a MySQL database..." --weight=1 -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) +#REMOVEME? db_user=$db_name +#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name +#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src -mkdir $final_path -mkdir $final_path/data +mkdir $install_dir +mkdir $install_dir/data -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # PHP-FPM CONFIGURATION @@ -178,24 +178,24 @@ ynh_script_progression --message="Installing sources files..." --weight=7 chmod +x ../conf/init_horde_install.exp chmod +x ../conf/config_horde.exp -pear config-create "$final_path" "$final_path/pear.conf" -pear -c "$final_path/pear.conf" install -o -f pear +pear config-create "$install_dir" "$install_dir/pear.conf" +pear -c "$install_dir/pear.conf" install -o -f pear -pear_cmd="$final_path/pear/pear -c $final_path/pear.conf" +pear_cmd="$install_dir/pear/pear -c $install_dir/pear.conf" $pear_cmd config-set auto_discover 1 -$pear_cmd config-set data_dir $final_path/data +$pear_cmd config-set data_dir $install_dir/data $pear_cmd channel-discover pear.horde.org $pear_cmd install horde/horde_role -../conf/init_horde_install.exp "$final_path" "$final_path/horde" +../conf/init_horde_install.exp "$install_dir" "$install_dir/horde" -$pear_cmd config-set horde_dir "$final_path/horde" +$pear_cmd config-set horde_dir "$install_dir/horde" $pear_cmd install -a -B horde/webmail $optionnal_apps_list -PHP_PEAR_SYSCONF_DIR=$final_path ../conf/config_horde.exp "$final_path" "$db_name" "$db_user" "$db_pwd" "$admin" -secret_key=$(grep 'secret_key' "$final_path/horde/config/conf.php" | cut -d"'" -f4) +PHP_PEAR_SYSCONF_DIR=$install_dir ../conf/config_horde.exp "$install_dir" "$db_name" "$db_user" "$db_pwd" "$admin" +secret_key=$(grep 'secret_key' "$install_dir/horde/config/conf.php" | cut -d"'" -f4) ynh_app_setting_set --app=$app --key=secret_key --value="$secret_key" #================================================= @@ -226,16 +226,16 @@ set_permission #================================================= ynh_script_progression --message="Configuring log rotation..." --weight=1 -ynh_use_logrotate --logfile="$final_path/horde" --nonappend --specific_user www-data/horde -ynh_use_logrotate --logfile="$final_path/horde/services" --specific_user www-data/horde -ynh_use_logrotate --logfile="$final_path/horde/services/portal" --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde" --nonappend --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde/services" --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde/services/portal" --specific_user www-data/horde #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 -if [ "$is_public" = "0" ]; +#REMOVEME? if [ "$is_public" = "0" ]; then # Retire l'accès public ynh_app_setting_delete --app=$app --key=skipped_uris else @@ -245,9 +245,9 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index f74d710..b145380 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,15 +12,15 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -port=$(ynh_app_setting_get --app=$app --key=port) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # STANDARD REMOVE @@ -35,18 +35,18 @@ ynh_remove_logrotate #================================================= # REMOVE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Removing the MySQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the MySQL database..." --weight=1 # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +#REMOVEME? ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely -ynh_secure_remove --file="$final_path" +#REMOVEME? ynh_secure_remove --file="$install_dir" #================================================= # REMOVE NGINX CONFIGURATION @@ -67,10 +67,10 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies -ynh_remove_app_dependencies +#REMOVEME? ynh_remove_app_dependencies #================================================= # SPECIFIC REMOVE @@ -86,10 +86,10 @@ ynh_secure_remove --file="$gollem_data_dir" #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user -ynh_system_user_delete --username=$app +#REMOVEME? ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 9aba51d..bbb4d0f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -14,51 +14,51 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +#REMOVEME? test ! -d $install_dir \ + || ynh_die --message="There is already a directory: $install_dir " #================================================= # STANDARD RESTORATION STEPS #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=1 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" #================================================= # RESTORE THE DATA DIRECTORY @@ -74,10 +74,10 @@ mkdir -p $gollem_data_dir #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=5 +#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=5 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -96,10 +96,10 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Restoring the MySQL database..." --weight=1 -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= @@ -114,9 +114,9 @@ set_permission #================================================= ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 -ynh_use_logrotate --logfile="$final_path/horde" --nonappend --specific_user www-data/horde -ynh_use_logrotate --logfile="$final_path/horde/services" --specific_user www-data/horde -ynh_use_logrotate --logfile="$final_path/horde/services/portal" --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde" --nonappend --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde/services" --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde/services/portal" --specific_user www-data/horde #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 3241fc5..dc944d2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,21 +12,21 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -admin=$(ynh_app_setting_get --app=$app --key=admin) -service_autodiscovery=$(ynh_app_setting_get --app=$app --key=service_autodiscovery) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -port=$(ynh_app_setting_get --app=$app --key=port) -secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? admin=$(ynh_app_setting_get --app=$app --key=admin) +#REMOVEME? service_autodiscovery=$(ynh_app_setting_get --app=$app --key=service_autodiscovery) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) +#REMOVEME? secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +#REMOVEME? gollem_data_dir=$(ynh_app_setting_get --app=$app --key=gollem_data_dir) #================================================= # CHECK VERSION @@ -38,16 +38,16 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -57,13 +57,13 @@ ynh_abort_if_errors ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all +#REMOVEME? if ynh_legacy_permissions_exists; then +#REMOVEME? ynh_legacy_permissions_delete_all ynh_app_setting_delete --app=$app --key=is_public fi -# If final_path doesn't exist, create it +# If install_dir doesn't exist, create it if [ -z "$gollem_data_dir" ]; then gollem_data_dir=/home/yunohost.app/$app ynh_app_setting_set --app=$app --key=gollem_data_dir --value=$gollem_data_dir @@ -72,17 +72,17 @@ fi #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 +#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION @@ -107,9 +107,9 @@ config_nginx #================================================= ynh_script_progression --message="Upgrading source files..." --weight=6 -pear_cmd="$final_path/pear/pear -c $final_path/pear.conf" +pear_cmd="$install_dir/pear/pear -c $install_dir/pear.conf" $pear_cmd channel-update pear.horde.org -$pear_cmd upgrade -R $final_path -a -B -c pear.horde.org || true +$pear_cmd upgrade -R $install_dir -a -B -c pear.horde.org || true #================================================= # PATCH APPLICATION @@ -139,16 +139,16 @@ set_permission #================================================= ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 -ynh_use_logrotate --logfile="$final_path/horde" --nonappend --specific_user www-data/horde -ynh_use_logrotate --logfile="$final_path/horde/services" --specific_user www-data/horde -ynh_use_logrotate --logfile="$final_path/horde/services/portal" --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde" --nonappend --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde/services" --specific_user www-data/horde +ynh_use_logrotate --logfile="$install_dir/horde/services/portal" --specific_user www-data/horde #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT