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

Proposed by Robert C Jennings on 2016-07-20
Status: Merged
Merged at revision: 25
Proposed branch: lp:~rcj/charms/trusty/bip/lp1604759
Merge into: lp:charms/trusty/bip
Diff against target: 47 lines (+7/-1)
3 files modified
config.yaml (+4/-0)
hooks/hooks.py (+2/-0)
templates/bip_conf.template (+1/-1)
To merge this branch: bzr merge lp:~rcj/charms/trusty/bip/lp1604759
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Approve on 2016-07-31
Stuart Bishop 2016-07-20 Approve on 2016-07-22
Review via email: mp+300585@code.launchpad.net

Description of the change

X-CPC-Summary-Skip: 1

To post a comment you must log in.
Robert C Jennings (rcj) wrote :

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

Jose L. VG (josvaz) wrote :

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) wrote :

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

Jose L. VG (josvaz) wrote :

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

Jose L. VG (josvaz) wrote :

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) wrote :

Looks good to me.

review: Approve
Review Queue (review-queue) wrote :

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) wrote :

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

review: Approve (automated testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-11-03 07:18:19 +0000
3+++ config.yaml 2016-07-20 10:29:35 +0000
4@@ -27,6 +27,10 @@
5 type: string
6 default: "false"
7 description: If bip is backlogging just messages and notices, or all topic changes, nick changes etc.
8+ backlog_always:
9+ type: string
10+ default: "false"
11+ description: Backlog even lines already backlogged
12 network:
13 type: string
14 default: '{"oftc": {host: "irc.oftc.net", port: 6667}, "freenode": {host: "irc.freenode.net", port: 6667}}'
15
16=== modified file 'hooks/hooks.py'
17--- hooks/hooks.py 2014-12-12 05:10:04 +0000
18+++ hooks/hooks.py 2016-07-20 10:29:35 +0000
19@@ -46,6 +46,7 @@
20 user_config = config().get('user')
21 backlog_lines = config().get('backlog_lines')
22 backlog_msg_only = config().get('backlog_msg_only')
23+backlog_always = config().get('backlog_always')
24 bip_conf = '/etc/bip.conf'
25 bip_defaults = '/etc/default/bip'
26
27@@ -91,6 +92,7 @@
28 'user': user,
29 'backlog_lines': backlog_lines,
30 'backlog_msg_only': backlog_msg_only,
31+ 'backlog_always': backlog_always,
32 }
33 template = template_env.get_template('bip_conf.template').render(templ_vars)
34 with open(bip_conf, 'w') as bip_conf_config:
35
36=== modified file 'templates/bip_conf.template'
37--- templates/bip_conf.template 2014-11-03 07:18:19 +0000
38+++ templates/bip_conf.template 2016-07-20 10:29:35 +0000
39@@ -15,7 +15,7 @@
40 backlog = true;
41 backlog_lines = {{ backlog_lines }};
42 backlog_msg_only = {{ backlog_msg_only }};
43-backlog_always = true;
44+backlog_always = {{ backlog_always }};
45 blreset_on_talk = false;
46
47 {%for net in network.keys() -%}

Subscribers

People subscribed via source and target branches

to all changes: