Skip to content

Commit 0948561

Browse files
committed
bug fix: finalize removal of cent8 repo
1 parent 4fc5f53 commit 0948561

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

cyberpanel_upgrade.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,15 @@ elif echo $OUTPUT | grep -q "CloudLinux 7" ; then
180180
rm -f /etc/yum.repos.d/epel.repo
181181
rm -f /etc/yum.repos.d/epel.repo.rpmsave
182182
elif echo $OUTPUT | grep -q "CentOS Linux 8" ; then
183-
curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.0.1/install/CyberPanel8.repo > /etc/yum.repos.d/CyberPanel.repo
184183
echo -e "\nDetecting CentOS 8.X...\n"
185184
SERVER_OS="CentOS8"
186185
yum clean all
187186
yum update -y
188187
yum autoremove epel-release -y
189188
rm -f /etc/yum.repos.d/epel.repo
190189
rm -f /etc/yum.repos.d/epel.repo.rpmsave
190+
yum autoremove epel-release -y
191+
dnf install epel-release -y
191192
elif echo $OUTPUT | grep -q "Ubuntu 18.04" ; then
192193
echo -e "\nDetecting Ubuntu 18.04...\n"
193194
SERVER_OS="Ubuntu"

emailMarketing/emailMarketing.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ def verificationJob(self):
158158
ValidationLog(owner=verificationList, status=backupSchedule.INFO, message='Starting email verification..').save()
159159

160160
for items in allEmailsInList:
161-
162161
if items.verificationStatus != 'Verified':
163162
try:
163+
164164
email = items.email
165165
self.currentEmail = email
166166
domainName = email.split('@')[1]
@@ -245,7 +245,6 @@ def verificationJob(self):
245245
items.verificationStatus = 'Verification Failed'
246246
items.save()
247247

248-
249248
logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, str(counter) + ' emails verified so far..')
250249
counter = counter + 1
251250
except BaseException as msg:

plogical/upgrade.py

+29
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,20 @@ def emailMarketingMigrationsa():
903903
KEY `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` (`owner_id`),
904904
CONSTRAINT `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` FOREIGN KEY (`owner_id`) REFERENCES `websiteFunctions_websites` (`id`)
905905
)"""
906+
try:
907+
cursor.execute(query)
908+
except:
909+
pass
910+
911+
query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN verified INT DEFAULT 0'
912+
913+
try:
914+
cursor.execute(query)
915+
except:
916+
pass
917+
918+
query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN notVerified INT DEFAULT 0'
919+
906920
try:
907921
cursor.execute(query)
908922
except:
@@ -989,6 +1003,21 @@ def emailMarketingMigrationsa():
9891003
PRIMARY KEY (`id`)
9901004
)"""
9911005

1006+
try:
1007+
cursor.execute(query)
1008+
except:
1009+
pass
1010+
1011+
query = """CREATE TABLE `emailMarketing_validationlog` (
1012+
`id` int(11) NOT NULL AUTO_INCREMENT,
1013+
`status` int(11) NOT NULL,
1014+
`message` longtext NOT NULL,
1015+
`owner_id` int(11) NOT NULL,
1016+
PRIMARY KEY (`id`),
1017+
KEY `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` (`owner_id`),
1018+
CONSTRAINT `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` FOREIGN KEY (`owner_id`) REFERENCES `emailMarketing_emaillists` (`id`)
1019+
)"""
1020+
9921021
try:
9931022
cursor.execute(query)
9941023
except:

0 commit comments

Comments
 (0)