From e745e8277169ea5868e4de21c7bfce98da8b841a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 22 Oct 2020 22:23:50 +0200
Subject: [PATCH] Remove sources

---
 README.md          |  2 +-
 conf/app.src       |  7 -------
 manifest.json      |  2 +-
 scripts/change_url | 14 +++++++-------
 scripts/remove     | 10 ----------
 5 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 conf/app.src

diff --git a/README.md b/README.md
index 3d9b110..3116a8c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 [Webmin](http://www.webmin.com/index.html) is a **web-based** interface for system **administration** for Unix. Using any modern web browser, you can setup user **accounts**, **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.955
+**Shipped version:** 1.941
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
deleted file mode 100644
index ea1a958..0000000
--- a/conf/app.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/webmin/webmin/archive/1.955.tar.gz
-SOURCE_SUM=19677b5e742351958f7ad2dde4512a18e68b8f8b1a0369a122f46f39f7e4a7f8
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index cd67900..3a22650 100644
--- a/manifest.json
+++ b/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.955~ynh1",
+    "version": "1.941~ynh2",
     "url": "http://www.webmin.com",
     "license": "BSD-3-Clause",
     "maintainer": {
diff --git a/scripts/change_url b/scripts/change_url
index f2ffc49..99b410c 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -25,7 +25,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..."
+ynh_script_progression --message="Backing up Webmin before changing its URL (may take a while)..."
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -71,19 +71,19 @@ ynh_script_progression --message="Updating NGINX web server configuration..." --
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-# Change the path in the nginx config file
+# Change the path in the NGINX config file
 if [ $change_path -eq 1 ]
 then
-	# Make a backup of the original nginx config file if modified
+	# Make a backup of the original NGINX config file if modified
 	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for nginx helper
+	# Set global variables for NGINX helper
 	domain="$old_domain"
 	path_url="$new_path"
-	# Create a dedicated nginx config
+	# Create a dedicated NGINX config
 	ynh_add_nginx_config
 fi
 
-# Change the domain for nginx
+# Change the domain for NGINX
 if [ $change_domain -eq 1 ]
 then
 	# Delete file checksum for the old conf file location
@@ -104,7 +104,7 @@ ynh_systemd_action --service_name=$app --action="start" --line_match="Started LS
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/remove b/scripts/remove
index 4a237e6..ba9427b 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -57,16 +57,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-
-if yunohost firewall list | grep -q "\- $port$"
-then
-	ynh_script_progression --message="Closing port $port..."
-	ynh_exec_warn_less yunohost firewall disallow TCP $port
-fi
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================