dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch to the new Etherpad perl module 

Which replace Etherpad::API
This commit is contained in:
Daniel Berteaud 2015-07-22 18:20:36 +02:00
parent 10477bb90e
commit d48d27b380
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/default/documentation.html.ep
View File

@ -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>

8
vroom.pl
View File

@ -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");
}
}