diff --git a/CLScript/CloudLinuxUsers.py b/CLScript/CloudLinuxUsers.py index 52c3dd8c9..bdc984655 100755 --- a/CLScript/CloudLinuxUsers.py +++ b/CLScript/CloudLinuxUsers.py @@ -79,48 +79,51 @@ class CloudLinuxUsers(CLMain): def fetchJson(self, websites): users = [] for webs in websites: - itemPackage = webs.package - package = {'name': itemPackage.packageName, 'owner': webs.externalApp} + try: + itemPackage = webs.package + package = {'name': itemPackage.packageName, 'owner': webs.externalApp} - user = {} + user = {} - if self.id: - user['id'] = pwd.getpwnam(webs.externalApp).pw_uid - - if self.un: - user['username'] = webs.externalApp - - if self.ow: - user['owner'] = webs.externalApp - - if self.domain: - user['domain'] = webs.domain - - if self.package: - user['package'] = package - - if self.email: - user['email'] = webs.adminEmail - - if self.localecode: - user['locale_code'] = "EN_us" - - - if self.packageName != None: - if self.package: - if self.packageName == user['package']['name'] and self.packageOwner == user['package']['owner']: - pass - else: - continue - - if self.uid !=None: if self.id: - if self.uid == user['id']: + user['id'] = pwd.getpwnam(webs.externalApp).pw_uid + + if self.un: + user['username'] = webs.externalApp + + if self.ow: + user['owner'] = webs.externalApp + + if self.domain: + user['domain'] = webs.domain + + if self.package: + user['package'] = package + + if self.email: + user['email'] = webs.adminEmail + + if self.localecode: + user['locale_code'] = "EN_us" + + + if self.packageName != None: + if self.package: + if self.packageName == user['package']['name'] and self.packageOwner == user['package']['owner']: + pass + else: + continue + + if self.uid !=None: + if self.id: + if self.uid == user['id']: + users.append(user) + else: users.append(user) else: users.append(user) - else: - users.append(user) + except BaseException as msg: + pass final = {'data': users, 'metadata': self.initialMeta} print(json.dumps(final)) diff --git a/CPCent7repo.json b/CPCent7repo.json new file mode 100644 index 000000000..2e1d80304 --- /dev/null +++ b/CPCent7repo.json @@ -0,0 +1,192 @@ +[ + { + "Package": "MariaDB-client.x86_64", + "Version": "10.1.44-1.el7.centos", + "Repo": "@CyberPanel" + }, + { + "Package": "MariaDB-common.x86_64", + "Version": "10.1.44-1.el7.centos", + "Repo": "@CyberPanel" + }, + { + "Package": "MariaDB-devel.x86_64", + "Version": "10.1.44-1.el7.centos", + "Repo": "@CyberPanel" + }, + { + "Package": "MariaDB-server.x86_64", + "Version": "10.1.44-1.el7.centos", + "Repo": "@CyberPanel" + }, + { + "Package": "MariaDB-shared.x86_64", + "Version": "10.1.44-1.el7.centos", + "Repo": "@CyberPanel" + }, + { + "Package": "compat-libtidy.x86_64", + "Version": "0.99.0-37.20091203.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "dovecot.x86_64", + "Version": "2:2.3.10-2", + "Repo": "@CyberPanel" + }, + { + "Package": "dovecot-mysql.x86_64", + "Version": "2:2.3.10-2", + "Repo": "@CyberPanel" + }, + { + "Package": "fastlz.x86_64", + "Version": "0.1.0-0.1.20070619svnrev12.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "galera.x86_64", + "Version": "25.3.28-1.rhel7.el7.centos", + "Repo": "@CyberPanel" + }, + { + "Package": "htop.x86_64", + "Version": "2.2.0-3.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "jemalloc.x86_64", + "Version": "3.6.0-1.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libargon2.x86_64", + "Version": "20161029-3.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libbsd.x86_64", + "Version": "0.8.3-1.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libc-client.x86_64", + "Version": "2007f-16.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libdb4.x86_64", + "Version": "4.8.30-13.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "liblzf.x86_64", + "Version": "3.6-7.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libmcrypt.x86_64", + "Version": "2.5.8-13.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libopendkim.x86_64", + "Version": "2.11.0-0.1.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libsodium.x86_64", + "Version": "1.0.18-1.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "libtidy.x86_64", + "Version": "5.4.0-1.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "luajit.x86_64", + "Version": "2.0.4-3.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "oniguruma.x86_64", + "Version": "5.9.5-3.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "opendbx.x86_64", + "Version": "1.4.6-6.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "opendkim.x86_64", + "Version": "2.11.0-0.1.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "pdns.x86_64", + "Version": "4.2.2-1pdns.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "pdns-backend-mysql.x86_64", + "Version": "4.2.2-1pdns.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "postfix3.x86_64", + "Version": "2:3.4.7-1.gf.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "postfix3-ldap.x86_64", + "Version": "2:3.4.7-1.gf.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "postfix3-mysql.x86_64", + "Version": "2:3.4.7-1.gf.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "postfix3-pcre.x86_64", + "Version": "2:3.4.7-1.gf.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "pure-ftpd.x86_64", + "Version": "1.0.47-3.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "redis.x86_64", + "Version": "3.2.12-2.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "restic.x86_64", + "Version": "0.9.6-1.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "rsync31u.x86_64", + "Version": "3.1.3-1.ius.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "udns.x86_64", + "Version": "0.4-3.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "udns-devel.x86_64", + "Version": "0.4-3.el7", + "Repo": "@CyberPanel" + }, + { + "Package": "vim-minimal.x86_64", + "Version": "2:8.0.003-1.gf.el7", + "Repo": "@CyberPanel" + } +] \ No newline at end of file diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index a33421611..c81f38121 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -338,7 +338,7 @@ class InstallCyberPanel: install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) command = 'wget https://rep.cyberpanel.net/pure-ftpd-mysql_1.0.47-3_amd64.deb' - install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) + install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR).org command = 'dpkg --install --force-confold pure-ftpd-common_1.0.47-3_all.deb' install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)