From 9863207b197547b78f0142d8a5216723e7ff9a98 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Sat, 19 Oct 2019 13:03:00 +0500
Subject: [PATCH] bug fix: incremental backups and upgrade process

---
 .idea/workspace.xml | 488 ++++++++++++++++++++++++++++++++------------
 IncBackups/views.py |  15 +-
 install/install.py  |   4 +-
 plogical/upgrade.py |  12 +-
 preUpgrade.sh       |   9 +
 serverLogs/views.py |   0
 6 files changed, 384 insertions(+), 144 deletions(-)
 create mode 100644 preUpgrade.sh
 mode change 100644 => 100755 serverLogs/views.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ba41b1d37..aa935f395 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -30,8 +30,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/install/install.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="962" column="43" selection-start-line="962" selection-start-column="43" selection-end-line="962" selection-end-column="43" />
+            <state relative-caret-position="241">
+              <caret line="2505" column="37" selection-start-line="2505" selection-start-column="30" selection-end-line="2505" selection-end-column="37" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
                 <element signature="e#143696#150827#0" />
@@ -44,57 +44,229 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/IncBackups/views.py">
+        <entry file="file://$PROJECT_DIR$/install/firewallUtilities.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="338">
-              <caret line="572" column="71" selection-start-line="572" selection-start-column="71" selection-end-line="572" selection-end-column="71" />
+            <state relative-caret-position="365">
+              <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
               <folding>
-                <element signature="e#816#1687#0" />
-                <element signature="e#1619#1687#0" />
-                <element signature="e#1739#2040#0" />
-                <element signature="e#2080#2148#0" />
-                <element signature="e#2183#5536#0" />
-                <element signature="e#18532#18600#0" />
+                <element signature="e#0#17#0" expanded="true" />
+                <element signature="e#818#1904#0" />
+                <element signature="e#1965#3058#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/IncBackups/templates/IncBackups/backupSchedule.html">
+        <entry file="file://$PROJECT_DIR$/plogical/upgrade.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="97" lean-forward="true" selection-start-line="12" selection-start-column="97" selection-end-line="12" selection-end-column="97" />
+            <state relative-caret-position="166">
+              <caret line="1877" column="21" selection-start-line="1877" selection-start-column="12" selection-end-line="1877" selection-end-column="21" />
               <folding>
-                <element signature="e#500#539#0#HTML" expanded="true" />
+                <element signature="e#543#985#0" />
+                <element signature="e#1065#1663#0" />
+                <element signature="e#1082#1626#0" />
+                <element signature="e#1132#1602#0" />
+                <element signature="e#1225#1488#0" />
+                <element signature="e#1404#1488#0" />
+                <element signature="e#1531#1602#0" />
+                <element signature="e#1712#3223#0" />
+                <element signature="e#1730#3130#0" />
+                <element signature="e#3278#3918#0" />
+                <element signature="e#3296#3880#0" />
+                <element signature="e#3969#4406#0" />
+                <element signature="e#4456#5619#0" />
+                <element signature="e#4473#5571#0" />
+                <element signature="e#4565#4947#0" />
+                <element signature="e#4755#4907#0" />
+                <element signature="e#4983#5472#0" />
+                <element signature="e#5008#5423#0" />
+                <element signature="e#5201#5382#0" />
+                <element signature="e#5686#7123#0" />
+                <element signature="e#5703#7012#0" />
+                <element signature="e#6510#6783#0" />
+                <element signature="e#6569#6711#0" />
+                <element signature="e#7176#7423#0" />
+                <element signature="e#7492#11863#0" />
+                <element signature="e#7509#11732#0" />
+                <element signature="e#7604#8608#0" />
+                <element signature="e#7734#8028#0" />
+                <element signature="e#8274#8546#0" />
+                <element signature="e#8344#8466#0" />
+                <element signature="e#8873#9229#0" />
+                <element signature="e#9099#9181#0" />
+                <element signature="e#9320#9672#0" />
+                <element signature="e#9542#9624#0" />
+                <element signature="e#9873#10187#0" />
+                <element signature="e#10057#10139#0" />
+                <element signature="e#10279#10593#0" />
+                <element signature="e#10463#10545#0" />
+                <element signature="e#10929#11185#0" />
+                <element signature="e#10995#11113#0" />
+                <element signature="e#11522#11586#0" />
+                <element signature="e#11915#12656#0" />
+                <element signature="e#11932#12540#0" />
+                <element signature="e#12191#12428#0" />
+                <element signature="e#12588#12656#0" />
+                <element signature="e#12711#14202#0" />
+                <element signature="e#14253#14969#0" />
+                <element signature="e#14492#14643#0" />
+                <element signature="e#14670#14808#0" />
+                <element signature="e#15017#15406#0" />
+                <element signature="e#15035#15302#0" />
+                <element signature="e#15345#15406#0" />
+                <element signature="e#15460#15783#0" />
+                <element signature="e#15837#16151#0" />
+                <element signature="e#15854#16118#0" />
+                <element signature="e#16213#17520#0" />
+                <element signature="e#16230#17423#0" />
+                <element signature="e#16508#17355#0" />
+                <element signature="e#16635#17355#0" />
+                <element signature="e#16803#17355#0" />
+                <element signature="e#17472#17520#0" />
+                <element signature="e#17586#22883#0" />
+                <element signature="e#17604#22782#0" />
+                <element signature="e#17697#19456#0" />
+                <element signature="e#19981#20113#0" />
+                <element signature="e#20355#20675#0" />
+                <element signature="e#20750#21125#0" />
+                <element signature="e#21526#21696#0" />
+                <element signature="e#21947#22171#0" />
+                <element signature="e#22941#29422#0" />
+                <element signature="e#22959#29321#0" />
+                <element signature="e#23039#23610#0" />
+                <element signature="e#23729#24112#0" />
+                <element signature="e#24231#24675#0" />
+                <element signature="e#24794#25399#0" />
+                <element signature="e#25518#25905#0" />
+                <element signature="e#26024#26472#0" />
+                <element signature="e#26607#27154#0" />
+                <element signature="e#27273#28045#0" />
+                <element signature="e#28164#28557#0" />
+                <element signature="e#28676#29130#0" />
+                <element signature="e#29482#32221#0" />
+                <element signature="e#29499#32188#0" />
+                <element signature="e#29592#29689#0" />
+                <element signature="e#29765#29845#0" />
+                <element signature="e#29921#30008#0" />
+                <element signature="e#30084#30229#0" />
+                <element signature="e#30292#30771#0" />
+                <element signature="e#30889#31451#0" />
+                <element signature="e#31569#31998#0" />
+                <element signature="e#32286#36035#0" />
+                <element signature="e#32303#36002#0" />
+                <element signature="e#32383#32571#0" />
+                <element signature="e#32689#33156#0" />
+                <element signature="e#33274#33819#0" />
+                <element signature="e#33938#34455#0" />
+                <element signature="e#34574#35180#0" />
+                <element signature="e#35299#35811#0" />
+                <element signature="e#36091#37190#0" />
+                <element signature="e#36108#37157#0" />
+                <element signature="e#36188#36816#0" />
+                <element signature="e#37249#38169#0" />
+                <element signature="e#37266#38136#0" />
+                <element signature="e#37346#37946#0" />
+                <element signature="e#38221#39442#0" />
+                <element signature="e#38238#39409#0" />
+                <element signature="e#38318#39029#0" />
+                <element signature="e#39505#40319#0" />
+                <element signature="e#39522#40286#0" />
+                <element signature="e#39602#39778#0" />
+                <element signature="e#40376#40780#0" />
+                <element signature="e#40394#40746#0" />
+                <element signature="e#40839#43055#0" />
+                <element signature="e#40856#43022#0" />
+                <element signature="e#40936#41230#0" />
+                <element signature="e#41348#41730#0" />
+                <element signature="e#41848#42243#0" />
+                <element signature="e#42361#42832#0" />
+                <element signature="e#43109#43555#0" />
+                <element signature="e#43126#43522#0" />
+                <element signature="e#43628#48183#0" />
+                <element signature="e#48235#48449#0" />
+                <element signature="e#48252#48342#0" />
+                <element signature="e#48384#48449#0" />
+                <element signature="e#48506#48844#0" />
+                <element signature="e#48523#48732#0" />
+                <element signature="e#48774#48844#0" />
+                <element signature="e#48896#50633#0" />
+                <element signature="e#48914#50540#0" />
+                <element signature="e#50687#55896#0" />
+                <element signature="e#50705#55803#0" />
+                <element signature="e#53499#53963#0" />
+                <element signature="e#54013#54114#0" />
+                <element signature="e#54138#54464#0" />
+                <element signature="e#54516#54617#0" />
+                <element signature="e#54963#55180#0" />
+                <element signature="e#55230#55324#0" />
+                <element signature="e#55948#57151#0" />
+                <element signature="e#55965#56505#0" />
+                <element signature="e#55975#56443#0" />
+                <element signature="e#56534#56927#0" />
+                <element signature="e#56544#56865#0" />
+                <element signature="e#57028#57151#0" />
+                <element signature="e#57207#57393#0" />
+                <element signature="e#57444#57670#0" />
+                <element signature="e#57724#64366#0" />
+                <element signature="e#57741#64271#0" />
+                <element signature="e#57886#61606#0" />
+                <element signature="e#57951#58175#0" />
+                <element signature="e#58788#58987#0" />
+                <element signature="e#58855#58907#0" />
+                <element signature="e#59154#59420#0" />
+                <element signature="e#59931#60518#0" />
+                <element signature="e#61642#64222#0" />
+                <element signature="e#62211#62288#0" />
+                <element signature="e#62380#63134#0" />
+                <element signature="e#63486#63685#0" />
+                <element signature="e#63553#63605#0" />
+                <element signature="e#63852#64118#0" />
+                <element signature="e#64419#65568#0" />
+                <element signature="e#64506#64806#0" />
+                <element signature="e#64833#65031#0" />
+                <element signature="e#65165#65568#0" />
+                <element signature="e#65616#65667#0" />
+                <element signature="e#66529#66610#0" />
+                <element signature="e#67941#67958#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/baseTemplate/templates/baseTemplate/homePage.html">
+        <entry file="file://$PROJECT_DIR$/IncBackups/IncBackupsControl.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="30" column="47" selection-start-line="30" selection-start-column="47" selection-end-line="30" selection-end-column="47" />
+            <state relative-caret-position="68">
+              <caret line="152" column="30" selection-start-line="152" selection-start-column="30" selection-end-line="152" selection-end-column="30" />
+              <folding>
+                <element signature="e#907#1022#0" />
+                <element signature="e#1124#1419#0" />
+                <element signature="e#1449#1594#0" />
+                <element signature="e#1886#3617#0" />
+                <element signature="e#3690#4946#0" />
+                <element signature="e#5018#6499#0" />
+                <element signature="e#6536#6983#0" />
+                <element signature="e#7024#7855#0" />
+                <element signature="e#7893#8339#0" />
+                <element signature="e#8384#9269#0" />
+                <element signature="e#9307#10983#0" />
+                <element signature="e#11052#16886#0" />
+                <element signature="e#16922#17672#0" />
+                <element signature="e#17713#18882#0" />
+                <element signature="e#18919#19685#0" />
+                <element signature="e#19721#20482#0" />
+                <element signature="e#20520#22064#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/baseTemplate/templates/baseTemplate/index.html">
+        <entry file="file://$PROJECT_DIR$/preUpgrade.sh">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="8850">
-              <caret line="590" column="104" selection-start-line="590" selection-start-column="104" selection-end-line="590" selection-end-column="104" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/IncBackups/IncScheduler.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+            <state relative-caret-position="135">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
@@ -111,16 +283,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Backups</find>
-      <find>schedule</find>
-      <find>schedulebackups</find>
-      <find>1.8</find>
-      <find>.py</find>
-      <find>not goo</find>
-      <find>websitesTo</find>
-      <find>websitesToBeBacked</find>
-      <find>remote</find>
-      <find>remoteTransfer</find>
       <find>scheduleBac</find>
       <find>cyberpanelLoading</find>
       <find>allChecked</find>
