Merge remote-tracking branch 'origin/testing' into upgrade

README.md

@@ -20,6 +20,8 @@ Simple, Fast, Secure, Flat-File CMS
 **Shipped version:** 3.14.1~ynh1
 
 
+**Demo:** https://demo.bludit.com
+
 ## Screenshots
 
 ![Screenshot of Bludit](./doc/screenshots/bludit_1_en.png)

README_fr.md

@@ -20,6 +20,8 @@ CMS simple, rapide, sécurisé et à fichier plat
 **Version incluse :** 3.14.1~ynh1
 
 
+**Démo :** https://demo.bludit.com
+
 ## Captures d'écran
 
 ![Capture d'écran de Bludit](./doc/screenshots/bludit_1_en.png)

check_process

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

doc/DECRIPTION.md

@@ -0,0 +1,5 @@
+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

@@ -11,43 +11,44 @@
   "upstream": {
         "license": "MIT",
         "website": "www.bludit.com",
+        "demo": "https://demo.bludit.com",
         "admindoc": "https://docs.bludit.com/en/",
         "code": "https://github.com/bludit/bludit"
     },
-  "license": "MIT",
+    "license": "MIT",
-  "maintainer": {
+    "maintainer": {
-    "name": "eric_G",
+        "name": "eric_G",
-    "email": ""
+        "email": ""
-  },
-  "requirements": {
-    "yunohost": ">= 11.0.9"
-  },
-  "multi_instance": true,
-  "services": [
-      "nginx",
-      "php7.4-fpm"
-  ],
-  "arguments": {
-    "install" : [
-    {
-      "name": "domain",
-      "type": "domain"
     },
-    {
+    "requirements": {
-      "name": "path",
+        "yunohost": ">= 11.0.9"
-      "type": "path",
+    },
-      "example": "/bludit",
+    "multi_instance": true,
-      "default": "/bludit"
+    "services": [
-      },
+        "nginx",
-    {
+        "php8.0-fpm"
-      "name": "is_public",
+    ],
-      "type": "boolean",
+    "arguments": {
-    "help": {
+        "install": [
-      "en": "If enabled, Bludit will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+            {
-      "fr": "Si cette case est cochée, Bludit sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+                "name": "domain",
-        },
+                "type": "domain"
-        "default": true
+            },
-      }
+            {
-    ]
+                "name": "path",
-  }
+                "type": "path",
+                "example": "/bludit",
+                "default": "/bludit"
+            },
+            {
+                "name": "is_public",
+                "type": "boolean",
+                "help": {
+                    "en": "If enabled, Bludit will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+                    "fr": "Si cette case est cochée, Bludit sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+                },
+                "default": true
+            }
+        ]
+    }
 }

scripts/_common.sh

@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"
 
-pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom"
+pkg_dependencies="php${YNH_PHP_VERSION}-gd 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 Bludit. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info --message="Backup script completed for $app. (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 Bludit" --last
+ynh_script_progression --message="Change of URL completed for $app" --last

scripts/install

@@ -23,6 +23,7 @@ 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
 
@@ -112,4 +113,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of Bludit completed" --last
+ynh_script_progression --message="Installation of $app completed" --last

scripts/remove

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

scripts/restore

@@ -56,10 +56,9 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
+#=================================================
 ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 
 # Define and install dependencies
@@ -79,8 +78,6 @@ 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
 #=================================================
@@ -93,4 +90,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for Bludit" --last
+ynh_script_progression --message="Restoration completed for $app" --last

scripts/upgrade

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