removing more upstart bits
diff --git a/manifests/init.pp b/manifests/init.pp
index 4ce4884..058185a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -85,15 +85,8 @@
creates => "${base_install_dir}/etherpad-lite/node_modules",
}
- file { '/etc/init/etherpad-lite.conf':
- ensure => present,
- content => template('etherpad_lite/upstart.erb'),
- replace => true,
- owner => 'root',
- }
-
systemd::unit_file { 'etherpad-lite.service':
- source => 'puppet:///modules/puppet-etherpad_lite/etherpad-lite.service',
+ source => 'puppet:///modules/etherpad_lite/etherpad-lite.service',
}
file { "${base_log_dir}/${ep_user}":
diff --git a/templates/upstart.erb b/templates/upstart.erb
deleted file mode 100644
index 1281da7..0000000
--- a/templates/upstart.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-description "etherpad-lite"
-
-start on started networking
-stop on runlevel [!2345]
-
-env EPHOME=<%= @base_install_dir %>/etherpad-lite
-env EPLOGS=<%= @base_log_dir %>/<%= @ep_user %>
-env EPUSER=<%= @ep_user %>
-
-respawn
-
-pre-start script
- chdir $EPHOME
- mkdir $EPLOGS ||true
- chown -R $EPUSER:admin $EPLOGS ||true
- chmod 0755 $EPLOGS ||true
- chown -R $EPUSER:admin $EPHOME/var ||true
- bin/installDeps.sh >> $EPLOGS/error.log || { stop; exit 1; }
-end script
-
-setuid <%= @ep_user %>
-setgid <%= @ep_user %>
-limit nofile 8192 16384
-script
- cd $EPHOME
- /usr/local/bin/node --stack_size=1968 node_modules/ep_etherpad-lite/node/server.js \
- >> $EPLOGS/access.log \
- 2>> $EPLOGS/error.log
-end script
