Merge pull request #20 from YunoHost-Apps/example

Upgrade to 1.984~ynh1

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Webmin is a web-based interface for system administration for Unix. Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more. Webmin removes the need to manually edit Unix configuration files like `/etc/passwd`, and lets you manage a system from the console or remotely.
 
-**Shipped version:** 1.979~ynh2
+**Shipped version:** 1.984~ynh1
 
 
 
@@ -27,7 +27,6 @@ Webmin is a web-based interface for system administration for Unix. Using any mo
 
 ## Disclaimers / important information
 
-* Other infos that people should be aware of, such as:
 * This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values.
 * Only **root** (system user) can connect 
 * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed.

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Webmin is a web-based interface for system administration for Unix. Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more. Webmin removes the need to manually edit Unix configuration files like `/etc/passwd`, and lets you manage a system from the console or remotely.
 
-**Version incluse :** 1.979~ynh2
+**Version incluse :** 1.984~ynh1
 
 
 
@@ -23,7 +23,6 @@ Webmin is a web-based interface for system administration for Unix. Using any mo
 
 ## Avertissements / informations importantes
 
-* Other infos that people should be aware of, such as:
 * This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values.
 * Only **root** (system user) can connect 
 * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed.

check_process

@@ -12,6 +12,8 @@
 		upgrade=1
 		# 1.979~ynh1
 		upgrade=1	from_commit=157310ca395c326add85d24fa397f7fd0cadefb1
+		# 1.979~ynh2
+		upgrade=1	from_commit=99875e2b4c69f9ef22b05f565eeab52a8befb566
 		backup_restore=1
 		multi_instance=0
 		port_already_use=0
@@ -21,4 +23,6 @@ Email=
 Notification=none
 ;;; Upgrade options
 	; commit=157310ca395c326add85d24fa397f7fd0cadefb1
-		name=1.979~ynh1.
+		name=1.979~ynh1
+	; commit=99875e2b4c69f9ef22b05f565eeab52a8befb566
+		name=1.979~ynh2

conf/nginx.conf

@@ -18,7 +18,8 @@ location __PATH__ {
   proxy_busy_buffers_size    256k;
   proxy_temp_file_write_size 256k;
 
+  more_clear_input_headers 'Accept-Encoding';
+
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
-    more_clear_input_headers 'Accept-Encoding';
 }

doc/DISCLAIMER.md

@@ -1,4 +1,3 @@
-* Other infos that people should be aware of, such as:
 * This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values.
 * Only **root** (system user) can connect 
 * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed.

manifest.json

@@ -6,7 +6,7 @@
         "en": "Web-based interface for system administration for Unix",
         "fr": "Interface Web d'administration système pour Unix"
     },
-    "version": "1.979~ynh2",
+    "version": "1.984~ynh1",
     "url": "http://www.webmin.com",
     "upstream": {
         "license": "BSD-3-Clause",
@@ -19,7 +19,7 @@
         "email": "anmol@datamol.org"
     },
     "requirements": {
-        "yunohost": ">= 4.2.3"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [

scripts/remove

@@ -42,14 +42,6 @@ ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB
 systemctl disable $app.service --quiet
 systemctl daemon-reload
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..."
-
-# Remove metapackage and its dependencies
-ynh_exec_warn_less ynh_remove_app_dependencies
-
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
@@ -58,6 +50,14 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..."
+
+# Remove metapackage and its dependencies
+ynh_exec_warn_less ynh_remove_app_dependencies
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

scripts/restore

@@ -32,14 +32,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 port=$(ynh_app_setting_get --app=$app --key=port)
 
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..."
-
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================