diff --git a/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache b/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache index f73a5550..79f3d5fb 100644 --- a/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache +++ b/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache @@ -36,8 +36,6 @@ templates: target: ext/{{{project}}}.logrotate-legacy.conf - source: ext/ezbake.tmpfiles.conf.erb target: ext/{{{project}}}.tmpfiles.conf - - source: ext/ezbake.needrestart.conf.erb - target: ext/{{{project}}}.needrestart.conf - ext/redhat/preinst.erb - ext/redhat/postinst.erb - ext/redhat/prerm.erb diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/ezbake.needrestart.conf.erb b/resources/puppetlabs/lein-ezbake/template/global/ext/ezbake.needrestart.conf.erb deleted file mode 100644 index 5efff50d..00000000 --- a/resources/puppetlabs/lein-ezbake/template/global/ext/ezbake.needrestart.conf.erb +++ /dev/null @@ -1 +0,0 @@ -push @{$nrconf{blacklist_rc}}, qr(^<%= EZBake::Config[:project] -%>) diff --git a/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb b/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb index e460d680..5cbd99b8 100755 --- a/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb +++ b/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb @@ -34,7 +34,6 @@ dest_apps_dir="${DESTDIR}${app_prefix}" app_data=${app_data:=/opt/puppetlabs/server/data/${real_name}} app_logdir=${app_logdir:=/var/log/puppetlabs/${real_name}} system_config_dir=${system_config_dir:=${app_prefix}/config} -needrestart_confdir=${needrestart_dir:=/etc/needrestart/conf.d} ##################