Revert "Testing (#17)" (#25)

This reverts commit 64a84a3dc7.

README.md

@@ -17,11 +17,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Simple, Fast, Secure, Flat-File CMS
 
-**Shipped version:** 4.0.0-rc3~ynh1
+**Shipped version:** 3.14.0~ynh1
 
 
-**Demo:** https://demo.bludit.com
-
 ## Screenshots
 
 ![Screenshot of Bludit](./doc/screenshots/bludit_1_en.png)

README_fr.md

@@ -17,11 +17,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 CMS simple, rapide, sécurisé et à fichier plat
 
-**Version incluse :** 4.0.0-rc3~ynh1
+**Version incluse :** 3.14.0~ynh1
 
 
-**Démo :** https://demo.bludit.com
-
 ## Captures d'écran
 
 ![Capture d'écran de Bludit](./doc/screenshots/bludit_1_en.png)

check_process

@@ -11,7 +11,6 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=c619ee29991f96e53e5dfb91ad9eb2a6003359f0
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -19,6 +18,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=c619ee29991f96e53e5dfb91ad9eb2a6003359f0
-		name=Testing (#12)
+	; commit=CommitHash
+		name=Name and date of the commit.
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/bludit/bludit/archive/refs/tags/4.0.0-rc-3.tar.gz
-SOURCE_SUM=aac59bd694f589d6b914623a67bed663e88f344209ebb2a5c139f77871ab190b
+SOURCE_URL=https://github.com/bludit/bludit/archive/3.14.0.tar.gz
+SOURCE_SUM=4a411cdcd9d3412a87cc89f9f1067bef51533b8c9303f1bc34452e30ad5b586c
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

doc/DECRIPTION.md

@@ -1,5 +0,0 @@
-Bludit is a web application to build your own website or blog in seconds, it's completely free and open source. Bludit uses files in JSON format to store the content, you don't need to install or configure a database. You only need a web server with PHP support.
-
-Bludit is a Flat-File CMS.
-
-Bludit supports Markdown and HTML code for the content.

manifest.json

@@ -6,12 +6,11 @@
     "en": "Simple, Fast, Secure, Flat-File CMS",
     "fr": "CMS simple, rapide, sécurisé et à fichier plat"
   },
-    "version": "4.0.0-rc3~ynh1",
+  "version": "3.14.0~ynh1",
   "url": "www.bludit.com",
   "upstream": {
         "license": "MIT",
         "website": "www.bludit.com",
-        "demo": "https://demo.bludit.com",
         "admindoc": "https://docs.bludit.com/en/",
         "code": "https://github.com/bludit/bludit"
     },
@@ -26,7 +25,7 @@
   "multi_instance": true,
   "services": [
       "nginx",
-        "php8.0-fpm"
+      "php7.4-fpm"
   ],
   "arguments": {
     "install" : [

scripts/_common.sh

@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="8.0"
+YNH_PHP_VERSION="7.4"
 
-pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom"
+pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom"
 
 #=================================================
 # PERSONAL HELPERS

scripts/backup

@@ -51,4 +51,4 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 # END OF SCRIPT
 #=================================================
 
-ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info --message="Backup script completed for Bludit. (YunoHost will then actually copy those files to the archive)."

scripts/change_url

@@ -87,4 +87,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app" --last
+ynh_script_progression --message="Change of URL completed for Bludit" --last

scripts/install

@@ -23,7 +23,6 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
-phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -113,4 +112,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of $app completed" --last
+ynh_script_progression --message="Installation of Bludit completed" --last

scripts/remove

@@ -64,4 +64,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of $app completed" --last
+ynh_script_progression --message="Removal of Bludit completed" --last

scripts/restore

@@ -57,8 +57,9 @@ chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
 #=================================================
-# REINSTALL DEPENDENCIES
+# SPECIFIC RESTORATION
 #=================================================
+# REINSTALL DEPENDENCIES
 ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 
 # Define and install dependencies
@@ -78,6 +79,8 @@ ynh_script_progression --message="Restoring the NGINX web server configuration..
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
@@ -90,4 +93,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for $app" --last
+ynh_script_progression --message="Restoration completed for Bludit" --last

scripts/upgrade

@@ -122,4 +122,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of $app completed" --last
+ynh_script_progression --message="Upgrade of Bludit completed" --last