Merge branch 'hotfix/2.4.4'

brainupdaters · May 25, 2022 · d222193 · d222193
2 parents ab5ebe6 + 280493c
commit d222193
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 51 deletions.
diff --git a/doc/drlm-release-notes.rst b/doc/drlm-release-notes.rst
@@ -64,6 +64,17 @@ DRLM are compatible with previous versions, unless otherwise noted.
 
 The references pointing to fix #nr or issue #nr refer to our issues tracker
 
+DRLM Version 2.4.4 (May 2022) - Release Notes
+-----------------------------------------------
+  * Bugfix in installclient, new dependencies added
+
+  * Bugfix in logs maintenance
+
+  * Remove ReaR crontab file in install client
+
+  * Bugfix prevent hostnames from being localhost
+
+
 DRLM Version 2.4.3 (April 2022) - Release Notes
 -----------------------------------------------
   * New! RedHat 9 client & server support

diff --git a/etc/cron.d/drlm b/etc/cron.d/drlm
@@ -1 +1,3 @@
 * * * * * root /usr/sbin/drlm sched --run
+0 1 * * * root /usr/bin/find /var/log/drlm/debug/ -type f -mtime +30 -delete;
+0 1 * * * root /usr/bin/find /var/log/drlm/rear/ -type f -mtime +30 -delete;
diff --git a/etc/drlm/rsyncd/rsyncd.motd b/etc/drlm/rsyncd/rsyncd.motd
@@ -1 +1 @@
-DRLM server 2.4.3
+DRLM server 2.4.4
diff --git a/etc/logrotate.d/drlm b/etc/logrotate.d/drlm
@@ -1,16 +1,7 @@
 /var/log/drlm/drlm.log
 /var/log/drlm/drlm-rsyncd.log
 /var/log/drlm/drlm-sched.log 
-/var/log/drlm/drlm-api.log {
-    missingok
-    weekly
-    rotate 3
-    size 10M
-    compress
-    delaycompress
-    create
-    copytruncate
-}
+/var/log/drlm/drlm-api.log 
 /var/log/drlm/drlm-proxy.log {
     missingok
     weekly
@@ -21,10 +12,3 @@
     create
     copytruncate
 }
-/var/log/drlm/rear/*
-/var/log/drlm/debug/* {
-    missingok
-    rotate 0
-    daily
-    maxage 30
-}
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,11 @@
+drlm (2.4.4) stable release; urgency=high
+  * Bugfix in install client, new dependencies added
+  * Bugfix in logs maintenance
+  * Remove ReaR crontab file in install client
+  * Bugfix prevent hostnames from being localhost
+
+ -- Pau Roura <[email protected]>  Tue, 24 May 2022 00:00:00 +0100
+
 drlm (2.4.3) stable release; urgency=high
   * New! RedHat 9 client & server support
   * Bugfix database creation

diff --git a/packaging/debian/drlm.dsc b/packaging/debian/drlm.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: drlm
-Version: 2.4.3
+Version: 2.4.4
 Binary: drlm
 Maintainer: Pau Roura ([email protected])
 Architecture: all

diff --git a/packaging/debian/preinst b/packaging/debian/preinst
@@ -3,7 +3,12 @@ set -e
 
 case "$1" in
   install)
-    # do something
+    # check host name is not localhost
+    currhostname="$(/usr/bin/hostname -s)"
+    if [ "$currhostname" = "localhost" ]; then
+      echo "Its important that DRLM servers have a valid hostname. Please change \"localhost\" host name. "
+      exit 1
+    fi
     ;;
 
   upgrade)

diff --git a/packaging/rpm/drlm.spec b/packaging/rpm/drlm.spec
@@ -10,7 +10,7 @@
 
 Summary: DRLM
 Name: drlm
-Version: 2.4.3
+Version: 2.4.4
 Release: 1%{?rpmrelease}%{?dist}
 License: GPLv3
 Group: Applications/File
@@ -88,6 +88,7 @@ DR images easily managed by DRLM.
 Professional services and support are available.
 
 %prep
+
 %setup -q
 
 ### Add a specific os.conf so we do not depend on LSB dependencies
@@ -104,6 +105,14 @@ Professional services and support are available.
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
 
+%pretrans
+# check host name is not localhost
+currhostname="$(/usr/bin/hostname -s)"
+if [ "$currhostname" = "localhost" ]; then
+  echo "Its important that DRLM servers have a valid hostname. Please change \"localhost\" host name. "
+  exit 1
+fi
+
 %pre
 ### If --> is upgrade save old data and stop systemd services
 if [ "$1" == "2" ]; then
@@ -307,6 +316,12 @@ systemctl start drlm-tftpd.service
 
 %changelog
 
+* Tue May 24 2022 Pau Roura <[email protected]> 2.4.4
+- Bugfix in installclient, new dependencies added
+- Bugfix in logs maintenance
+- Remove ReaR crontab file in install client
+- Bugfix prevent hostnames from being localhost
+
 * Thu Apr 21 2022 Pau Roura <[email protected]> 2.4.3
 - New! RedHat 9 client & server support
 - Bugfix database creation

diff --git a/usr/sbin/drlm b/usr/sbin/drlm
@@ -48,7 +48,7 @@ readonly INITIAL_BASH_FLAGS_AND_OPTIONS_COMMANDS="$( get_bash_flags_and_options_
 # Versioning
 readonly PRODUCT="Disaster Recovery Linux Manager"
 readonly PROGRAM=${0##*/}
