Merge pull request #129 from traylenator/tmpconf

Force tmpfiles.d drop file to end in .conf
voxpupuli · Dec 9, 2019 · cf15b55 · cf15b55
2 parents b082921 + f318dcd
commit cf15b55
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/manifests/tmpfile.pp b/manifests/tmpfile.pp
@@ -4,10 +4,10 @@
 #
 # @see systemd-tmpfiles(8)
 #
-# @attr name [String]
+# @attr name [Pattern['^.+\.conf$']] (filename)
 #   The name of the tmpfile to create
 #
-#   * May not contain ``/``
+#   * May not contain ``/`` and must end in .conf
 #
 # @param $ensure
 #   Whether to drop a file or remove it
@@ -26,23 +26,24 @@
 #  * Mutually exclusive with ``$limits``
 #
 define systemd::tmpfile(
-  Enum['present', 'absent', 'file'] $ensure  = 'file',
-  Stdlib::Absolutepath              $path    = '/etc/tmpfiles.d',
-  Optional[String]                  $content = undef,
-  Optional[String]                  $source  = undef,
+  Enum['present', 'absent', 'file'] $ensure   = 'file',
+  Systemd::Dropin                   $filename = $name,
+  Stdlib::Absolutepath              $path     = '/etc/tmpfiles.d',
+  Optional[String]                  $content  = undef,
+  Optional[String]                  $source   = undef,
 ) {
   include systemd::tmpfiles
 
-  if $name =~ Pattern['/'] {
-    fail('$name may not contain a forward slash "(/)"')
+  if $filename =~ Pattern['/'] {
+    fail('$filename may not contain a forward slash "(/)"')
   }
 
   $_tmp_file_ensure = $ensure ? {
     'present' => 'file',
     default   => $ensure,
   }
 
-  file { "${path}/${name}":
+  file { "${path}/${filename}":
     ensure  => $_tmp_file_ensure,
     content => $content,
     source  => $source,

diff --git a/spec/defines/tmpfile_spec.rb b/spec/defines/tmpfile_spec.rb
@@ -6,7 +6,7 @@
       context "on #{os}" do
         let(:facts) { facts }
 
-        let(:title) { 'random_tmpfile' }
+        let(:title) { 'random_tmpfile.conf' }
 
         let(:params) {{
           :content => 'random stuff'
@@ -18,6 +18,29 @@
           :content => /#{params[:content]}/,
           :mode    => '0444'
         ) }
+
+        context 'with a bad tmpfile name' do
+          let(:title) { 'test.badtype' }
+          it {
+            expect{
+              is_expected.to compile.with_all_deps
+            }.to raise_error(/expects a match for Systemd::Dropin/)
+          }
+        end
+
+        context 'with a tmpfile name specified with filename' do
+          let(:title) { 'test.badtype' }
+          let(:params) {{
+            :filename => 'goodname.conf',
+            :content  => 'random stuff'
+          }}
+          it { is_expected.to create_file("/etc/tmpfiles.d/goodname.conf").with(
+            :ensure  => 'file',
+            :content => /#{params[:content]}/,
+            :mode    => '0444'
+          )}
+        end
+
       end
     end
   end