Update dependencies
* display domain type in `wo site info`
This commit is contained in:
@@ -2,10 +2,10 @@ cement==2.10.12
|
||||
pystache>=0.5.4
|
||||
pynginxconfig>=0.3.4
|
||||
PyMySQL>=0.9.3
|
||||
psutil>=5.6.3
|
||||
psutil>=5.6.7
|
||||
sh>=1.12.14
|
||||
SQLAlchemy>=1.3.8
|
||||
SQLAlchemy>=1.3.11
|
||||
requests>=2.22.0
|
||||
distro>=1.4.0
|
||||
argcomplete>=1.10.0
|
||||
argcomplete>=1.10.3
|
||||
colorlog>=4.0.2
|
||||
6
setup.py
6
setup.py
@@ -65,12 +65,12 @@ setup(name='wordops',
|
||||
'pystache >= 0.5.4',
|
||||
'pynginxconfig >= 0.3.4',
|
||||
'PyMySQL >= 0.9.3',
|
||||
'psutil >= 5.6.3',
|
||||
'psutil >= 5.6.7',
|
||||
'sh >= 1.12.14',
|
||||
'SQLAlchemy >= 1.3.8',
|
||||
'SQLAlchemy >= 1.3.11',
|
||||
'requests >= 2.22.0',
|
||||
'distro >= 1.4.0',
|
||||
'argcomplete >= 1.10.0',
|
||||
'argcomplete >= 1.10.3',
|
||||
'colorlog >= 4.0.2',
|
||||
],
|
||||
extras_require={ # Optional
|
||||
|
||||
@@ -133,7 +133,6 @@ class WOSiteController(CementBaseController):
|
||||
Log.error(self, 'could not input site name')
|
||||
pargs.site_name = pargs.site_name.strip()
|
||||
wo_domain = WODomain.validate(self, pargs.site_name)
|
||||
wo_www_domain = "www.{0}".format(wo_domain)
|
||||
(wo_domain_type, wo_root_domain) = WODomain.getlevel(
|
||||
self, wo_domain)
|
||||
wo_db_name = ''
|
||||
@@ -153,7 +152,6 @@ class WOSiteController(CementBaseController):
|
||||
wo_db_name = siteinfo.db_name
|
||||
wo_db_user = siteinfo.db_user
|
||||
wo_db_pass = siteinfo.db_password
|
||||
wo_db_host = siteinfo.db_host
|
||||
|
||||
php_version = siteinfo.php_version
|
||||
|
||||
@@ -164,7 +162,8 @@ class WOSiteController(CementBaseController):
|
||||
else:
|
||||
sslprovider = ''
|
||||
sslexpiry = ''
|
||||
data = dict(domain=wo_domain, webroot=wo_site_webroot,
|
||||
data = dict(domain=wo_domain, domain_type=wo_domain_type,
|
||||
webroot=wo_site_webroot,
|
||||
accesslog=access_log, errorlog=error_log,
|
||||
dbname=wo_db_name, dbuser=wo_db_user,
|
||||
php_version=php_version,
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
Information about {{domain}}:
|
||||
Information about {{domain}} ({{domain_type}}):
|
||||
|
||||
|
||||
Nginx configuration {{type}} {{enable}}
|
||||
{{#php_version}}PHP Version {{php_version}}{{/php_version}}
|
||||
|
||||
Reference in New Issue
Block a user