Merge lp://staging/~mskalka/charm-helpers/apache-servertokens into lp://staging/charm-helpers

Hi Michael, thank you for submitting a patch to charm-helpers. In general your patch looks find although I do have once comment below with regards to changing the template filename.

I'm getting some unit test errors. Please fix these errors and run make test.

======================================================================
ERROR: test_ApacheConfContext (tests.contrib.hardening.apache.checks.test_config.ApacheConfigTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/.venv/local/lib/python2.7/site-packages/mock.py", line 1201, in patched
    return func(*args, **keywargs)
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/tests/contrib/hardening/apache/checks/test_config.py", line 75, in test_ApacheConfContext
    self.assertEqual(ctxt(), {'allowed_http_methods': set(['GOGETEM']),
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/charmhelpers/contrib/hardening/apache/checks/config.py", line 98, in __call__
    ctxt['servertokens'] = settings['hardening']['servertokens']
KeyError: 'servertokens'

======================================================================
ERROR: test_apache_conf_and_check (tests.contrib.hardening.test_templating.TemplatingTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/.venv/local/lib/python2.7/site-packages/mock.py", line 1201, in patched
    return func(*args, **keywargs)
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/tests/contrib/hardening/test_templating.py", line 255, in test_apache_conf_and_check
    self.render(renderers)
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/tests/contrib/hardening/test_templating.py", line 74, in render
    template.comply(p)
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/charmhelpers/contrib/hardening/audits/file.py", line 393, in comply
    render_and_write(self.template_dir, path, self.context())
  File "/mnt/trusty/home/user1/bzr/charmstore/charm-helpers/charmhelpers/contrib/hardening/apache/checks/config.py", line 98, in __call__
    ctxt['servertokens'] = settings['hardening']['servertokens']
KeyError: 'servertokens'

> I'm getting some unit test errors. Please fix these errors and run make test.

Edward,

Thank you for the review, apologies for skipping the unittests, I should know better at this point. Fix is pushed up.

Michael

Hey Michael,

Just a heads up, you don't need to add

ctxt['servertokens'] = settings['hardening']['servertokens']

because you have the line

settings = utils.get_settings('apache')
ctxt = settings['hardening']

above it.

Thanks lgtm.

LGTM also, but please note Joseph's comment about ctxt; it's redundant.