mirror of
https://github.com/YunoHost-Apps/phpinfo_ynh.git
synced 2024-09-03 19:56:23 +02:00
Merge pull request #16 from CodeShakingSheep/fix-php-version
Fix php version
This commit is contained in:
commit
0315e788bf
4 changed files with 38 additions and 8 deletions
|
@ -7,7 +7,7 @@ description.fr = "Simple phpinfo"
|
||||||
|
|
||||||
version = "1.0~ynh5"
|
version = "1.0~ynh5"
|
||||||
|
|
||||||
maintainers = ["Maniack Crudelis"]
|
maintainers = []
|
||||||
|
|
||||||
[upstream]
|
[upstream]
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
|
@ -42,8 +42,8 @@ ram.runtime = "50M"
|
||||||
ask.en = "Choose the version of PHP to use."
|
ask.en = "Choose the version of PHP to use."
|
||||||
ask.fr = "Choisissez la version de PHP à utiliser."
|
ask.fr = "Choisissez la version de PHP à utiliser."
|
||||||
type = "select"
|
type = "select"
|
||||||
choices = ["7.4", "8.0", "8.1", "8.2"]
|
choices = ["7.4", "8.0", "8.1", "8.2", "8.3"]
|
||||||
default = "8.2"
|
default = "8.3"
|
||||||
|
|
||||||
[resources]
|
[resources]
|
||||||
[resources.system_user]
|
[resources.system_user]
|
||||||
|
@ -54,5 +54,7 @@ ram.runtime = "50M"
|
||||||
main.url = "/"
|
main.url = "/"
|
||||||
|
|
||||||
[resources.apt]
|
[resources.apt]
|
||||||
packages = "php8.2-fpm"
|
packages = "nginx" # Kind of "dummy" value to be sure to have a non-empty dep list
|
||||||
|
packages_from_raw_bash = """
|
||||||
|
echo "php${phpversion}-fpm"
|
||||||
|
"""
|
||||||
|
|
|
@ -27,8 +27,9 @@ chown -R $app:www-data "$install_dir"
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Configuring PHP-FPM..."
|
ynh_script_progression --message="Configuring PHP-FPM..."
|
||||||
|
|
||||||
|
|
||||||
# Create a dedicated PHP-FPM config
|
# Create a dedicated PHP-FPM config
|
||||||
ynh_add_fpm_config
|
ynh_add_fpm_config --phpversion=$phpversion
|
||||||
|
|
||||||
# Create a dedicated NGINX config
|
# Create a dedicated NGINX config
|
||||||
ynh_add_nginx_config
|
ynh_add_nginx_config
|
||||||
|
|
|
@ -36,7 +36,7 @@ chown -R $app:www-data "$install_dir"
|
||||||
ynh_script_progression --message="Upgrading PHP-FPM configuration..."
|
ynh_script_progression --message="Upgrading PHP-FPM configuration..."
|
||||||
|
|
||||||
# Create a dedicated PHP-FPM config
|
# Create a dedicated PHP-FPM config
|
||||||
ynh_add_fpm_config
|
ynh_add_fpm_config --phpversion=$phpversion
|
||||||
|
|
||||||
# Create a dedicated NGINX config
|
# Create a dedicated NGINX config
|
||||||
ynh_add_nginx_config
|
ynh_add_nginx_config
|
||||||
|
|
29
tests.toml
29
tests.toml
|
@ -6,8 +6,35 @@ test_format = 1.0
|
||||||
# Tests to run
|
# Tests to run
|
||||||
# ------------
|
# ------------
|
||||||
|
|
||||||
exclude = ["install.private", "change_url"]
|
exclude = ["change_url"]
|
||||||
|
|
||||||
# -------------------------------
|
# -------------------------------
|
||||||
# Default args to use for install
|
# Default args to use for install
|
||||||
# -------------------------------
|
# -------------------------------
|
||||||
|
|
||||||
|
args.phpversion = "8.3"
|
||||||
|
|
||||||
|
# -------------------------------
|
||||||
|
# Commits to test upgrade from
|
||||||
|
# -------------------------------
|
||||||
|
|
||||||
|
[74_test]
|
||||||
|
|
||||||
|
only = ["install.subdir", "backup_restore", "upgrade" ]
|
||||||
|
args.phpversion = "7.4"
|
||||||
|
|
||||||
|
[80_test]
|
||||||
|
|
||||||
|
only = ["install.subdir", "backup_restore", "upgrade" ]
|
||||||
|
args.phpversion = "8.0"
|
||||||
|
|
||||||
|
[81_test]
|
||||||
|
|
||||||
|
only = ["install.subdir", "backup_restore", "upgrade" ]
|
||||||
|
args.phpversion = "8.1"
|
||||||
|
|
||||||
|
|
||||||
|
[82_test]
|
||||||
|
|
||||||
|
only = ["install.subdir", "backup_restore", "upgrade" ]
|
||||||
|
args.phpversion = "8.2"
|
||||||
|
|
Loading…
Reference in a new issue