-readonly VERSION=2.4.3
+readonly VERSION=2.4.4
 readonly RELEASE_DATE="Git"
 
 readonly STARTTIME=$SECONDS

diff --git a/usr/share/drlm/client/add/default/059_check_workflow_params.sh b/usr/share/drlm/client/add/default/059_check_workflow_params.sh
@@ -44,11 +44,14 @@ if [ -z "$CLI_NAME" ]; then
   fi
 fi
 
-# Check if the client name is in DRLM client database
+# Check if the client name is in DRLM client database and not localhost
 Log "Checking if client name: $CLI_NAME is registered in DRLM database ..."
 if ! valid_client_name "$CLI_NAME"; then
 	Error "Client name: $CLI_NAME has wrong format. [ Correct this and try again ]"
 fi
+if [ "$CLI_NAME" = "localhost" ]; then
+  Error "Client host can not be localhost"
+fi
 if exist_client_name "$CLI_NAME"; then
   Error "Client $CLINAME already registered!"
 fi

diff --git a/usr/share/drlm/conf/default.conf b/usr/share/drlm/conf/default.conf
@@ -455,38 +455,38 @@ URL_REAR_SUSE15_PPC64="$URL_REAR_BASE/Rear/SLE_15/ppc64le/rear-2.6-1.ppc64le.rpm
 REAR_DEP_DEBIAN6="binutils attr syslinux ethtool lsb-release genisoimage iproute iputils-ping parted openssl gawk mingetty sudo curl nfs-common"
 REAR_DEP_DEBIAN7="binutils attr syslinux ethtool lsb-release genisoimage iproute iputils-ping parted openssl gawk mingetty sudo curl nfs-common"
 REAR_DEP_DEBIAN8="binutils attr ethtool lsb-release dosfstools parted openssl gawk sudo curl nfs-common bc rsync genisoimage isolinux"
-REAR_DEP_DEBIAN9="binutils attr ethtool lsb-release dosfstools parted openssl gawk sudo curl nfs-common bc net-tools less rsync genisoimage isolinux psmisc"
-REAR_DEP_DEBIAN10="binutils attr ethtool lsb-release dosfstools parted openssl gawk sudo curl nfs-common bc net-tools wget rsync genisoimage isolinux psmisc"
-REAR_DEP_DEBIAN11="binutils attr ethtool lsb-release dosfstools parted openssl gawk sudo curl nfs-common bc net-tools wget rsync genisoimage isolinux psmisc file"
+REAR_DEP_DEBIAN9="binutils attr ethtool lsb-release dosfstools parted openssl gawk sudo curl nfs-common bc net-tools less rsync genisoimage isolinux psmisc kbd file isc-dhcp-client"
+REAR_DEP_DEBIAN10="binutils attr ethtool lsb-release dosfstools parted openssl gawk sudo curl nfs-common bc net-tools wget rsync genisoimage isolinux psmisc kbd file isc-dhcp-client"
+REAR_DEP_DEBIAN11="binutils attr ethtool lsb-release dosfstools parted openssl gawk sudo curl nfs-common bc net-tools wget rsync genisoimage isolinux psmisc kbd file isc-dhcp-client"
 
 # UBUNTU Dependencies
 REAR_DEP_UBUNTU12="syslinux ethtool lsb-release genisoimage iproute iputils-ping binutils parted openssl gawk attr mingetty sudo curl nfs-common"
 REAR_DEP_UBUNTU14="binutils attr nfs-common"
 REAR_DEP_UBUNTU16="binutils attr nfs-common dosfstools parted bc rsync genisoimage isolinux"
 REAR_DEP_UBUNTU17="binutils attr nfs-common"
