Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

4.3 #24

Merged
merged 2 commits into from
Nov 29, 2021
Merged

4.3 #24

Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
4.3
  • Loading branch information
ericgaspar committed Nov 25, 2021
commit e2d58067213e8cc7a8d036b5f59e4b9ecf1ccbcd
5 changes: 0 additions & 5 deletions conf/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;

try_files $uri @__NAME__;
Expand Down
5 changes: 2 additions & 3 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"email": "[email protected]"
},
"requirements": {
"yunohost": ">= 4.2.0"
"yunohost": ">= 4.3.0"
},
"multi_instance": true,
"services": [
Expand All @@ -32,8 +32,7 @@
"install" : [
{
"name": "domain",
"type": "domain",
"example": "example.com"
"type": "domain"
},
{
"name": "path",
Expand Down
5 changes: 1 addition & 4 deletions scripts/_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
# COMMON VARIABLES
#=================================================

# dependencies used by the app
pkg_dependencies="ffmpeg"

YNH_PHP_VERSION="7.3"

extra_php_dependencies="php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-mbstring"
pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-mbstring"

#=================================================
# PERSONAL HELPERS
Expand Down
3 changes: 2 additions & 1 deletion scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@ ynh_add_nginx_config
ynh_script_progression --message="Configuring PHP-FPM..." --weight=1

# 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

#=================================================
# SPECIFIC SETUP
#=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1

cp ../conf/config.yml "$final_path/config/"

Expand Down
8 changes: 1 addition & 7 deletions scripts/restore
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=1

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 "
test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "

#=================================================
# STANDARD RESTORATION STEPS
Expand Down Expand Up @@ -74,9 +71,6 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..."

ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

# Recreate a dedicated php-fpm config
ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"

#=================================================
# SPECIFIC RESTORATION
#=================================================
Expand Down
2 changes: 1 addition & 1 deletion scripts/upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ ynh_install_app_dependencies $pkg_dependencies
ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1

# 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

#=================================================
# SPECIFIC UPGRADE
Expand Down