Merge pull request #14 from YunoHost-Apps/testing

2.15.3

README.md

@@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Dotclear is an open-source web publishing software.
 
-**Shipped version:** 2.15.1
+**Shipped version:** 2.15.3
 
 ## Screenshots
 

check_process

@@ -6,7 +6,6 @@
 		path="/path"	(PATH)
 		admin="john"	(USER)
 		is_public=1	(PUBLIC|public=1|private=0)
-		password="pass"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -21,16 +20,7 @@
 		port_already_use=0
 		change_url=0
 ;;; Levels
-	Level 1=auto
-	Level 2=auto
-	Level 3=auto
-	Level 4=1
 	Level 5=auto
-	Level 6=auto
-	Level 7=auto
-	Level 8=0
-	Level 9=0
-	Level 10=0
 ;;; Options
 Email=
 Notification=none

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.15.1.tar.gz
-SOURCE_SUM=6721afc77c7ab4a3278b2fdb90561fc8
+SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.15.3.tar.gz
+SOURCE_SUM=86696da434edabbac0fc62781ed3ca93
 SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,7 +6,7 @@
         "en": "Blog publishing application",
         "fr": "Moteur de blog"
     },
-    "version": "2.15.1~ynh1",
+    "version": "2.15.3~ynh1",
     "license": "GPL-2.0-or-later",
     "url": "https://dotclear.org/",
     "maintainer": {
@@ -48,13 +48,6 @@
                     "en": "Choose a yunohost user as dotclear admin"
                 }
             },
-            {
-                "name": "password",
-                "type": "password",
-                "ask": {
-                    "en": "Choose a dotclear password for this user"
-                }
-            },
             {
                 "name": "is_public",
                 "type": "boolean",

scripts/install

@@ -29,7 +29,6 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 admin=$YNH_APP_ARG_ADMIN
-password=$YNH_APP_ARG_PASSWORD
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -52,7 +51,6 @@ ynh_app_setting_set $app domain $domain
 ynh_app_setting_set $app path $path_url
 ynh_app_setting_set $app is_public $is_public
 ynh_app_setting_set $app admin $admin
-ynh_app_setting_set $app password $password
 
 #=================================================
 # CREATE A MYSQL DATABASE
@@ -105,12 +103,15 @@ ynh_add_fpm_config
 
 php_config=$final_path/inc/config.php
 
-master_key=$(dd if=/dev/urandom bs=1 count=200 2>/dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p')
-firstname=$(yunohost user info $admin | grep firstname: | cut -d' ' -f2 | tr -d '\n')
-lastname=$(yunohost user info $admin | grep lastname: | cut -d' ' -f2 | tr -d '\n')
-email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n')
+master_key=$(ynh_string_random 30)
 ynh_app_setting_set $app master_key $master_key
 
+firstname=$(ynh_user_get_info $admin firstname)
+lastname=$(ynh_user_get_info $admin lastname)
+email=$(ynh_user_get_info $admin mail)
+
+password=$(ynh_string_random 30)
+
 cp $php_config.in $php_config
 cp ../conf/class.auth.ldap.php $final_path/inc/class.auth.ldap.php
 

scripts/upgrade

@@ -52,6 +52,11 @@ if [ -z $final_path ]; then
 	ynh_app_setting_set $app final_path $final_path
 fi
 
+# If password exists, remove it
+if [ ! -z $password ]; then
+	ynh_app_setting_delete $app password
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================