From 3b4cbfb85f52880d0ef86e3d2d93a9227d3b1483 Mon Sep 17 00:00:00 2001
From: Michael Ramsey <mike@hackerdise.me>
Date: Wed, 4 Aug 2021 22:15:32 -0400
Subject: [PATCH 1/4] Update install.py

rockylinux detection
---
 install/install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install/install.py b/install/install.py
index 01b055e19..31fbd3006 100755
--- a/install/install.py
+++ b/install/install.py
@@ -55,6 +55,8 @@ def get_distro():
             return cent8
         if data.find('AlmaLinux release 8') > -1:
             return cent8
+        if data.find('Rocky Linux 8') > -1:
+            return cent8
 
     else:
         logging.InstallLog.writeToFile("Can't find linux release file - fatal error")

From 4911411aa94b90e418ef06d2da0588242faec5bd Mon Sep 17 00:00:00 2001
From: istiak101 <30789544+istiak101@users.noreply.github.com>
Date: Wed, 11 Aug 2021 02:43:17 +0600
Subject: [PATCH 2/4] Create FUNDING.yml

---
 FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 FUNDING.yml

diff --git a/FUNDING.yml b/FUNDING.yml
new file mode 100644
index 000000000..aebce3202
--- /dev/null
+++ b/FUNDING.yml
@@ -0,0 +1 @@
+patreon: cyberpanel

From 97ab0ab57991845b541005a892d86d1eec81d30d Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Thu, 12 Aug 2021 19:43:47 +0500
Subject: [PATCH 3/4] add logging

---
 plogical/upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index e0c856986..b14b7d555 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -106,7 +106,7 @@ class Upgrade:
             FNULL = open(os.devnull, 'w')
             count = 0
             while True:
-                res = subprocess.call(shlex.split(command), stdout=FNULL, stderr=subprocess.STDOUT)
+                res = subprocess.call(shlex.split(command), stderr=subprocess.STDOUT)
                 if res != 0:
                     count = count + 1
                     Upgrade.stdOut(component + ' failed, trying again, try number: ' + str(count), 0)

From c27eb05522610b89010bc69458866fcdfcafb5eb Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 13 Aug 2021 12:34:23 +0500
Subject: [PATCH 4/4] CP-16: Admin Back Up Start Transfer

---
 backup/backupManager.py             | 3 +++
 plogical/remoteTransferUtilities.py | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/backup/backupManager.py b/backup/backupManager.py
index c42b706d6..902f3e3ab 100755
--- a/backup/backupManager.py
+++ b/backup/backupManager.py
@@ -1142,6 +1142,9 @@ class BackupManager:
                     command = "sudo mkdir " + localStoragePath
                     ProcessUtilities.executioner(command)
 
+                    command = 'chmod 600 %s' % (localStoragePath)
+                    ProcessUtilities.executioner(command)
+
                     final_json = json.dumps(
                         {'remoteTransferStatus': 1, 'error_message': "None", "dir": data['dir']})
                     return HttpResponse(final_json)
diff --git a/plogical/remoteTransferUtilities.py b/plogical/remoteTransferUtilities.py
index 76a1ef5c0..7dabc3a84 100755
--- a/plogical/remoteTransferUtilities.py
+++ b/plogical/remoteTransferUtilities.py
@@ -69,6 +69,9 @@ class remoteTransferUtilities:
             if not os.path.exists(destination):
                 os.makedirs(destination)
 
+            command = 'chmod 600 %s' % (destination)
+            ProcessUtilities.executioner(command)
+
             writeToFile = open(backupLogPath, "w+")
 
             writeToFile.writelines("############################\n")
@@ -144,6 +147,11 @@ class remoteTransferUtilities:
 
                             completePathToBackupFile = retValue[1] + '.tar.gz'
 
+                            ### change permissions of backup file
+
+                            command = 'chmod 600 %s' % (completePathToBackupFile)
+                            ProcessUtilities.executioner(command)
+
                             ## move the generated backup file to specified destination
 
                             if os.path.exists(completePathToBackupFile):