Merge lp:~nottrobin/charms/trusty/apache2/relation-servername into lp:charms/trusty/apache2

[Robin Winslow]

For the assets manager project mojo spec (lp:~canonical-is/canonical-mojo-specs/mojo-comms-assets) we need access to the `servername` setting when the `website` relation is created.

I thought this would be a generally useful feature, and certainly wouldn't do any harm as it can just be ignored by charsm that don't want to use it, so I thought it'd be better to submit this MP rather than create a permanent fork of the apache2 charm.

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11009-results

review: Needs Fixing (automated testing)

[Marco Ceppi (marcoceppi)]

I'm 110% cautious allowing optional parameters to interfaces, but we spoke about this in chat already. Letting this one through.

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-12-29 19:26:41 +0000
+++ hooks/hooks.py	2015-02-09 13:18:17 +0000
@@ -771,8 +771,12 @@
     if my_host == "localhost":
         my_host = socket.gethostname()
     default_port = 80
-    subprocess.call(['relation-set', 'port=%d' % default_port,
-                     'hostname=%s' % my_host])
+    subprocess.call([
+        'relation-set',
+        'port=%d' % default_port,
+        'hostname=%s' % my_host,
+        'servername=%s' % config_get('servername')
+    ])
 
 
 def ensure_ports(ports):