Merge lp:~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip into lp:charms/postgresql

[Richard Asbridge]

I added a new config option called admin_ip that defaults to "none" when this option is set using the usual "juju set" command, it causes the given IP address to be added to the pg_hba.conf file in the following manner...

host all all 10.0.3.1 md5

...if admin_ip is left unconfigured then it has no effect.

This is handy for developers using juju in local mode where they want to connect tools such as pgAdmin from their host machine to the postgres instances running inside of juju.

[Marco Ceppi (marcoceppi)]

Please resubmit with the merge into branch being "lp:charms/postgresql" and the proposed branch "lp:~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip"

review: Needs Resubmitting

[Stuart Bishop (stub)]

Thanks for this. I see the use case (I even have most of a charm that lets you run pgadmin via ssh and x forwarding).

I think the current implementation is too limiting to put into the store charm. I think that we should turn the string called admin_ip into a list called admin_addresses. It is a minor modification to allow multiple admin addresses, and we can extend it in the future to allow multiple ip addres ranges using xx.xx.xx.xx/xx syntax.

Do you want to make the modifications? Otherwise I can make the changes.

review: Needs Fixing

[lp:~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip]

66. By Richard Asbridge on 2013-09-20

changed to work with a list of admin IP addresses rather than just a single address

67. By Richard Asbridge on 2013-09-23

[Stuart Bishop (stub)]

Looks ready. I'll land this.

Thanks!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-09-12 20:09:44 +0000
+++ config.yaml	2013-09-23 09:39:26 +0000
@@ -1,4 +1,14 @@
 options:
+  admin_addresses:
+    default: ""
+    type: string
+    description: |
+      A comma-separated list of IP Addresses (or single IP) admin tools like 
+		pgAdmin3 will connect from, this is most useful for developers running 
+		juju in local mode who need to connect tools like pgAdmin to a postgres. 
+		The IP addresses added here will be included in the pg_hba.conf file 
+		allowing ip connections to all databases on the server from the given 
+		using md5 password encryption.
   locale:
     default: "C"
     type: string
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-09-12 20:09:44 +0000
+++ hooks/hooks.py	2013-09-23 09:39:26 +0000
@@ -494,6 +494,24 @@
                              }
         relation_data.append(local_replication)
 
+    # Admin IP addresses for people using tools like pgAdminIII in a local JuJu
+    # We accept a single IP or a comma separated list of IPs, these are added
+    # to the list of relations that end up in pg_hba.conf thus granting
+    # the IP addresses socket access to the postgres server.
+    if config_data["admin_addresses"] != '':
+        if "," in config_data["admin_addresses"]:
+            admin_ip_list = config_data["admin_addresses"].split(",")
+        else:
+            admin_ip_list = [config_data["admin_addresses"]]
+
+        for admin_ip in admin_ip_list:
+            admin_host = {'database':'all',
+                'user':'all',
+                'private-address':munge_address(admin_ip),
+            }
+            relation_data.append(admin_host)
+
+
     pg_hba_template = Template(open("templates/pg_hba.conf.tmpl").read())
     host.write_file(
         postgresql_hba, pg_hba_template.render(access_list=relation_data),