diff --git a/check_process b/check_process index 84f86a2..7981b3c 100644 --- a/check_process +++ b/check_process @@ -6,7 +6,6 @@ language="fr" is_public=1 password="pass" - port="666" ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index 4a7fa13..6448b78 100644 --- a/manifest.json +++ b/manifest.json @@ -3,20 +3,20 @@ "id": "phpBB", "packaging_format": 1, "description": { - "en": "#1 free, opensource bulletin board software", - "fr": "Le 1er logiciel de forum libre et gratuit" + "en": "Forum software that is easy to use, powerful, and highly customisable", + "fr": "Forum facile à utiliser, puissant et hautement personnalisable" }, "version": "3.3.4~ynh1", "url": "http://www.phpbb.com/", "upstream": { - "license": "free", + "license": "GPL-2.0-only", "website": "http://www.phpbb.com/", "demo": "https://www.phpbb.com/demo/", "admindoc": "https://www.phpbb.com/support/docs/", "userdoc": "https://yunohost.org/apps", "code": "https://github.com/phpbb/phpbb" }, - "license": "free", + "license": "GPL-2.0-only", "maintainer": { "name": "polytan02", "email": "polytan02@mcgva.org" @@ -62,14 +62,6 @@ }, "example": "Choose a password" }, - { - "name": "admin_email", - "ask": { - "en": "Indicate phpBB admin email - Please make sure it exists on this server !", - "fr": "Renseignez un e-mail pour l'admin phpBB" - }, - "example": "admin@DOMAIN.TLD" - }, { "name": "language", "type": "string", @@ -79,16 +71,7 @@ }, "choices": ["fr", "en"], "default": "fr" - }, - { - "name": "curl_inst", - "ask": { - "en": "Automatically configure phpBB via cURL ? [BROKEN - DO NOT USE]", - "fr": "Configurer phpBB automatiquement via cURL ? [CASSE - NE PAS UTILISER]" - }, - "choices": ["Yes", "No"], - "default": "No" - } + } ] } } diff --git a/scripts/install b/scripts/install index 58607a1..ca1facd 100644 --- a/scripts/install +++ b/scripts/install @@ -128,7 +128,7 @@ ynh_permission_update --permission="main" --remove="visitors" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Forum bulletin board software solution" --log="/var/log/$app/$app.log" #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index 7875935..6c5e664 100644 --- a/scripts/remove +++ b/scripts/remove @@ -46,7 +46,7 @@ ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --time --weight=1 +ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" diff --git a/scripts/restore b/scripts/restore index d0497b2..c34793d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -91,7 +91,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="News feed reader and aggregator" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Forum bulletin board software solution" --log="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 057fcd1..8abb58f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -32,7 +32,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -46,7 +46,7 @@ ynh_abort_if_errors #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1 +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # Cleaning legacy permissions if ynh_legacy_permissions_exists; then @@ -63,7 +63,7 @@ fi #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1 +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -74,7 +74,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --time --weight=1 + 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="$final_path" @@ -87,7 +87,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=3 # Create a dedicated NGINX config ynh_add_nginx_config @@ -95,7 +95,7 @@ ynh_add_nginx_config #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config @@ -103,14 +103,14 @@ ynh_add_fpm_config #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Forum bulletin board software solution" --log="/var/log/$app/$app.log" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -118,4 +118,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --time --last +ynh_script_progression --message="Upgrade of $app completed" --last