opendev/puppet-etherpad_lite
Code Issues Proposed changes

Fix env for plugin installs

Browse Source 
In an earlier change we set up npm installations to happen in the eplite
user's homedir rather than in the log dir. We did this because with
systemd we no longer have a log dir on all installations. The etherpad
lite plugin installation was still attemping to use the log dir which
doesn't work on newer systems.

Update this plugin installation process to use the homedir like the
normal installation process.

Also add plugin installation to the tests we run to test this works now.

Change-Id: I5cff75c89b16d61c4902c920259b82463306833e
This commit is contained in:
Clark Boylan 2018-10-15 12:59:56 -07:00
parent db668928a9
commit 51fc103d82
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/plugin.pp
View File

@ -6,8 +6,11 @@ define etherpad_lite::plugin {
cwd => $etherpad_lite::modules_dir, cwd => $etherpad_lite::modules_dir,
path => $etherpad_lite::path, path => $etherpad_lite::path,
user => $etherpad_lite::ep_user, user => $etherpad_lite::ep_user,
environment => "HOME=${etherpad_lite::base_log_dir}/${etherpad_lite::ep_user}", environment => "HOME=/home/${etherpad_lite::ep_user}",
creates => "${etherpad_lite::modules_dir}/${plugin_name}", creates => "${etherpad_lite::modules_dir}/${plugin_name}",
require => Class['etherpad_lite'] require => [
Class['etherpad_lite'],
User[$etherpad_lite::ep_user],
],
} }
} }

4
spec/acceptance/fixtures/etherpad_lite.pp
View File

@ -19,3 +19,7 @@ class { '::etherpad_lite::site':
database_password => 'password', database_password => 'password',
etherpad_title => 'A fake title', etherpad_title => 'A fake title',
} }
etherpad_lite::plugin { 'ep_headings':
require => Class['etherpad_lite'],
}