Merge ~gtrkiller/apache2-charm:master into apache2-charm:master

[Franco Luciano Forneron Buschiazzo]

Mellon config files hotfix

Mellon_create_metadata is replacing "-" for "_" in the hostname when creating the names of the files. This fixes it for that character in particular so we can now use hostnames containing "-".

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 01ac45870dfbd60f935d83b719ac411e4566d499

diff --git a/hooks/hooks.py b/hooks/hooks.py
index f6d04c6..64c53e0 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -790,14 +790,15 @@ def config_changed():
                     raise IOError
         except IOError:
             mellon_dir = "/etc/apache2/mellon"
+            modified_servername = servername.replace("-", "_")
             lines = [
                 '<Location />\n',
                 '    MellonSPPrivateKeyFile {}/https_{}.key\n'.format(
-                    mellon_dir, servername),
+                    mellon_dir, modified_servername),
                 '    MellonSPCertFile {}/https_{}.cert\n'.format(
-                    mellon_dir, servername),
+                    mellon_dir, modified_servername),
                 '    MellonSPMetadataFile {}/https_{}.xml\n'.format(
-                    mellon_dir, servername),
+                    mellon_dir, modified_servername),
                 '    MellonIdPMetadataFile {}/IdpMetadata.xml\n'.format(
                     mellon_dir),
                 '    MellonEndpointPath /mellon\n',