Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bug fix: finalize removal of cent8 repo
  • Loading branch information
usmannasir committed Jun 10, 2020
1 parent 4fc5f53 commit 0948561
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 3 deletions.
3 changes: 2 additions & 1 deletion cyberpanel_upgrade.sh
Expand Up @@ -180,14 +180,15 @@ elif echo $OUTPUT | grep -q "CloudLinux 7" ; then
rm -f /etc/yum.repos.d/epel.repo
rm -f /etc/yum.repos.d/epel.repo.rpmsave
elif echo $OUTPUT | grep -q "CentOS Linux 8" ; then
curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.0.1/install/CyberPanel8.repo > /etc/yum.repos.d/CyberPanel.repo
echo -e "\nDetecting CentOS 8.X...\n"
SERVER_OS="CentOS8"
yum clean all
yum update -y
yum autoremove epel-release -y
rm -f /etc/yum.repos.d/epel.repo
rm -f /etc/yum.repos.d/epel.repo.rpmsave
yum autoremove epel-release -y
dnf install epel-release -y
elif echo $OUTPUT | grep -q "Ubuntu 18.04" ; then
echo -e "\nDetecting Ubuntu 18.04...\n"
SERVER_OS="Ubuntu"
Expand Down
3 changes: 1 addition & 2 deletions emailMarketing/emailMarketing.py
Expand Up @@ -158,9 +158,9 @@ def verificationJob(self):
ValidationLog(owner=verificationList, status=backupSchedule.INFO, message='Starting email verification..').save()

for items in allEmailsInList:

if items.verificationStatus != 'Verified':
try:

email = items.email
self.currentEmail = email
domainName = email.split('@')[1]
Expand Down Expand Up @@ -245,7 +245,6 @@ def verificationJob(self):
items.verificationStatus = 'Verification Failed'
items.save()


logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, str(counter) + ' emails verified so far..')
counter = counter + 1
except BaseException as msg:
Expand Down
29 changes: 29 additions & 0 deletions plogical/upgrade.py
Expand Up @@ -903,6 +903,20 @@ def emailMarketingMigrationsa():
KEY `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` (`owner_id`),
CONSTRAINT `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` FOREIGN KEY (`owner_id`) REFERENCES `websiteFunctions_websites` (`id`)
)"""
try:
cursor.execute(query)
except:
pass

query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN verified INT DEFAULT 0'

try:
cursor.execute(query)
except:
pass

query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN notVerified INT DEFAULT 0'

try:
cursor.execute(query)
except:
Expand Down Expand Up @@ -989,6 +1003,21 @@ def emailMarketingMigrationsa():
PRIMARY KEY (`id`)
)"""

try:
cursor.execute(query)
except:
pass

query = """CREATE TABLE `emailMarketing_validationlog` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`status` int(11) NOT NULL,
`message` longtext NOT NULL,
`owner_id` int(11) NOT NULL,
PRIMARY KEY (`id`),
KEY `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` (`owner_id`),
CONSTRAINT `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` FOREIGN KEY (`owner_id`) REFERENCES `emailMarketing_emaillists` (`id`)
)"""

try:
cursor.execute(query)
except:
Expand Down

0 comments on commit 0948561

Please sign in to comment.