Fixed change-url issue

conf/.env

@@ -1,4 +1,4 @@
-ME_CONFIG_SITE_BASEURL=__PATH_URL__/
+ME_CONFIG_SITE_BASEURL=__PATH_URL__
 ME_CONFIG_BASICAUTH=false
 ME_CONFIG_BASICAUTH_USERNAME=
 ME_CONFIG_MONGODB_ENABLE_ADMIN=true

manifest.json

@@ -3,14 +3,13 @@
     "id": "mongo-express",
     "packaging_format": 1,
     "description": {
-        "en": "Mongo-express and a specific mongo database",
-        "fr": "Mongo database together with Mongo-express server "
+        "en": "Mongo-express admin server and optionally a Mongo database",
+        "fr": "Le serveur d'administration Mongo-express ainsi qu'optionnellement une base Mongo"
     },
     "version": "1.0~ynh2",
     "url": "https://github.com/mongo-express/mongo-express",
     "upstream": {
         "license": "free",
-        "website": "https://github.com/mongo-express/mongo-express",
         "code": "https://github.com/mongo-express/mongo-express"
     },
     "license": "MIT",

scripts/install

@@ -104,7 +104,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=1
+ynh_script_progression --message="Installing dependencies..." --weight=3
 
 ### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package.
 ### Those deb packages will be installed as dependencies of this package.
@@ -121,6 +121,9 @@ ynh_use_nodejs
 if [ $mongo_version != 'None' ]
 then
   ynh_install_mongo --mongo_version=$mongo_version
+else
+  # gives the mongo service name for the rest of installation
+  mongodb_servicename=mongod
 fi
 
 #=================================================
@@ -144,7 +147,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --weight=1
+ynh_script_progression --message="Setting up source files..." --weight=6
 
 ### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
 ### downloaded from an upstream source, like a git repository.
@@ -297,7 +300,7 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 ###		- As well as the section "INTEGRATE SERVICE IN YUNOHOST" in the restore script
 ###		- And the section "INTEGRATE SERVICE IN YUNOHOST" in the upgrade script
 
-yunohost service add $app --description="Mongo Express to easily access your mongo database" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mongo Express to easily administer your Mongo databases" --log="/var/log/$app/$app.log"
 
 ### Additional options starting with 3.8:
 ###

scripts/restore

@@ -103,7 +103,7 @@ chown -R $app:$app "$final_path"
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+ynh_script_progression --message="Reinstalling dependencies..." --weight=3
 
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
@@ -113,12 +113,15 @@ ynh_use_nodejs
 if [ $mongo_version != 'None' ]
 then
   ynh_install_mongo --mongo_version=$mongo_version
+else
+  # gives the mongo service name for the rest of installation
+  mongodb_servicename=mongod
 fi
 
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
@@ -159,7 +162,7 @@ chown $app:adm /var/log/$app
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="MongoExpress to administer your mongo database" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mongo Express to easily administer your Mongo databases" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE

scripts/upgrade

@@ -82,7 +82,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=1
+ynh_script_progression --message="Installing dependencies..." --weight=3
 
 ### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package.
 ### Those deb packages will be installed as dependencies of this package.
@@ -99,6 +99,9 @@ ynh_use_nodejs
 if [ $mongo_version != 'None' ]
 then
   ynh_install_mongo --mongo_version=$mongo_version
+else
+  # gives the mongo service name for the rest of installation
+  mongodb_servicename=mongod
 fi
 
 #=================================================
@@ -115,7 +118,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
+	ynh_script_progression --message="Upgrading source files..." --weight=6
 
 	# Download, check integrity, uncompress and patch the source from amd64.src
   ynh_setup_source --source_id=amd64 --dest_dir="$final_path"
@@ -140,7 +143,7 @@ ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -199,7 +202,7 @@ ynh_use_logrotate --non-append
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Mongo Express to easily access your mongo database" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mongo Express to easily administer your Mongo databases" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE