Merge branch 'v2.0.3' into v2.0.4-dev

This commit is contained in:
Usman Nasir
2020-10-14 14:48:32 +05:00
2 changed files with 28 additions and 26 deletions

View File

@@ -2038,16 +2038,10 @@ echo $oConfig->Save() ? 'Done' : 'Error';
### Restore dovecot/postfix conf
command = 'rm -rf %s' % (dovecotConfPath)
command = 'cp -pR %s/dovecot/ /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'rm -rf %s' % (postfixConfPath)
Upgrade.executioner(command, 0)
command = 'mv %s/dovecot /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'mv %s/postfix /etc/' % (configbackups)
command = 'cp -pR %s/postfix/ /etc/' % (configbackups)
Upgrade.executioner(command, 0)
## Restored
@@ -2093,16 +2087,10 @@ echo $oConfig->Save() ? 'Done' : 'Error';
### Restore dovecot/postfix conf
command = 'rm -rf %s' % (dovecotConfPath)
command = 'cp -pR %s/dovecot/ /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'rm -rf %s' % (postfixConfPath)
Upgrade.executioner(command, 0)
command = 'mv %s/dovecot /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'mv %s/postfix /etc/' % (configbackups)
command = 'cp -pR %s/postfix/ /etc/' % (configbackups)
Upgrade.executioner(command, 0)
## Restored