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

[Casey Marshall]

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

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

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'templates/bip_conf.template'
--- templates/bip_conf.template	2013-07-25 05:58:50 +0000
+++ templates/bip_conf.template	2014-02-11 17:34:24 +0000
@@ -20,7 +20,13 @@
 {%for net in network.keys() -%}
 network {
     name = "{{ net }}";
-    server { host = "{{ network[net]['host'] }}"; port = {{ network[net]['port'] }}; };
+{%if network[net]['ssl'] -%}
+    ssl = true;
+{%endif%}
+    server {
+        host = "{{ network[net]['host'] }}";
+        port = {{ network[net]['port'] }};
+    };
 };
 {% endfor -%}
 
@@ -36,6 +42,12 @@
     connection {
         name = "{{ s }}";
         network = "{{ s }}";
+        {%if user[u]['server'][s]['on_connect_send'] -%}
+        on_connect_send = "{{ user[u]['server'][s]['on_connect_send'] }}";
+        {%endif%}
+        {%if user[u]['server'][s]['password'] -%}
+        password = "{{ user[u]['server'][s]['password'] }}";
+        {%endif%}
         {%for c in user[u]['server'][s]['channel'] -%}
         channel {
             name = "{{ user[u]['server'][s]['channel'][c]['name'] }}";