From 25fa0236fd0da58f9251926c39058af17eb782a2 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Tue, 14 Apr 2015 13:19:20 +0530 Subject: [PATCH] Show HHVM and Pagespeed info into site configuration --- ee/cli/plugins/site.py | 13 +++++++++---- ee/cli/templates/siteinfo.mustache | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index b2757572..973a0000 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -115,6 +115,7 @@ class EESiteController(CementBaseController): ee_db_name = '' ee_db_user = '' ee_db_pass = '' + hhvm = '' if not check_domain_exists(self, ee_domain): Log.error(self, "site {0} does not exist".format(ee_domain)) @@ -131,14 +132,18 @@ class EESiteController(CementBaseController): ee_db_user = siteinfo.db_user ee_db_pass = siteinfo.db_password ee_db_host = siteinfo.db_host + if sitetype != "html": + hhvm = ("enabled" if siteinfo.is_hhvm else "disabled") + + pagespeed = ("enabled" if siteinfo.is_pagespeed else "disabled") data = dict(domain=ee_domain, webroot=ee_site_webroot, accesslog=access_log, errorlog=error_log, dbname=ee_db_name, dbuser=ee_db_user, - dbpass=ee_db_pass, type=sitetype + " " + cachetype + - " ({0})".format("enabled" - if siteinfo.is_enabled else - "disabled")) + dbpass=ee_db_pass, hhvm=hhvm, pagespeed=pagespeed, + type=sitetype + " " + cachetype + " ({0})" + .format("enabled" if siteinfo.is_enabled else + "disabled")) self.app.render((data), 'siteinfo.mustache') else: Log.error(self, "nginx configuration file does not exist" diff --git a/ee/cli/templates/siteinfo.mustache b/ee/cli/templates/siteinfo.mustache index dfe7d917..0381a3f0 100644 --- a/ee/cli/templates/siteinfo.mustache +++ b/ee/cli/templates/siteinfo.mustache @@ -1,6 +1,8 @@ Information about {{domain}}: Nginx configuration {{type}} {{enable}} +{{#pagespeed}}Pagespeed {{pagespeed}}{{/pagespeed}} +{{#hhvm}}HHVM {{hhvm}}{{/hhvm}} access_log {{accesslog}} error_log {{errorlog}} Webroot {{webroot}}