Update eplite module for new version of eplite.
Etherpad lite has changed their source tree slightly. This has
required a few updates to the etherpad lite puppet module. The
custom pad.js needs to go in a different directory and the upstart
conf file needs a couple updated paths.
In addition to the fixes a couple things have been cleaned up. Now
define an etherpadlite.openstack.org node in site.pp and copy SSL
certs from /root/secret-files.
Change-Id: I312b419aa98212b6db68232c672bc4d75f23777f
diff --git a/manifests/init.pp b/manifests/init.pp
index 82d99fd..7408883 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -107,10 +107,6 @@
mode => 0664,
}
- package { 'git':
- ensure => present
- }
-
git_repo { 'nodejs_repo':
repo => 'https://github.com/joyent/node.git',
dest => "${base_install_dir}/nodejs",
@@ -151,7 +147,6 @@
user => $ep_user,
cwd => "${base_install_dir}/etherpad-lite",
environment => "HOME=${base_log_dir}/${ep_user}",
- creates => "${base_install_dir}/etherpad-lite/node_modules",
require => [Git_repo['etherpad_repo'],
Buildsource["${base_install_dir}/nodejs"]],
before => File["${base_install_dir}/etherpad-lite/settings.json"]
diff --git a/manifests/nginx.pp b/manifests/nginx.pp
index 506891e..a1b403b 100644
--- a/manifests/nginx.pp
+++ b/manifests/nginx.pp
@@ -18,10 +18,34 @@
content => template('etherpad_lite/nginx.erb'),
replace => 'true',
owner => 'root',
- require => Package['nginx'],
+ require => File['/etc/nginx/ssl/eplite.crt', '/etc/nginx/ssl/eplite.key'],
notify => Service['nginx']
}
+ file { '/etc/nginx/ssl':
+ ensure => directory,
+ owner => 'root',
+ mode => 0700,
+ }
+
+ file { '/etc/nginx/ssl/eplite.crt':
+ ensure => present,
+ replace => true,
+ owner => 'root',
+ mode => 0600,
+ source => 'file:///root/secret-files/eplite.crt',
+ require => Package['nginx'],
+ }
+
+ file { '/etc/nginx/ssl/eplite.key':
+ ensure => present,
+ replace => true,
+ owner => 'root',
+ mode => 0600,
+ source => 'file:///root/secret-files/eplite.key',
+ require => Package['nginx'],
+ }
+
service { 'nginx':
enable => true,
ensure => running,
diff --git a/manifests/site.pp b/manifests/site.pp
index d4527b1..7efcfd9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -30,7 +30,7 @@
require => Class['etherpad_lite']
}
- file { "${etherpad_lite::base_install_dir}/etherpad-lite/static/custom/pad.js":
+ file { "${etherpad_lite::base_install_dir}/etherpad-lite/src/static/custom/pad.js":
ensure => 'present',
source => 'puppet:///modules/etherpad_lite/pad.js',
owner => $etherpad_lite::ep_user,
diff --git a/templates/nginx.erb b/templates/nginx.erb
index 8554ec0..a816749 100644
--- a/templates/nginx.erb
+++ b/templates/nginx.erb
@@ -22,8 +22,8 @@
}
}
-#server {
-# listen 80 <%= default_server %>;
-# server_name <%= server_name %>;
-# rewrite ^(.*) https://$server_name$1 permanent;
-#}
+server {
+ listen 80 <%= default_server %>;
+ server_name <%= server_name %>;
+ rewrite ^(.*) https://$server_name$1 permanent;
+}
diff --git a/templates/upstart.erb b/templates/upstart.erb
index 5a3ddb1..9610779 100644
--- a/templates/upstart.erb
+++ b/templates/upstart.erb
@@ -19,8 +19,8 @@
end script
script
- cd $EPHOME/node
- exec su -s /bin/sh -c 'exec "$0" "$@"' $EPUSER -- /usr/local/bin/node server.js \
+ cd $EPHOME
+ exec su -s /bin/sh -c 'exec "$0" "$@"' $EPUSER -- /usr/local/bin/node node_modules/ep_etherpad-lite/node/server.js \
>> $EPLOGS/access.log \
2>> $EPLOGS/error.log
end script
