Merge lp:~rcj/charms/trusty/bip/lp1604759 into lp:charms/trusty/bip

[Robert C Jennings]

X-CPC-Summary-Skip: 1

[Robert C Jennings (rcj)]

This is a regression from the Precise charm. The patch is the same as the patch from Precise.

[Jose L. VG (josvaz)]

Seems client_side_ssl config option from bip is also not supported by the charm.

Any objections to post a MP after this to try to add support for it?

That way we would not need to resort to SSH tunelling separately to secure the access.

[Robert C Jennings (rcj)]

@josvaz, that would be a fine enhancement for an MP.

[Jose L. VG (josvaz)]

Ok, I will post after this one.
(I might need help figuring out the code...)

[Jose L. VG (josvaz)]

I did not wait, this is the bug for lack of client_side_ssl support:
https://bugs.launchpad.net/charms/+source/bip/+bug/1604894

And this is the in progress MP:
https://code.launchpad.net/~josvaz/charms/trusty/bip/lp1604894/+merge/300643

[Stuart Bishop (stub)]

Looks good to me.

review: Approve

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4736/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/4898/

review: Approve (automated testing)

=== modified file 'config.yaml'
--- config.yaml	2014-11-03 07:18:19 +0000
+++ config.yaml	2016-07-20 10:29:35 +0000
@@ -27,6 +27,10 @@
     type: string
     default: "false"
     description: If bip is backlogging just messages and notices, or all topic changes, nick changes etc.
+  backlog_always:
+    type: string
+    default: "false"
+    description: Backlog even lines already backlogged
   network:
     type: string
     default: '{"oftc": {host: "irc.oftc.net", port: 6667}, "freenode": {host: "irc.freenode.net", port: 6667}}'

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-12-12 05:10:04 +0000
+++ hooks/hooks.py	2016-07-20 10:29:35 +0000
@@ -46,6 +46,7 @@
 user_config = config().get('user')
 backlog_lines = config().get('backlog_lines')
 backlog_msg_only = config().get('backlog_msg_only')
+backlog_always = config().get('backlog_always')
 bip_conf = '/etc/bip.conf'
 bip_defaults = '/etc/default/bip'
 
@@ -91,6 +92,7 @@
         'user': user,
         'backlog_lines': backlog_lines,
         'backlog_msg_only': backlog_msg_only,
+        'backlog_always': backlog_always,
     }
     template = template_env.get_template('bip_conf.template').render(templ_vars)
     with open(bip_conf, 'w') as bip_conf_config:

=== modified file 'templates/bip_conf.template'
--- templates/bip_conf.template	2014-11-03 07:18:19 +0000
+++ templates/bip_conf.template	2016-07-20 10:29:35 +0000
@@ -15,7 +15,7 @@
 backlog = true;
 backlog_lines = {{ backlog_lines }};
 backlog_msg_only = {{ backlog_msg_only }};
-backlog_always = true;
+backlog_always = {{ backlog_always }};
 blreset_on_talk = false;
 
 {%for net in network.keys() -%}