-REAR_DEP_UBUNTU18="binutils attr nfs-common rsync genisoimage isolinux psmisc"
-REAR_DEP_UBUNTU19="binutils attr nfs-common"
-REAR_DEP_UBUNTU20="binutils attr nfs-common net-tools rsync genisoimage isolinux psmisc"
-REAR_DEP_UBUNTU22="binutils attr nfs-common net-tools rsync genisoimage isolinux psmisc curl ethtool gawk libsigsegv2"
+REAR_DEP_UBUNTU18="binutils attr nfs-common rsync genisoimage isolinux psmisc kbd file isc-dhcp-client"
+REAR_DEP_UBUNTU19="binutils attr nfs-common kbd file isc-dhcp-client"
+REAR_DEP_UBUNTU20="binutils attr nfs-common net-tools rsync genisoimage isolinux psmisc kbd file isc-dhcp-client"
+REAR_DEP_UBUNTU22="binutils attr nfs-common net-tools rsync genisoimage isolinux psmisc curl ethtool gawk libsigsegv2 file kbd file isc-dhcp-client"
 
 # CENTOS/REDHAT Dependencies
 REAR_DEP_REDHAT5_32="mkisofs mingetty syslinux nfs-utils portmap wget curl parted"
 REAR_DEP_REDHAT5_64="mkisofs mingetty syslinux nfs-utils portmap wget curl parted"
 REAR_DEP_REDHAT5_PPC64="mkisofs mingetty syslinux nfs-utils portmap wget curl parted"
-REAR_DEP_REDHAT6_32="genisoimage mtools syslinux syslinux-nonlinux nfs-utils rpcbind wget parted bc rsync"
-REAR_DEP_REDHAT6_64="genisoimage mtools syslinux syslinux-nonlinux nfs-utils rpcbind wget parted bc rsync"
-REAR_DEP_REDHAT6_PPC64="genisoimage mtools syslinux syslinux-nonlinux nfs-utils rpcbind wget parted bc rsync"
-REAR_DEP_REDHAT7_64="attr genisoimage libusal mtools syslinux nfs-utils wget bc net-tools rsync psmisc" 
-REAR_DEP_REDHAT7_PPC64="attr genisoimage libusal mtools syslinux-tftpboot nfs-utils wget bc net-tools rsync psmisc" 
-REAR_DEP_REDHAT8_64="attr genisoimage libusal mtools syslinux nfs-utils wget bc net-tools rsync psmisc"
-REAR_DEP_REDHAT8_PPC64="attr genisoimage libusal mtools syslinux-tftpboot nfs-utils wget bc net-tools rsync psmisc"
-REAR_DEP_REDHAT9_64="attr genisoimage mtools syslinux nfs-utils wget bc net-tools rsync psmisc"
-REAR_DEP_REDHAT9_PPC64="attr genisoimage mtools syslinux-tftpboot nfs-utils wget bc net-tools rsync psmisc"
+REAR_DEP_REDHAT6_32="genisoimage mtools syslinux syslinux-nonlinux nfs-utils rpcbind wget parted bc rsync kbd file dhclient"
+REAR_DEP_REDHAT6_64="genisoimage mtools syslinux syslinux-nonlinux nfs-utils rpcbind wget parted bc rsync kbd file dhclient"
+REAR_DEP_REDHAT6_PPC64="genisoimage mtools syslinux syslinux-nonlinux nfs-utils rpcbind wget parted bc rsync kbd file dhclient"
+REAR_DEP_REDHAT7_64="attr genisoimage libusal mtools syslinux nfs-utils wget bc net-tools rsync psmisc kbd file dhclient" 
+REAR_DEP_REDHAT7_PPC64="attr genisoimage libusal mtools syslinux-tftpboot nfs-utils wget bc net-tools rsync psmisc kbd file dhclient" 
+REAR_DEP_REDHAT8_64="attr genisoimage libusal mtools syslinux nfs-utils wget bc net-tools rsync psmisc kbd file dhcp-client"
+REAR_DEP_REDHAT8_PPC64="attr genisoimage libusal mtools syslinux-tftpboot nfs-utils wget bc net-tools rsync psmisc kbd file dhcp-client"
+REAR_DEP_REDHAT9_64="attr genisoimage mtools syslinux nfs-utils wget bc net-tools rsync psmisc kbd file dhcp-client"
+REAR_DEP_REDHAT9_PPC64="attr genisoimage mtools syslinux-tftpboot nfs-utils wget bc net-tools rsync psmisc kbd file dhcp-client"
 
 # SUSE Dependencies
