Fix charm for jujucharms.com use

hooks/web-relation-joined

 #!/usr/bin/env python2
 #-*- python -*-
 
 import socket
 from charmhelpers import (
     get_config,
     relation_set,
 )
-

[benji, 2013/04/27 20:29:30]

Unnecessary newline.

[gary.poster, 2013/04/28 01:48:15]

I was doing as the Romans do, but eh, I don't think the Romans will notice. 
Deleted.

-from utils import (
-    log_hook,

[benji, 2013/04/27 20:29:30]

You can use a one-liner here.

[gary.poster, 2013/04/28 01:48:15]

Again, I was following the local patterns in the charm, but eh, I agree. 
Changed.

-)
+from utils import log_hook
 
 
 def main():
-    hostname = socket.getfqdn(socket.gethostname())
-    if hostname == "localhost":
-        hostname = socket.gethostname()

[benji, 2013/04/27 20:29:30]

I'm pretty sure lines 16-18 are equivalent to

hostname = socket.getfqdn()

[gary.poster, 2013/04/28 01:48:15]

I stared at this for a bit.  I think you are probably right.  What I had here is
what the haproxy or apache2 charms are doing, I forget.  Under the time
pressure, it is arguably better to go with the proven code.  However,  decided
to go with the simpler version you proposed.  If it doesn't work, we'll find out
why and add a comment about it, unlike the other charm I saw.

+    hostname = socket.getfqdn()
     config = get_config()
     if config['secure']:
         port = 443
     else:
         port = 80
     relation_set(port=port, hostname=hostname)
 
 if __name__ == '__main__':
     with log_hook():
         main()