From dfc1d3798b9151f3b4d6aa65d93fa993476eef1a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 20 Nov 2021 08:32:08 +0100 Subject: [PATCH] Update to 4.3 --- check_process | 4 ++-- conf/app.src | 1 - conf/core-plugins.src | 1 - conf/cron | 2 +- conf/nginx.conf | 5 ----- doc/DESCRIPTION.md | 1 + manifest.json | 15 ++++----------- scripts/_common.sh | 5 +---- scripts/change_url | 11 ----------- scripts/install | 2 +- scripts/restore | 4 +--- scripts/upgrade | 2 +- 12 files changed, 12 insertions(+), 41 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/check_process b/check_process index 5b95bbf..9c79a58 100644 --- a/check_process +++ b/check_process @@ -21,9 +21,9 @@ # 1.14.3 #upgrade=1 from_commit=fe0bd01ffa787713e2b36408abe1e44033aacb69 # 1.15.2~ynh1 - upgrade=1 from_commit=20349f58ebb98ce87d3a80da18f11a7bafa04985 + #upgrade=1 from_commit=20349f58ebb98ce87d3a80da18f11a7bafa04985 # 1.15.2~ynh2 - upgrade=1 from_commit=55e224ea95f384ab8db46941366b0205cd8d3032 + #upgrade=1 from_commit=55e224ea95f384ab8db46941366b0205cd8d3032 # 1.15.3.1~ynh1 upgrade=1 from_commit=049b860396347599e0633adf277549146644e460 backup_restore=1 diff --git a/conf/app.src b/conf/app.src index 36d568b..906e2ba 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,5 +3,4 @@ SOURCE_SUM=6c7cf5fe74258dd0beac6176c438468f468a0a3f07f1f6a0349cc68a9e514302 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/conf/core-plugins.src b/conf/core-plugins.src index 06cd7a7..4ac451c 100644 --- a/conf/core-plugins.src +++ b/conf/core-plugins.src @@ -3,4 +3,3 @@ SOURCE_SUM=ab2518d70454faad37666f47b41f6bc861c8928b44f574307c1494e9df8ff591 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/cron b/conf/cron index b89531a..ad040da 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -*/5 * * * * nobody php __FINALPATH__/api/cron.php \ No newline at end of file +*/5 * * * * nobody /usr/bin/php__PHPVERSION__ __FINALPATH__/api/cron.php \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 556b622..549b52a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..b743073 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +osTicket is a widely-used open source support ticket system. It seamlessly integrates inquiries created via email, phone and web-based forms into a simple easy-to-use multi-user web interface. Manage, organize and archive all your support requests and responses in one place while providing your customers with accountability and responsiveness they deserve. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4c9e0e9..331dc32 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.1.7.3" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -32,8 +32,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -43,8 +42,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", @@ -63,12 +61,7 @@ }, { "name": "password", - "type": "password", - "ask": { - "en": "Set the administrator password", - "fr": "Définissez le mot de passe administrateur" - }, - "example": "Choose a password" + "type": "password" } ] } diff --git a/scripts/_common.sh b/scripts/_common.sh index 5d59d5d..edc1383 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,12 +4,9 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -pkg_dependencies="curl" - YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-curl" +pkg_dependencies="curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-curl" #================================================= # PERSONAL HELPERS diff --git a/scripts/change_url b/scripts/change_url index 213ce6c..7ac738f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,11 +29,6 @@ ynh_script_progression --message="Loading installation settings..." # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) - #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= @@ -98,12 +93,6 @@ then ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi -#================================================= -# SPECIFIC MODIFICATIONS -#================================================= -# ... -#================================================= - #================================================= # GENERIC FINALISATION #================================================= diff --git a/scripts/install b/scripts/install index 1445326..c9d06b5 100644 --- a/scripts/install +++ b/scripts/install @@ -120,7 +120,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/restore b/scripts/restore index 39fd74a..f175025 100644 --- a/scripts/restore +++ b/scripts/restore @@ -39,8 +39,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -80,7 +78,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 28938ba..741a130 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -127,7 +127,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #=================================================