@@ -141,6 +303,16 @@
       <find>1.9.0</find>
       <find>/usr/local/CyberCP/public/rainloop/rainloop/v/1.12.1/include.php</find>
       <find>CLManager</find>
+      <find>IncBackups</find>
+      <find>chmod</find>
+      <find>stat.</find>
+      <find>destination</find>
+      <find>firewalld</find>
+      <find>addRule</find>
+      <find>downloadAndUpgrade</find>
+      <find>/usr/local/CyberCP</find>
+      <find>setupVirtualEnv</find>
+      <find>os.remove</find>
     </findStrings>
     <replaceStrings>
       <replace>admin.api == 1</replace>
@@ -169,8 +341,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/databases/models.py" />
-        <option value="$PROJECT_DIR$/plogical/sslUtilities.py" />
         <option value="$PROJECT_DIR$/plogical/vhost.py" />
         <option value="$PROJECT_DIR$/CyberCP/urls.py" />
         <option value="$PROJECT_DIR$/CyberCP/settings.py" />
@@ -216,16 +386,17 @@
         <option value="$PROJECT_DIR$/loginSystem/views.py" />
         <option value="$PROJECT_DIR$/baseTemplate/templates/baseTemplate/index.html" />
         <option value="$PROJECT_DIR$/IncBackups/IncBackupsControl.py" />
