Updated ReadMe and Changelog files

Modified project versioning

CHANGELOG_AiutoPcAmico.md

@@ -0,0 +1,47 @@
+CHANGELOG for Debian Mail-in-a-Box (AiutoPcAmico)
+=========
+
+Versioning:
+vXX.YY.ZZ
+Where:
+
+* XX is the upstream project version
+* YY is the main release of the Debian Mail-in-a-Box project
+* ZZ are minor releases of the Debian Mail-in-a-Box project (usually small fixes)
+
+=========
+
+Version 67.1.0 (December 29, 2023)
+------------------------------
+
+* Added ability to disable greylist
+* Removed bootstrap.sh file, because we clone this repository each time
+* Changed default Mail-in-a-Box homepage (now displays a warning when someone tries to reach our server on box.\[domainname\]/index.php page)
+* Added some comments to identify AiutoPcAmico changes in the code
+* More restrictive Fail2Ban configuration
+* Updated ReadMe.md file and created CHANGELOG_AiutoPcAmico.md file
+
+Version 67.0.0 (December 28, 2023)
+------------------------------
+
+* Implemented upstream changes (see CHANGELOG.md for details)
+
+Version 65.1.1 (December 06, 2023)
+------------------------------
+
+* Modified SMTPd banner (now is more generic)
+
+Version 65.1.0 (December 05, 2023)
+------------------------------
+
+* Removed all packages related only to Ubuntu
+* Debian compatible packages installed
+* Updated php from version 8.0 to version 8.2
+* Disabled ownCloud, not compatible with php 8.2
+* Added systemd-resolved installation, for DNS broken after installing Debian Mail-in-a-Box
+
+Version 65.0.0 (December 05, 2023)
+------------------------------
+
+* Initial commit of this fork (Debian Mail-in-a-Box)
+* Implemented upstream changes (see CHANGELOG.md for details)

README.md

@@ -1,16 +1,20 @@
-# Mail-in-a-Box
+# Unofficial Debian Mail-in-a-Box
 
 =============
 
-Simple (I hope!) porting of Mailinabox to Debian 12.
+Simple porting of Mailinabox to Debian 12.
 Original project: [https://github.com/mailinabox/mailinabox](https://github.com/mail-in-a-box/mailinabox)
-Upstream current implemented version: *v67* (v67-AiutoPcAmico)
+
+## Version
+
+Current version: v67.1.0-AiutoPcAmico
+Upstream current implemented version: v67
 
 ## Changes implemented
 
 - Compatibility with Debian 12.
-- At the moment, OwnCloud is disabled, because it not supports php8.2
 - Updated php to version 8.2
+- At the moment, OwnCloud is disabled, because it not supports php8.2
 - Changed SMTP server sign
 - more restrictive Fail2Ban configuration
 - ask the user if he wants to disable the graylist
@@ -18,3 +22,10 @@ Upstream current implemented version: *v67* (v67-AiutoPcAmico)
 ## Future implementation
 
 - Changing the default index page more easily
+
+## Changelogs
+
+In this folder you can find 2 different changelog files:
+
+- CHANGELOG.md is from the upstream project
+- CHANGELOG_AiutoPcAmico.md relates to the changes made by AiutoPcAmico and strictly connected to the Debian porting

management/status_checks.py

@@ -912,10 +912,10 @@ def list_apt_updates(apt_update=True):
 	return pkgs
 
 def what_version_is_this(env):
-	# This function runs `git describe --always --abbrev=0` on the Mail-in-a-Box installation directory.
+	# START AiutoPcAmico modification
-	# Git may not be installed and Mail-in-a-Box may not have been cloned from github,
+	return "V67.1.0-AiutoPcAmico"
-	# so this function may raise all sorts of exceptions.
+	# END AiutoPcAmico modification
-	return "V67-AiutoPcAmico"
+
 
 def get_latest_miab_version():
 	# This pings https://mailinabox.email/setup.sh and extracts the tag named in
@@ -929,6 +929,7 @@ def get_latest_miab_version():
         return None
 
 def check_miab_version(env, output):
+	# START AiutoPcAmico modification
 	config = load_settings(env)
 
 	try:
@@ -940,14 +941,18 @@ def check_miab_version(env, output):
 		output.print_warning("You are running version Mail-in-a-Box %s. Mail-in-a-Box version check disabled by privacy setting." % this_ver)
 	else:
 		latest_ver = get_latest_miab_version()
+		# getting only first 3 characters, so I can compare with my version
 		
-		if this_ver == latest_ver:
+
-			output.print_ok("Mail-in-a-Box is up to date. You are running version %s." % this_ver)
+		if this_ver[0:3] == latest_ver[0:3]:
+			output.print_ok("AiutoPcAmico Mail-in-a-Box fork is up to date to the original project. You are running version %s.\nThere may be a new version of AiutoPcAmico. Go to github.com/aiutopcamico/debian-mailinabox to check " % this_ver)
 		elif latest_ver is None:
 			output.print_error("Latest Mail-in-a-Box version could not be determined. You are running version %s." % this_ver)
 		else:
-			output.print_error("A new version of Mail-in-a-Box is available. You are running version %s. The latest version is %s. For upgrade instructions, see https://mailinabox.email. "
+			output.print_error("A new version of upstream project is available. You are running version %s. The latest version is %s. For upgrade, go to github.com/aiutopcamico/debian-mailinabox and verify if a new version is available. "
 				% (this_ver, latest_ver))
+	# END AiutoPcAmico modification
+	
 
 def run_and_output_changes(env, pool):
 	import json