From d48d27b3802ef8a36d53ac69b890e9eb08da2e4f Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 22 Jul 2015 18:20:36 +0200
Subject: [PATCH] Switch to the new Etherpad perl module Which replace
 Etherpad::API

---
 templates/default/documentation.html.ep | 10 ++++------
 vroom.pl                                |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/templates/default/documentation.html.ep b/templates/default/documentation.html.ep
index 2f75f55..f269a95 100644
--- a/templates/default/documentation.html.ep
+++ b/templates/default/documentation.html.ep
@@ -129,8 +129,7 @@
               <li>
                 For Etherpad-Lite support:
                 <ul>
-                  <li>Etherpad::API</li>
-                  <li>LWP::Protocol::https</li>
+                  <li>Etherpad</li>
                 </ul>
               </li>
               <li>
@@ -212,8 +211,7 @@ yum install git tar wget httpd mod_ssl openssl mariadb-server \\
             'perl(Mojolicious::Plugin::StaticCompressor' \\
             'perl(Mojolicious::Plugin::RenderFile)' \\
             'perl(Crypt::SaltedHash)' \\
-            'perl(Etherpad::API)' \\
-            'perl(LWP::Protocol::https)' \\
+            'perl(Etherpad)' \\
             'perl(Sesion::Token)' \\
             'perl(Email::Valid)' \\
             'perl(File::Temp)' \\
@@ -434,9 +432,9 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini</pre>
         <ul>
           <li><strong>uri</strong>: The URI to reach your Etherpad Lite instance. This instance must share the same base domain as VROOM because
             of the way sessions are created (Etherpad Lite sessions are created by VROOM directly and sent as a cookie to the clients)</li>
-          <li><strong>api_key</strong>: The API key of your Etherpad-Lite instance. You can find it in the file <strong>APIKEY.txt</strong> at the root
+          <li><strong>api_key</strong>: The API key of your Etherpad Lite instance. You can find it in the file <strong>APIKEY.txt</strong> at the root
             of your Etherpad Lite installation</li>
-          <li><strong>base_domain</strong>: This is the common part of your domain between VROOM and Etherpad-Lite. For example, if you have VROOM running
+          <li><strong>base_domain</strong>: This is the common part of your domain between VROOM and Etherpad Lite. For example, if you have VROOM running
             on https://vroom.example.net/ and Etherpad-Lite as https://pads.example.net, you'd put <kbd>base_domain = 'example.net'</kbd> here</li>
         </ul>
       </p>
diff --git a/vroom.pl b/vroom.pl
index d688d16..02c00cb 100755
--- a/vroom.pl
+++ b/vroom.pl
@@ -44,10 +44,10 @@ foreach my $dir (qw/assets/){
 our $optf = {};
 # Create etherpad api client if enabled
 if ($config->{'etherpad.uri'} =~ m/https?:\/\/.*/ && $config->{'etherpad.api_key'} ne ''){
-  my $etherpad = eval { require Etherpad::API };
+  my $etherpad = eval { require Etherpad };
   if ($etherpad){
-    import Etherpad::API;
-    $optf->{etherpad} = Etherpad::API->new({
+    import Etherpad;
+    $optf->{etherpad} = Etherpad->new({
       url => $config->{'etherpad.uri'},
       apikey => $config->{'etherpad.api_key'}
     });
@@ -57,7 +57,7 @@ if ($config->{'etherpad.uri'} =~ m/https?:\/\/.*/ && $config->{'etherpad.api_key
     }
   }
   else{
-    app->log->info("Etherpad::API not found, disabling Etherpad-Lite support");
+    app->log->info("Etherpad perl module not found, disabling Etherpad-Lite support");
   }
 }