Browse Source

Fix db issue

master
Prabuddha Chakraborty 9 years ago
parent
commit
90d34c1af2
  1. 14
      ee/cli/plugins/info.py
  2. 2
      ee/cli/plugins/sitedb.py

14
ee/cli/plugins/info.py

@ -244,7 +244,7 @@ class EEInfoController(CementBaseController):
def default(self): def default(self):
"""default function for info""" """default function for info"""
if (not self.app.pargs.nginx and not self.app.pargs.php if (not self.app.pargs.nginx and not self.app.pargs.php
and not self.app.pargs.mysql): and not self.app.pargs.mysql and not self.app.pargs.php7):
self.app.pargs.nginx = True self.app.pargs.nginx = True
self.app.pargs.php = True self.app.pargs.php = True
self.app.pargs.mysql = True self.app.pargs.mysql = True
@ -256,10 +256,16 @@ class EEInfoController(CementBaseController):
Log.error(self, "Nginx is not installed") Log.error(self, "Nginx is not installed")
if self.app.pargs.php: if self.app.pargs.php:
if EEAptGet.is_installed(self, 'php5-fpm'): if EEVariables.ee_platform_codename != 'trusty':
self.info_php() if EEAptGet.is_installed(self, 'php5-fpm'):
self.info_php()
else:
Log.error(self, "PHP5 is not installed")
else: else:
Log.error(self, "PHP5 is not installed") if EEAptGet.is_installed(self, 'php5.6-fpm'):
self.info_php()
else:
Log.error(self, "PHP5.6 is not installed")
if self.app.pargs.php7: if self.app.pargs.php7:
if EEAptGet.is_installed(self, 'php7.0-fpm'): if EEAptGet.is_installed(self, 'php7.0-fpm'):

2
ee/cli/plugins/sitedb.py

@ -42,7 +42,7 @@ def getSiteInfo(self, site):
def updateSiteInfo(self, site, stype='', cache='', webroot='', def updateSiteInfo(self, site, stype='', cache='', webroot='',
enabled=True, ssl=False, fs='', db='', db_name=None, enabled=True, ssl=False, fs='', db='', db_name=None,
db_user=None, db_password=None, db_host=None, hhvm=None, db_user=None, db_password=None, db_host=None, hhvm=None,
pagespeed=None, php_version='5.5'): pagespeed=None, php_version=''):
"""updates site record in database""" """updates site record in database"""
try: try:
q = SiteDB.query.filter(SiteDB.sitename == site).first() q = SiteDB.query.filter(SiteDB.sitename == site).first()

Loading…
Cancel
Save