Skip to content

Commit d5cf5c3

Browse files
committed
Revert "(EZ-46) Install tmpfiles.d config on systemd platforms"
This reverts commit 814ee0c. Signed-off-by: Tim Meusel <tim@bastelfreak.de>
1 parent e7e60e2 commit d5cf5c3

3 files changed

Lines changed: 0 additions & 7 deletions

File tree

resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ templates:
2929
target: ext/debian/{{{project}}}.service_file
3030
- source: ext/ezbake.logrotate.conf.erb
3131
target: ext/{{{project}}}.logrotate.conf
32-
- source: ext/ezbake.tmpfiles.conf.erb
33-
target: ext/{{{project}}}.tmpfiles.conf
3432
- ext/redhat/preinst.erb
3533
- ext/redhat/postinst.erb
3634
- ext/redhat/prerm.erb

resources/puppetlabs/lein-ezbake/template/global/ext/ezbake.tmpfiles.conf.erb

Lines changed: 0 additions & 1 deletion
This file was deleted.

resources/puppetlabs/lein-ezbake/template/global/install.sh.erb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ unitdir_redhat=${unitdir:-/usr/lib/systemd/system}
1515
unitdir_debian=${unitdir:-/lib/systemd/system}
1616
defaultsdir_redhat=${defaultsdir:-/etc/sysconfig}
1717
defaultsdir_debian=${defaultsdir:-/etc/default}
18-
tmpfilesdir=${tmpfilesdir:=/usr/lib/tmpfiles.d}
1918
datadir=${datadir:=${prefix}/share}
2019
real_name=${real_name:=<%= EZBake::Config[:real_name] -%>}
2120
projdatadir=${projdatadir:=${datadir}/${real_name}}
@@ -226,8 +225,6 @@ function task_systemd_redhat {
226225
task defaults_redhat
227226
install -d -m 0755 "${DESTDIR}${unitdir_redhat}"
228227
install -m 0644 ext/redhat/<%= EZBake::Config[:project] %>.service "${DESTDIR}${unitdir_redhat}/<%= EZBake::Config[:project] %>.service"
229-
install -d -m 0755 "${DESTDIR}${tmpfilesdir}"
230-
install -m 0644 ext/<%= EZBake::Config[:project] %>.tmpfiles.conf "${DESTDIR}${tmpfilesdir}/<%= EZBake::Config[:project] %>.conf"
231228
}
232229

233230
# Install the systemd and defaults configuration for Debian.
@@ -236,7 +233,6 @@ function task_systemd_deb {
236233
install -d -m 0755 "${DESTDIR}${unitdir_debian}"
237234
install -m 0644 ext/debian/<%= EZBake::Config[:project] %>.service_file "${DESTDIR}${unitdir_debian}/<%= EZBake::Config[:project] %>.service"
238235
install -d -m 0755 "${DESTDIR}${tmpfilesdir}"
239-
install -m 0644 ext/<%= EZBake::Config[:project] %>.tmpfiles.conf "${DESTDIR}${tmpfilesdir}/<%= EZBake::Config[:project] %>.conf"
240236
}
241237

242238
function task_service_account {

0 commit comments

Comments
 (0)