-        <option value="$PROJECT_DIR$/install/install.py" />
-        <option value="$PROJECT_DIR$/plogical/upgrade.py" />
-        <option value="$PROJECT_DIR$/IncBackups/views.py" />
         <option value="$PROJECT_DIR$/IncBackups/templates/IncBackups/backupSchedule.html" />
+        <option value="$PROJECT_DIR$/install/install.py" />
+        <option value="$PROJECT_DIR$/install/firewallUtilities.py" />
+        <option value="$PROJECT_DIR$/IncBackups/views.py" />
+        <option value="$PROJECT_DIR$/preUpgrade.sh" />
+        <option value="$PROJECT_DIR$/plogical/upgrade.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1511" />
-    <option name="y" value="52" />
+    <option name="x" value="163" />
     <option name="width" value="1221" />
     <option name="height" value="609" />
   </component>
@@ -234,6 +405,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -244,26 +416,12 @@
             <path>
               <item name="CyberCP" type="b2602c69:ProjectViewProjectNode" />
               <item name="CyberCP" type="462c0819:PsiDirectoryNode" />
-              <item name="IncBackups" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="CyberCP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="CyberCP" type="462c0819:PsiDirectoryNode" />
-              <item name="IncBackups" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="CyberCP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="CyberCP" type="462c0819:PsiDirectoryNode" />
-              <item name="IncBackups" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="IncBackups" type="462c0819:PsiDirectoryNode" />
+              <item name="plogical" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -448,17 +606,18 @@
       <workItem from="1570899537960" duration="34622000" />
       <workItem from="1571158869749" duration="705000" />
       <workItem from="1571160353900" duration="938000" />
+      <workItem from="1571162569598" duration="6366000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="708846000" />
+    <option name="totallyTimeSpent" value="715212000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1366" y="25" width="1366" height="684" extended-state="6" />
+    <frame x="0" y="-2" width="1366" height="711" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19621213" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.10530303" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -539,17 +698,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/IncBackups/IncBackups.py" />
-    <entry file="file://$PROJECT_DIR$/cli/cliLogger.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="28" selection-start-line="28" selection-end-line="28" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/emailPremium/templates/emailPremium/listDomains.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="457">
@@ -945,15 +1093,10 @@
     <entry file="file://$PROJECT_DIR$/baseTemplate/templates/baseTemplate/indexJavaFixed.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/IncBackups/IncBackupsControl.py">
+    <entry file="file://$PROJECT_DIR$/CyberCP/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2205">
-          <caret line="166" column="50" selection-start-line="166" selection-start-column="50" selection-end-line="166" selection-end-column="50" />
-          <folding>
-            <element signature="e#907#1022#0" />
-            <element signature="e#1124#1419#0" />
-            <element signature="e#1449#1594#0" />
-          </folding>
+        <state relative-caret-position="180">
+          <caret line="67" column="15" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="15" />
         </state>
       </provider>
     </entry>
