Merge lp:~cmars/charms/precise/bip/trunk into lp:charms/bip

Proposed by Casey Marshall
Status: Merged
Merged at revision: 16
Proposed branch: lp:~cmars/charms/precise/bip/trunk
Merge into: lp:charms/bip
Diff against target: 31 lines (+13/-1)
1 file modified
templates/bip_conf.template (+13/-1)
To merge this branch: bzr merge lp:~cmars/charms/precise/bip/trunk
Reviewer Review Type Date Requested Status
Marco Ceppi Approve
Review via email: mp+205823@code.launchpad.net

Commit message

Added SSL option, server passwords and on_connect_send for nickserv support.

Description of the change

Added SSL option, server passwords and on_connect_send for nickserv support.

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/bip_conf.template'
2--- templates/bip_conf.template 2013-07-25 05:58:50 +0000
3+++ templates/bip_conf.template 2014-02-11 17:34:24 +0000
4@@ -20,7 +20,13 @@
5 {%for net in network.keys() -%}
6 network {
7 name = "{{ net }}";
8- server { host = "{{ network[net]['host'] }}"; port = {{ network[net]['port'] }}; };
9+{%if network[net]['ssl'] -%}
10+ ssl = true;
11+{%endif%}
12+ server {
13+ host = "{{ network[net]['host'] }}";
14+ port = {{ network[net]['port'] }};
15+ };
16 };
17 {% endfor -%}
18
19@@ -36,6 +42,12 @@
20 connection {
21 name = "{{ s }}";
22 network = "{{ s }}";
23+ {%if user[u]['server'][s]['on_connect_send'] -%}
24+ on_connect_send = "{{ user[u]['server'][s]['on_connect_send'] }}";
25+ {%endif%}
26+ {%if user[u]['server'][s]['password'] -%}
27+ password = "{{ user[u]['server'][s]['password'] }}";
28+ {%endif%}
29 {%for c in user[u]['server'][s]['channel'] -%}
30 channel {
31 name = "{{ user[u]['server'][s]['channel'][c]['name'] }}";

Subscribers

People subscribed via source and target branches

to all changes: