Skip to content

Commit ecd8ef0

Browse files
committed
Drop tmpfiles.conf
This file isn't required anymore, since we set PrivateTmp=true in the systemd unit (introduced in 900b4ee). Signed-off-by: Tim Meusel <tim@bastelfreak.de>
1 parent 83f303f commit ecd8ef0

4 files changed

Lines changed: 0 additions & 9 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/ext/fpm.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@
236236
fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/systemd"
237237
fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/systemd/system"
238238
fpm_opts << "--rpm-auto-add-exclude-directories /etc/logrotate.d"
239-
fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/tmpfiles.d"
240239
fpm_opts << "--rpm-auto-add-exclude-directories /var/log/puppetlabs"
241240
fpm_opts << "--rpm-auto-add-exclude-directories /var/run/puppetlabs"
242241
termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet"

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ unitdir_redhat=${unitdir:-/usr/lib/systemd/system}
1616
unitdir_debian=${unitdir:-/lib/systemd/system}
1717
defaultsdir_redhat=${defaultsdir:-/etc/sysconfig}
1818
defaultsdir_debian=${defaultsdir:-/etc/default}
19-
tmpfilesdir=${tmpfilesdir:=/usr/lib/tmpfiles.d}
2019
datadir=${datadir:=${prefix}/share}
2120
real_name=${real_name:=<%= EZBake::Config[:real_name] -%>}
2221
projdatadir=${projdatadir:=${datadir}/${real_name}}
@@ -230,17 +229,13 @@ function task_systemd_redhat {
230229
task defaults_redhat
231230
install -d -m 0755 "${DESTDIR}${unitdir_redhat}"
232231
install -m 0644 ext/redhat/<%= EZBake::Config[:project] %>.service "${DESTDIR}${unitdir_redhat}/<%= EZBake::Config[:project] %>.service"
233-
install -d -m 0755 "${DESTDIR}${tmpfilesdir}"
234-
install -m 0644 ext/<%= EZBake::Config[:project] %>.tmpfiles.conf "${DESTDIR}${tmpfilesdir}/<%= EZBake::Config[:project] %>.conf"
235232
}
236233

237234
# Install the systemd and defaults configuration for Debian.
238235
function task_systemd_deb {
239236
task defaults_deb
240237
install -d -m 0755 "${DESTDIR}${unitdir_debian}"
241238
install -m 0644 ext/debian/<%= EZBake::Config[:project] %>.service_file "${DESTDIR}${unitdir_debian}/<%= EZBake::Config[:project] %>.service"
242-
install -d -m 0755 "${DESTDIR}${tmpfilesdir}"
243-
install -m 0644 ext/<%= EZBake::Config[:project] %>.tmpfiles.conf "${DESTDIR}${tmpfilesdir}/<%= EZBake::Config[:project] %>.conf"
244239
}
245240

246241
function task_service_account {

0 commit comments

Comments
 (0)