-REAR_DEP_SUSE11="net-tools"
-REAR_DEP_SUSE12="net-tools"
-REAR_DEP_SUSE15="net-tools"
+REAR_DEP_SUSE11="net-tools kbd file dhcp-client"
+REAR_DEP_SUSE12="net-tools kbd file dhcp-client"
+REAR_DEP_SUSE15="net-tools kbd file dhcp-client"
 
 ############### ----- REAR SERVICES
 #

diff --git a/usr/share/drlm/conf/samples/client_PXE.cfg b/usr/share/drlm/conf/samples/client_PXE.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.3
+# DRLM v2.4.4
 # 
 
 # This configuration example does a PXE rescue system and a data backup of all 

diff --git a/usr/share/drlm/conf/samples/client_data_only.cfg b/usr/share/drlm/conf/samples/client_data_only.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.3
+# DRLM v2.4.4
 # 
 
 # This configuration example does a data backup of /home directory of the 

diff --git a/usr/share/drlm/conf/samples/client_default.cfg b/usr/share/drlm/conf/samples/client_default.cfg
@@ -8,7 +8,7 @@
 #         (Configuration examples in /usr/share/drlm/conf/samples/)           #
 ###############################################################################
 
-# DRLM v2.4.3
+# DRLM v2.4.4
 #
 
 # DRLM automatically generates a ReaR configuration file in function of three

diff --git a/usr/share/drlm/conf/samples/client_default.drlm.cfg b/usr/share/drlm/conf/samples/client_default.drlm.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.3
+# DRLM v2.4.4
 #
 
 # In client.drlm.cfg config file can be set DRLM client specific configurations

diff --git a/usr/share/drlm/conf/samples/client_incremental.cfg b/usr/share/drlm/conf/samples/client_incremental.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.3
+# DRLM v2.4.4
 # 
 
 # This configuration example does ISO rescue file and an incremental  data 

diff --git a/usr/share/drlm/conf/samples/client_incremental_data_only.cfg b/usr/share/drlm/conf/samples/client_incremental_data_only.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.3
+# DRLM v2.4.4
 # 
 
 # This configuration example does a data backup of /home directory of the 

diff --git a/usr/share/drlm/lib/install-functions.sh b/usr/share/drlm/lib/install-functions.sh
@@ -486,6 +486,11 @@ function tunning_rear () {
   if [ -f "/usr/share/rear/restore/default/500_selinux_autorelabel.sh" ]; then
     $SUDO sed -i '/^touch \$TARGET_FS_ROOT\/\.autorelabel/i rm -rf \$TARGET_FS_ROOT\/\.autorelabel' /usr/share/rear/restore/default/500_selinux_autorelabel.sh
   fi
+
+  # remove rear cron file
+  if [ -f "/etc/cron.d/rear" ]; then
+    $SUDO rm -rf /etc/cron.d/rear
+  fi
 }
 
 function ssh_tunning_rear () {

diff --git a/usr/share/drlm/www/drlm-api/utilities.go b/usr/share/drlm/www/drlm-api/utilities.go
@@ -38,7 +38,7 @@ func GetMD5Hash(text string) string {
 func generateJSONResponse(object interface{}) string {
 
 	r := models.Response{
-		Version: "2.4.3",
+		Version: "2.4.4",
 		Result:  object,
 	}
 

diff --git a/var/lib/drlm/www/index.html b/var/lib/drlm/www/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=0.6">
-    <title>DRLM v2.4.3</title>
+    <title>DRLM v2.4.4</title>
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/default.css">
   </head>

diff --git a/var/lib/drlm/www/signin.html b/var/lib/drlm/www/signin.html
@@ -36,7 +36,7 @@ <h5 class="h5 mb-3 fw-normal">Please sign in</h5>
           var formData = {
             'username'  : $('input[id=inputUser]').val(),
             'password'  : $('input[id=inputPassword]').val(),
-            'version'   : '2.4.3',
+            'version'   : '2.4.4',
             'platform'  : 'web'
           };