Ensure abiword package is always present
Change I9831526581a5fc1f2014c9985637664c79b937bf moved the required packages list statement into a conditional block, making it to be ensured only in the case nodejs_version was set to 'system'. This was causing the abiword library to not be installed and then etherpad.o.o was appending the following error message to new pads: Error: Abiword does not exist at this path, check your settings file -- To suppress these warning messages change suppressErrorsInPadText to true in your settings.json This patch makes the abiword library to always be installed by moving it out of that conditional statement. Change-Id: I50f55e4408d850b2bf449b121b9014d511518481
This commit is contained in:
parent
72177180db
commit
957ecb6cef
@ -45,6 +45,10 @@ class etherpad_lite (
|
|||||||
mode => '0664',
|
mode => '0664',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
package { 'abiword':
|
||||||
|
ensure => present,
|
||||||
|
}
|
||||||
|
|
||||||
if ($nodejs_version != 'system') {
|
if ($nodejs_version != 'system') {
|
||||||
vcsrepo { "${base_install_dir}/nodejs":
|
vcsrepo { "${base_install_dir}/nodejs":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
@ -63,7 +67,6 @@ class etherpad_lite (
|
|||||||
'python',
|
'python',
|
||||||
'libssl-dev',
|
'libssl-dev',
|
||||||
'pkg-config',
|
'pkg-config',
|
||||||
'abiword',
|
|
||||||
'build-essential',
|
'build-essential',
|
||||||
]:
|
]:
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user