@@ -978,17 +1121,89 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CyberCP/settings.py">
+    <entry file="file://$PROJECT_DIR$/IncBackups/templates/IncBackups/backupSchedule.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="67" column="15" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="15" />
+          <caret line="12" column="97" lean-forward="true" selection-start-line="12" selection-start-column="97" selection-end-line="12" selection-end-column="97" />
+          <folding>
+            <element signature="e#500#539#0#HTML" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/install/install.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="241">
+          <caret line="2505" column="37" selection-start-line="2505" selection-start-column="30" selection-end-line="2505" selection-end-column="37" />
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#143696#150827#0" />
+            <element signature="e#150888#151548#0" />
+            <element signature="e#151611#152278#0" />
+            <element signature="e#152347#153095#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/IncBackups/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="337">
+          <caret line="126" column="23" lean-forward="true" selection-start-line="126" selection-start-column="23" selection-end-line="126" selection-end-column="23" />
+          <folding>
+            <element signature="e#24#63#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/IncBackups/IncBackupsControl.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="152" column="30" selection-start-line="152" selection-start-column="30" selection-end-line="152" selection-end-column="30" />
+          <folding>
+            <element signature="e#907#1022#0" />
+            <element signature="e#1124#1419#0" />
+            <element signature="e#1449#1594#0" />
+            <element signature="e#1886#3617#0" />
+            <element signature="e#3690#4946#0" />
+            <element signature="e#5018#6499#0" />
+            <element signature="e#6536#6983#0" />
+            <element signature="e#7024#7855#0" />
+            <element signature="e#7893#8339#0" />
+            <element signature="e#8384#9269#0" />
+            <element signature="e#9307#10983#0" />
+            <element signature="e#11052#16886#0" />
+            <element signature="e#16922#17672#0" />
+            <element signature="e#17713#18882#0" />
+            <element signature="e#18919#19685#0" />
+            <element signature="e#19721#20482#0" />
+            <element signature="e#20520#22064#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/preUpgrade.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/install/firewallUtilities.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="365">
+          <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+            <element signature="e#818#1904#0" />
+            <element signature="e#1965#3058#0" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/plogical/upgrade.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="1374" column="63" selection-start-line="1374" selection-start-column="63" selection-end-line="1374" selection-end-column="63" />
+        <state relative-caret-position="166">
+          <caret line="1877" column="21" selection-start-line="1877" selection-start-column="12" selection-end-line="1877" selection-end-column="21" />
           <folding>
             <element signature="e#543#985#0" />
             <element signature="e#1065#1663#0" />
@@ -1036,7 +1251,6 @@
             <element signature="e#12191#12428#0" />
             <element signature="e#12588#12656#0" />
             <element signature="e#12711#14202#0" />
-            <element signature="e#12728#14110#0" />
             <element signature="e#14253#14969#0" />
             <element signature="e#14492#14643#0" />
             <element signature="e#14670#14808#0" />
@@ -1096,51 +1310,67 @@
             <element signature="e#37266#38136#0" />
             <element signature="e#37346#37946#0" />
             <element signature="e#38221#39442#0" />
+            <element signature="e#38238#39409#0" />
+            <element signature="e#38318#39029#0" />
             <element signature="e#39505#40319#0" />
             <element signature="e#39522#40286#0" />
             <element signature="e#39602#39778#0" />
             <element signature="e#40376#40780#0" />
             <element signature="e#40394#40746#0" />
-            <element signature="e#57468#64110#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/install/install.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="962" column="43" selection-start-line="962" selection-start-column="43" selection-end-line="962" selection-end-column="43" />
-          <folding>
-            <element signature="e#0#10#0" expanded="true" />
-            <element signature="e#143696#150827#0" />
-            <element signature="e#150888#151548#0" />
-            <element signature="e#151611#152278#0" />
-            <element signature="e#152347#153095#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/IncBackups/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="572" column="71" selection-start-line="572" selection-start-column="71" selection-end-line="572" selection-end-column="71" />
-          <folding>
-            <element signature="e#816#1687#0" />
-            <element signature="e#1619#1687#0" />
-            <element signature="e#1739#2040#0" />
-            <element signature="e#2080#2148#0" />
-            <element signature="e#2183#5536#0" />
-            <element signature="e#18532#18600#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/IncBackups/templates/IncBackups/backupSchedule.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="97" lean-forward="true" selection-start-line="12" selection-start-column="97" selection-end-line="12" selection-end-column="97" />
-          <folding>
-            <element signature="e#500#539#0#HTML" expanded="true" />
+            <element signature="e#40839#43055#0" />
+            <element signature="e#40856#43022#0" />
+            <element signature="e#40936#41230#0" />
+            <element signature="e#41348#41730#0" />
+            <element signature="e#41848#42243#0" />
+            <element signature="e#42361#42832#0" />
+            <element signature="e#43109#43555#0" />
+            <element signature="e#43126#43522#0" />
+            <element signature="e#43628#48183#0" />
+            <element signature="e#48235#48449#0" />
+            <element signature="e#48252#48342#0" />
+            <element signature="e#48384#48449#0" />
+            <element signature="e#48506#48844#0" />
+            <element signature="e#48523#48732#0" />
+            <element signature="e#48774#48844#0" />
+            <element signature="e#48896#50633#0" />
+            <element signature="e#48914#50540#0" />
+            <element signature="e#50687#55896#0" />
+            <element signature="e#50705#55803#0" />
+            <element signature="e#53499#53963#0" />
+            <element signature="e#54013#54114#0" />
+            <element signature="e#54138#54464#0" />
+            <element signature="e#54516#54617#0" />
+            <element signature="e#54963#55180#0" />
+            <element signature="e#55230#55324#0" />
+            <element signature="e#55948#57151#0" />
+            <element signature="e#55965#56505#0" />
+            <element signature="e#55975#56443#0" />
+            <element signature="e#56534#56927#0" />
+            <element signature="e#56544#56865#0" />
+            <element signature="e#57028#57151#0" />
+            <element signature="e#57207#57393#0" />
+            <element signature="e#57444#57670#0" />
+            <element signature="e#57724#64366#0" />
+            <element signature="e#57741#64271#0" />
+            <element signature="e#57886#61606#0" />
+            <element signature="e#57951#58175#0" />
+            <element signature="e#58788#58987#0" />
+            <element signature="e#58855#58907#0" />
+            <element signature="e#59154#59420#0" />
+            <element signature="e#59931#60518#0" />
+            <element signature="e#61642#64222#0" />
+            <element signature="e#62211#62288#0" />
+            <element signature="e#62380#63134#0" />
+            <element signature="e#63486#63685#0" />
+            <element signature="e#63553#63605#0" />
+            <element signature="e#63852#64118#0" />
+            <element signature="e#64419#65568#0" />
+            <element signature="e#64506#64806#0" />
+            <element signature="e#64833#65031#0" />
+            <element signature="e#65165#65568#0" />
+            <element signature="e#65616#65667#0" />
+            <element signature="e#66529#66610#0" />
+            <element signature="e#67941#67958#0" />
           </folding>
         </state>
       </provider>
diff --git a/IncBackups/views.py b/IncBackups/views.py
index 1bc582a6e..2425be9bd 100644
--- a/IncBackups/views.py
+++ b/IncBackups/views.py
@@ -16,6 +16,7 @@ from random import randint
 import time
 from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 from loginSystem.views import loadLoginPage
+import stat
 # Create your views here.
 
 
@@ -117,13 +118,15 @@ def addDestination(request):
                 tmpFile = '/home/cyberpanel/sshconfig'
 
                 writeToFile = open(tmpFile, 'w')
-                writeToFile.write(currentConfig)
+                if currentConfig.find('cat') == -1:
+                    writeToFile.write(currentConfig)
 
                 content = """Host %s
-        IdentityFile ~/.ssh/cyberpanel
-        Port %s
-    """ % (ipAddress, port)
-                writeToFile.write(content)
+    IdentityFile ~/.ssh/cyberpanel
+    Port %s
+""" % (ipAddress, port)
+                if currentConfig.find(ipAddress) == -1:
+                    writeToFile.write(content)
                 writeToFile.close()
 
 
@@ -159,6 +162,8 @@ def addDestination(request):
             writeToFile.write(AWS_SECRET_ACCESS_KEY)
             writeToFile.close()
 
+            os.chmod(awsFile, stat.S_IRUSR | stat.S_IWUSR)
+
             final_dic = {'status': 1}
             final_json = json.dumps(final_dic)
             return HttpResponse(final_json)
diff --git a/install/install.py b/install/install.py
index da748a247..b5924b7d3 100755
--- a/install/install.py
+++ b/install/install.py
@@ -3721,12 +3721,12 @@ milter_default_action = accept
             data = open(cronTab, 'r').read()
 
             if data.find('IncScheduler') == -1:
-                cronJob = '0 12 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily'
+                cronJob = '0 12 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily\n'
 
                 writeToFile = open(cronTab, 'a')
                 writeToFile.writelines(cronJob)
 
-                cronJob = '0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily'
+                cronJob = '0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily\n'
                 writeToFile.writelines(cronJob)
                 writeToFile.close()
 
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index dd03b1142..733c9466c 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -435,10 +435,10 @@ class Upgrade:
             ##
 
             command = "pip install --ignore-installed -r /usr/local/CyberCP/requirments.txt"
-            Upgrade.executioner(command, 'CyberPanel requirements', 1)
+            Upgrade.executioner(command, 'CyberPanel requirements', 0)
 
             command = "virtualenv --system-site-packages /usr/local/CyberCP"
-            Upgrade.executioner(command, 'Setting up VirtualEnv [Two]', 1)
+            Upgrade.executioner(command, 'Setting up VirtualEnv [Two]', 0)
 
             Upgrade.stdOut('Virtual enviroment for CyberPanel successfully installed.')
         except OSError, msg:
@@ -1276,9 +1276,6 @@ class Upgrade:
 
             Upgrade.stdOut("Settings file backed up.")
 
-            if os.path.exists('/usr/local/CyberCP/bin'):
-                shutil.rmtree('/usr/local/CyberCP/bin')
-
             ## Extract Latest files
 
             # command = "tar zxf CyberPanel.1.7.4.tar.gz"
@@ -1617,7 +1614,6 @@ class Upgrade:
             command = 'cp /usr/local/lsws/lsphp71/bin/php /usr/bin/'
             Upgrade.executioner(command, 'Set default PHP 7.0, 0')
 
-
     @staticmethod
     def someDirectories():
         command = "mkdir -p /usr/local/lscpd/admin/"
@@ -1838,12 +1834,12 @@ failovermethod=priority
         data = open(cronTab, 'r').read()
 
         if data.find('IncScheduler') == -1:
-            cronJob = '0 12 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily'
+            cronJob = '0 12 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily\n'
 
             writeToFile = open(cronTab, 'a')
             writeToFile.writelines(cronJob)
 
-            cronJob = '0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily'
+            cronJob = '0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/IncBackups/IncScheduler.py Daily\n'
             writeToFile.writelines(cronJob)
             writeToFile.close()
 
diff --git a/preUpgrade.sh b/preUpgrade.sh
new file mode 100644
index 000000000..9463d6019
--- /dev/null
+++ b/preUpgrade.sh
@@ -0,0 +1,9 @@
+if [ ! -d "/usr/local/CyberPanel" ]; then
+  virtualenv --system-site-packages /usr/local/CyberPanel
+  source /usr/local/CyberPanel/bin/activate
+  rm -rf requirments.txt
+  wget https://raw.githubusercontent.com/usmannasir/cyberpanel/1.8.0/requirments.txt
+  pip install --ignore-installed -r requirments.txt
+  virtualenv --system-site-packages /usr/local/CyberPanel
+fi
+
diff --git a/serverLogs/views.py b/serverLogs/views.py
old mode 100644
new mode 100755