diff --git a/README.md b/README.md index e82f281..66c1cd2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # phpBB for YunoHost -[![Integration level](https://dash.yunohost.org/integration/phpbb.svg)](https://dash.yunohost.org/appci/app/phpbb) ![Working status](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/phpbb.svg)](https://ci-apps.yunohost.org/ci/apps/phpbb/) ![Working status](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) [![Install phpBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpbb) diff --git a/README_es.md b/README_es.md index e8a2b3b..59375ae 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # phpBB para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/phpbb.svg)](https://dash.yunohost.org/appci/app/phpbb) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/phpbb.svg)](https://ci-apps.yunohost.org/ci/apps/phpbb/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) [![Instalar phpBB con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpbb) diff --git a/README_eu.md b/README_eu.md index 1f5c958..8525a08 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # phpBB YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/phpbb.svg)](https://dash.yunohost.org/appci/app/phpbb) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/phpbb.svg)](https://ci-apps.yunohost.org/ci/apps/phpbb/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) [![Instalatu phpBB YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpbb) diff --git a/README_fr.md b/README_fr.md index 1af3c36..c1b4277 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # phpBB pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/phpbb.svg)](https://dash.yunohost.org/appci/app/phpbb) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/phpbb.svg)](https://ci-apps.yunohost.org/ci/apps/phpbb/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) [![Installer phpBB avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpbb) diff --git a/README_gl.md b/README_gl.md index bede53b..7dd77c8 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # phpBB para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/phpbb.svg)](https://dash.yunohost.org/appci/app/phpbb) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/phpbb.svg)](https://ci-apps.yunohost.org/ci/apps/phpbb/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) [![Instalar phpBB con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpbb) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 7bcb55f..119a649 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 phpBB -[![集成程度](https://dash.yunohost.org/integration/phpbb.svg)](https://dash.yunohost.org/appci/app/phpbb) ![工作状态](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/phpbb.svg)](https://ci-apps.yunohost.org/ci/apps/phpbb/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/phpbb.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/phpbb.maintain.svg) [![使用 YunoHost 安装 phpBB](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpbb) diff --git a/scripts/backup b/scripts/backup index e4d961e..4855526 100644 --- a/scripts/backup +++ b/scripts/backup @@ -27,18 +27,8 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP VARIOUS FILES -#================================================= - ynh_backup --src_path="/etc/cron.d/$app" #================================================= diff --git a/scripts/install b/scripts/install index bc55bf8..98b5733 100644 --- a/scripts/install +++ b/scripts/install @@ -36,28 +36,28 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# SETUP APPLICATION WITH CLI +# APP INITIAL CONFIGURATION #================================================= -ynh_script_progression --message="Configuring $app..." --weight=1 +ynh_script_progression --message="Adding $app's configuration files..." --weight=1 -ynh_add_config --template="../conf/install-config.yml.default" --destination="$install_dir/install/install-config.yml" +ynh_add_config --template="install-config.yml.default" --destination="$install_dir/install/install-config.yml" ynh_exec_as "$app" php${phpversion} "$install_dir/install/phpbbcli.php" -q --no-interaction install "$install_dir/install/install-config.yml" mv "$install_dir/install" "$install_dir/install_old" #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config -ynh_add_config --template="../conf/phpbb.cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="phpbb.cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index aaeedba..5885780 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,15 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -29,13 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=50 - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -44,9 +28,13 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=5 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# RESTORE VARIOUS FILES +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring various files..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=50 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 23439bc..a6f6ab1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,23 +9,13 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="config.php images/ files/ store/" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --keep="config.php images/ files/ store/" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -38,13 +28,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 - # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # SPECIFIC UPGRADE