Skip to content

Commit

Permalink
remove rainloop checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@usmannasir
usmannasir committed May 21, 2022
1 parent f55470a commit 675522d
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions plogical/upgrade.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,33 +367,33 @@ def downoad_and_install_raindloop():
try:
#######

if os.path.exists("/usr/local/CyberCP/public/rainloop"):

if os.path.exists("/usr/local/lscp/cyberpanel/rainloop/data"):
pass
else:
command = "mv /usr/local/CyberCP/public/rainloop/data /usr/local/lscp/cyberpanel/rainloop/data"
Upgrade.executioner(command, 0)

command = "chown -R lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data"
Upgrade.executioner(command, 0)

iPath = os.listdir('/usr/local/CyberCP/public/rainloop/rainloop/v/')

path = "/usr/local/CyberCP/public/snappymail/snappymail/v/%s/include.php" % (iPath[0])

data = open(path, 'r').readlines()
writeToFile = open(path, 'w')

for items in data:
if items.find("$sCustomDataPath = '';") > -1:
writeToFile.writelines(
" $sCustomDataPath = '/usr/local/lscp/cyberpanel/rainloop/data';\n")
else:
writeToFile.writelines(items)

writeToFile.close()
return 0
# if os.path.exists("/usr/local/CyberCP/public/rainloop"):
#
# if os.path.exists("/usr/local/lscp/cyberpanel/rainloop/data"):
# pass
# else:
# command = "mv /usr/local/CyberCP/public/rainloop/data /usr/local/lscp/cyberpanel/rainloop/data"
# Upgrade.executioner(command, 0)
#
# command = "chown -R lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data"
# Upgrade.executioner(command, 0)
#
# iPath = os.listdir('/usr/local/CyberCP/public/rainloop/rainloop/v/')
#
# path = "/usr/local/CyberCP/public/snappymail/snappymail/v/%s/include.php" % (iPath[0])
#
# data = open(path, 'r').readlines()
# writeToFile = open(path, 'w')
#
# for items in data:
# if items.find("$sCustomDataPath = '';") > -1:
# writeToFile.writelines(
# " $sCustomDataPath = '/usr/local/lscp/cyberpanel/rainloop/data';\n")
# else:
# writeToFile.writelines(items)
#
# writeToFile.close()
# return 0

cwd = os.getcwd()

Expand Down

12 comments on commit 675522d

@master3395
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rainloop still seems to be a part of this update.
Just tried upgrading one of my VPSs from 2.3.1 to 2.3.2, and I don't have snappy, I still have rainloop.
Going to IP:port/snappymail/index.php returns HTTP ERROR 500

@master3395
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found another thing that needs fixing for Snappymail.
The folder to the configs/data is missing.
bilde

@master3395
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think there should be a way to "clean up" the old rainloop folders, so it does not lay legacy folders around also.

@usmannasir
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch is not production ready, don't use on production servers.

@master3395
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch is not production ready, don't use it on production servers.

Not using it in production.
Just doing checks on my dev server, to see if I find any missing links :)
Doing a good job by the way :)

@usmannasir
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will revert to this

@master3395
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to revert, i only commented here, because it was the last commit regarding Snappymail that I found on 2.3.2 :)

@usmannasir
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

configs data folder will remain same, because it contains data from past. Although I will remove rainloop from installation folder. Do you have snappymail folder in /usr/local/CyberCP/public ?

@master3395
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup
bilde
bilde

@usmannasir
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then snappymail should be loading?

@master3395
Copy link
Contributor

@master3395 master3395 commented on 675522d May 24, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is loading yes.
Haven't made an e-mail on the test server yet.
But I can't seem to find the admin password for the snappymail (TOTP) thing, this is a clean install of CyberPanel 2.3.2

Scratch that, figured out that I had to use the password located here:
/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/admin_password.txt

bilde

@master3395
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A new version of SnappyMail with fixes for sieve came out a few days ago. Is it not possible to make it so it downloads the latest and uses that when upgrading or installing CP? current version is 2.15.3, but latest is v2.16.1

Please sign in to comment.