-a -m SSL fingerprint support

diff --git a/manifests/init.pp b/manifests/init.pp
index ae25174a3cdd291062dd7f707923d346a185c1d0..fd1aa3401eef45cef0aa293d0916345bbabccc05 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,8 @@
 # Based on https://wiki.koumbit.net/QwebIrc
 class qwebirc($ircserver = 'irc.myserver.com', $ircport = '6667', $realname = 'http://moo.com/',
               $webirc_mode = 'None', $base_url = 'http://foo.foo.org/', $network_name = 'FooNet',
-              $sslport = false, $feedback_from = 'moo@moo.com', $feedback_to = 'moo@moo.com') {
+              $sslport = false, $feedback_from = 'moo@moo.com', $feedback_to = 'moo@moo.com',
+              $sslfingerprint = false) {
 
   package { [ 'python-twisted', 'python-openssl', 'python-simplejson', 'mercurial' ]:
     ensure => present,
@@ -31,8 +32,8 @@ class qwebirc($ircserver = 'irc.myserver.com', $ircport = '6667', $realname = 'h
   vcsrepo { "/var/lib/qwebirc":
     ensure   => present,
     provider => hg,
-    source   => 'https://bitbucket.org/qwebirc/qwebirc',
-    revision => '48dfc2ca0def',
+    source   => 'https://bitbucket.org/rhatto/qwebirc',
+    revision => 'cbc58859a6e1',
     owner    => 'qwebirc',
     group    => 'qwebirc',
     require  => [ User['qwebirc'], Group['qwebirc'], Package['mercurial'] ],

diff --git a/templates/config.py.erb b/templates/config.py.erb
index eec708beaf5267314845ad2d5c9d5a15e88546b8..b960f3758b00693f0ad6f4cbd87891262f89098e 100644 (file)
--- a/templates/config.py.erb
+++ b/templates/config.py.erb
@@ -26,6 +26,13 @@ IRCSERVER, IRCPORT = "<%= ircserver %>", <%= ircport %>
 #         If this option is uncommented it will override IRCPORT.
 SSLPORT = <%= sslport %>
 <% end %>
+
+<% if sslfingerprint != false %>
+# OPTION: SSLFINGERPRINT
+#         SHA1 Fingerprint of the IRC Server SSL key. Connections
+#         will fail if this fingerprint doesn't match.
+SSLFINGERPRINT = <%= sslfingerprint %>
+<% end %>
 # OPTION: REALNAME
 #         The realname field of IRC clients will be set to this value.
 REALNAME = "<%= realname %>"