From 2f56a516de48a9f57a7893c33ae98f85076ad0b6 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 26 Jun 2015 18:53:26 +0530 Subject: [PATCH] ikiwiki: Minor styling and fix - Minor styling update in service description. - Fix a minor issue that a2query outputs on STDERR when the configuration is disabled. --- actions/ikiwiki | 3 ++- plinth/modules/ikiwiki/__init__.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/actions/ikiwiki b/actions/ikiwiki index a341f1340..ea50df038 100755 --- a/actions/ikiwiki +++ b/actions/ikiwiki @@ -83,7 +83,8 @@ def subcommand_setup(_): def subcommand_get_enabled(_): """Get whether ikiwiki site is enabled.""" try: - subprocess.check_output(['a2query', '-c', 'ikiwiki-plinth']) + subprocess.check_output(['a2query', '-c', 'ikiwiki-plinth'], + stderr=subprocess.STDOUT) print('yes') except subprocess.CalledProcessError: print('no') diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py index 53de77d38..f8fe73fa6 100644 --- a/plinth/modules/ikiwiki/__init__.py +++ b/plinth/modules/ikiwiki/__init__.py @@ -42,5 +42,5 @@ def init(): global service service = service_module.Service( - 'ikiwiki', _('ikiwiki wikis and blogs'), ['http', 'https'], + 'ikiwiki', _('Ikiwiki wikis and blogs'), ['http', 'https'], is_external=True, enabled=enabled)