mirror of
https://github.com/YunoHost-Apps/flarum_ynh.git
synced 2024-09-03 18:36:24 +02:00
Merge pull request #191 from YunoHost-Apps/testing
This commit is contained in:
commit
e2784eb0fb
9 changed files with 31 additions and 29 deletions
|
@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
||||||
|
|
||||||
Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community.
|
Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community.
|
||||||
|
|
||||||
**Shipped version:** 1.3.1~ynh1
|
**Shipped version:** 1.4.0~ynh1
|
||||||
|
|
||||||
**Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum
|
**Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
||||||
|
|
||||||
Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté.
|
Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté.
|
||||||
|
|
||||||
**Version incluse :** 1.3.1~ynh1
|
**Version incluse :** 1.4.0~ynh1
|
||||||
|
|
||||||
**Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum
|
**Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
SOURCE_URL=https://github.com/flarum/flarum/archive/v1.3.0.zip
|
SOURCE_URL=https://github.com/flarum/flarum/archive/v1.4.0.zip
|
||||||
SOURCE_SUM=78955c2f34f32593738b6e1908b282bb92fe50c4e3d33b5492f46fc19309084e
|
SOURCE_SUM=7d8a529d0e83a17a4d97304d78446c1e5c192b7c979cb88c272d3f0a77646b90
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FORMAT=zip
|
SOURCE_FORMAT=zip
|
||||||
SOURCE_IN_SUBDIR=true
|
SOURCE_IN_SUBDIR=true
|
||||||
|
|
|
@ -4,10 +4,6 @@ location __PATH__/ {
|
||||||
# Path to source
|
# Path to source
|
||||||
alias __FINALPATH__/public/ ;
|
alias __FINALPATH__/public/ ;
|
||||||
|
|
||||||
if ($scheme = http) {
|
|
||||||
rewrite ^ https://$server_name$request_uri? permanent;
|
|
||||||
}
|
|
||||||
|
|
||||||
index index.php;
|
index index.php;
|
||||||
|
|
||||||
# Bug in Nginx with locations and aliases (see http://stackoverflow.com/a/35102259 )
|
# Bug in Nginx with locations and aliases (see http://stackoverflow.com/a/35102259 )
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"fr": "Forum de nouvelle génération, simplement",
|
"fr": "Forum de nouvelle génération, simplement",
|
||||||
"de": "Forum der nächsten Generation leicht gemacht"
|
"de": "Forum der nächsten Generation leicht gemacht"
|
||||||
},
|
},
|
||||||
"version": "1.3.1~ynh1",
|
"version": "1.4.0~ynh1",
|
||||||
"url": "http://flarum.org/",
|
"url": "http://flarum.org/",
|
||||||
"upstream": {
|
"upstream": {
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|
|
@ -2,18 +2,18 @@
|
||||||
# COMMON VARIABLES
|
# COMMON VARIABLES
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
# dependencies used by the app
|
|
||||||
pkg_dependencies=""
|
|
||||||
|
|
||||||
swap_needed=1024
|
swap_needed=1024
|
||||||
|
|
||||||
|
# PHP
|
||||||
YNH_PHP_VERSION="7.3"
|
YNH_PHP_VERSION="7.3"
|
||||||
YNH_COMPOSER_VERSION="2.0.13"
|
YNH_COMPOSER_VERSION="2.0.13"
|
||||||
|
|
||||||
extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip"
|
extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip"
|
||||||
|
|
||||||
|
# dependencies used by the app
|
||||||
|
pkg_dependencies="$extra_php_dependencies"
|
||||||
|
|
||||||
# Version numbers
|
# Version numbers
|
||||||
project_version="1.3.0"
|
project_version="1.4.0"
|
||||||
#core_version is now retrieved from the manifest
|
#core_version is now retrieved from the manifest
|
||||||
ldap_version="*"
|
ldap_version="*"
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ ynh_add_nginx_config
|
||||||
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 --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)
|
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -126,7 +126,9 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_print_info --message="Adding swap..."
|
ynh_print_info --message="Adding swap..."
|
||||||
|
|
||||||
ynh_add_swap --size=$swap_needed
|
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then
|
||||||
|
ynh_add_swap --size=$swap_needed
|
||||||
|
fi
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# INSTALL COMPOSER DEPENDENCIES
|
# INSTALL COMPOSER DEPENDENCIES
|
||||||
|
|
|
@ -71,16 +71,6 @@ chmod 750 "$final_path"
|
||||||
chmod -R o-rwx "$final_path"
|
chmod -R o-rwx "$final_path"
|
||||||
chown -R $app:www-data "$final_path"
|
chown -R $app:www-data "$final_path"
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# RESTORE THE PHP-FPM CONFIGURATION
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Restoring the 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
|
# SPECIFIC RESTORATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -91,6 +81,16 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=2
|
||||||
# Define and install dependencies
|
# Define and install dependencies
|
||||||
ynh_install_app_dependencies $pkg_dependencies
|
ynh_install_app_dependencies $pkg_dependencies
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# RESTORE THE PHP-FPM CONFIGURATION
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Restoring the 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
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RESTORE THE MYSQL DATABASE
|
# RESTORE THE MYSQL DATABASE
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -105,7 +105,9 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Adding swap..."
|
ynh_script_progression --message="Adding swap..."
|
||||||
|
|
||||||
ynh_add_swap --size=$swap_needed
|
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then
|
||||||
|
ynh_add_swap --size=$swap_needed
|
||||||
|
fi
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RESTORE THE LOGROTATE CONFIGURATION
|
# RESTORE THE LOGROTATE CONFIGURATION
|
||||||
|
|
|
@ -158,7 +158,7 @@ ynh_install_app_dependencies $pkg_dependencies
|
||||||
ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1
|
ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1
|
||||||
|
|
||||||
# Create a dedicated php-fpm config
|
# 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)
|
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -168,7 +168,9 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Adding swap..."
|
ynh_script_progression --message="Adding swap..."
|
||||||
|
|
||||||
ynh_add_swap --size=$swap_needed
|
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then
|
||||||
|
ynh_add_swap --size=$swap_needed
|
||||||
|
fi
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# COMPOSER AND FLARUM UPGRADE
|
# COMPOSER AND FLARUM UPGRADE
|
||||||
|
|
Loading…
Add table
Reference in a new issue