diff --git a/README.md b/README.md
index ebfd413..9dae77c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Cockpit for YunoHost
-[](https://dash.yunohost.org/appci/app/cockpit)  
+[](https://dash.yunohost.org/appci/app/cockpit)  
[](https://install-app.yunohost.org/?app=cockpit)
*[Lire ce readme en français.](./README_fr.md)*
@@ -19,31 +19,30 @@ Cockpit is a web-based graphical interface for servers, intended for everyone.
-**Shipped version:** 188~ynh1
-
-
+**Shipped version:** 188~ynh2
## Screenshots
-
+
## Documentation and resources
-* Official app website: https://cockpit-project.org/
-* Official admin documentation: https://cockpit-project.org/documentation.html
-* Upstream app code repository: https://github.com/cockpit-project/cockpit
-* YunoHost documentation for this app: https://yunohost.org/app_cockpit
-* Report a bug: https://github.com/YunoHost-Apps/cockpit_ynh/issues
+* Official app website:
+* Official admin documentation:
+* Upstream app code repository:
+* YunoHost documentation for this app:
+* Report a bug:
## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cockpit_ynh/tree/testing).
To try the testing branch, please proceed like that.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/cockpit_ynh/tree/testing --debug
or
sudo yunohost app upgrade cockpit -u https://github.com/YunoHost-Apps/cockpit_ynh/tree/testing --debug
```
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**More info regarding app packaging:**
diff --git a/README_fr.md b/README_fr.md
index 2681e2e..fcf3956 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,10 +1,14 @@
+
+
# Cockpit pour YunoHost
-[](https://dash.yunohost.org/appci/app/cockpit)  
+[](https://dash.yunohost.org/appci/app/cockpit)  
[](https://install-app.yunohost.org/?app=cockpit)
*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Cockpit rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@@ -15,31 +19,30 @@ Cockpit is a web-based graphical interface for servers, intended for everyone.
-**Version incluse :** 188~ynh1
-
-
+**Version incluse :** 188~ynh2
## Captures d'écran
-
+
## Documentations et ressources
-* Site officiel de l'app : https://cockpit-project.org/
-* Documentation officielle de l'admin : https://cockpit-project.org/documentation.html
-* Dépôt de code officiel de l'app : https://github.com/cockpit-project/cockpit
-* Documentation YunoHost pour cette app : https://yunohost.org/app_cockpit
-* Signaler un bug : https://github.com/YunoHost-Apps/cockpit_ynh/issues
+* Site officiel de l'app :
+* Documentation officielle de l'admin :
+* Dépôt de code officiel de l'app :
+* Documentation YunoHost pour cette app :
+* Signaler un bug :
## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/cockpit_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/cockpit_ynh/tree/testing --debug
ou
sudo yunohost app upgrade cockpit -u https://github.com/YunoHost-Apps/cockpit_ynh/tree/testing --debug
```
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :**
diff --git a/check_process b/check_process
index 6b536e2..db915f5 100644
--- a/check_process
+++ b/check_process
@@ -1,16 +1,20 @@
;; Test complet
; Manifest
domain="domain.tld"
+ path="/path"
; Checks
pkg_linter=1
- setup_sub_dir=0
+ setup_sub_dir=1
setup_root=1
setup_nourl=0
setup_private=0
setup_public=0
upgrade=1
+ # 188~ynh1
+ upgrade=1 from_commit=d94f20300b9296f5dbe879d025a5f481ecb15011
backup_restore=1
multi_instance=0
+ port_already_use=0
change_url=0
;;; Options
Email=
diff --git a/conf/nginx.conf b/conf/nginx.conf
index cf49999..37c6029 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -9,7 +9,6 @@ location __PATH__/ {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
-
- # Include SSOWAT user panel.
+ # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
}
diff --git a/manifest.json b/manifest.json
index 2a5a79f..3392189 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
"en": "Sysadmin login session in a web browser",
"fr": "Session de connexion sysadmin dans un navigateur Web"
},
- "version": "188~ynh1",
+ "version": "188~ynh2",
"url": "https://cockpit-project.org/",
"upstream": {
"license": "LGPL-2.1-only",
@@ -28,7 +28,7 @@
],
"arguments": {
"install": [
- {
+ {
"name": "domain",
"type": "domain"
},
diff --git a/scripts/install b/scripts/install
index 437ee60..7000613 100644
--- a/scripts/install
+++ b/scripts/install
@@ -96,6 +96,7 @@ yunohost service add $app
#=================================================
ynh_script_progression --message="Starting a systemd service..." --weight=2
+# Start a systemd service
ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started"
#=================================================
diff --git a/scripts/remove b/scripts/remove
index 028e55b..17169c8 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -29,7 +29,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null
then
- ynh_script_progression --message="Removing $app service..." --weight=1
+ ynh_script_progression --message="Removing $app service integration..." --weight=1
yunohost service remove $app
fi
diff --git a/scripts/restore b/scripts/restore
index 05b539d..8c924fa 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -93,4 +93,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="Restoration completed for $app" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index ebdac3e..6f813ab 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -55,7 +55,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
#=================================================
# NGINX CONFIGURATION
#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
# Create a dedicated NGINX config
ynh_add_nginx_config