Merge pull request saz#163 from esalberg/file_comments

saz · web-flow · commit 1501c67b3c9d · 2017-01-07T22:31:15.000+01:00
Add file managed by Puppet comments to all sudoers files
diff --git a/files/sudoers.aix b/files/sudoers.aix
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.archlinux b/files/sudoers.archlinux
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.darwin b/files/sudoers.darwin
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 # sudoers file.
 #
 # This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.debian b/files/sudoers.debian
@@ -1,7 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
 #
-# This file is managed by puppet.
-#
-
 Defaults	env_reset
 Defaults	mail_badpass
 Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
diff --git a/files/sudoers.freebsd b/files/sudoers.freebsd
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.gentoo b/files/sudoers.gentoo
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.olddebian b/files/sudoers.olddebian
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.omnios b/files/sudoers.omnios
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.openbsd b/files/sudoers.openbsd
@@ -1,6 +1,5 @@
-# NOTE: This file is managed via Puppet, manual changes will be lost
-# on next puppet run.
-# 
+# file managed by puppet (unless config_file_replace=false)
+#
 # sudoers file.
 #
 # This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.rhel5 b/files/sudoers.rhel5
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## Sudoers allows particular users to run various commands as
 ## the root user, without needing the root password.
 ##
diff --git a/files/sudoers.rhel6 b/files/sudoers.rhel6
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## Sudoers allows particular users to run various commands as
 ## the root user, without needing the root password.
 ##
diff --git a/files/sudoers.rhel7 b/files/sudoers.rhel7
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## Sudoers allows particular users to run various commands as
 ## the root user, without needing the root password.
 ##
diff --git a/files/sudoers.smartos b/files/sudoers.smartos
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.solaris b/files/sudoers.solaris
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.suse b/files/sudoers.suse
@@ -1,3 +1,5 @@
+# file managed by puppet (unless config_file_replace=false)
+#
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
diff --git a/files/sudoers.ubuntu b/files/sudoers.ubuntu
@@ -1,3 +1,4 @@
+# file managed by puppet (unless config_file_replace=false)
 #
 # This file MUST be edited with the 'visudo' command as root.
 #
diff --git a/manifests/conf.pp b/manifests/conf.pp
@@ -86,7 +86,7 @@
       $lines = join($content, "\n")
       $content_real = "${lines}\n"
     } else {
-      $content_real = "${content}\n"
+      $content_real = "# This file is managed by Puppet; changes may be overwritten\n${content}\n"
     }
   } else {
     $content_real = undef
diff --git a/spec/defines/sudo_spec.rb b/spec/defines/sudo_spec.rb
@@ -32,7 +32,7 @@
 
     it { should contain_file(filename).with({
         'ensure'  => 'present',
-        'content' => "%admins ALL=(ALL) NOPASSWD: ALL\n",
+        'content' => "# This file is managed by Puppet; changes may be overwritten\n%admins ALL=(ALL) NOPASSWD: ALL\n",
         'owner'   => 'root',
         'group'   => 'root',
         'path'    => file_path,
@@ -73,7 +73,7 @@
 
     it { should contain_file(filename).with({
         'ensure'  => 'present',
-        'content' => "%admins ALL=(ALL) NOPASSWD: ALL\n",
+        'content' => "# This file is managed by Puppet; changes may be overwritten\n%admins ALL=(ALL) NOPASSWD: ALL\n",
         'owner'   => 'root',
         'group'   => 'root',
         'path'    => file_path,
@@ -106,7 +106,7 @@
 
     it { should contain_file(filename).with({
         'ensure'  => 'absent',
-        'content' => "%admins ALL=(ALL) NOPASSWD: ALL\n",
+        'content' => "# This file is managed by Puppet; changes may be overwritten\n%admins ALL=(ALL) NOPASSWD: ALL\n",
         'owner'   => 'root',
         'group'   => 'root',
         'path'    => file_path,
@@ -130,7 +130,7 @@
 
     it { should contain_file(filename).with({
         'ensure'  => 'absent',
-        'content' => "%admins ALL=(ALL) NOPASSWD: ALL\n",
+        'content' => "# This file is managed by Puppet; changes may be overwritten\n%admins ALL=(ALL) NOPASSWD: ALL\n",
         'owner'   => 'root',
         'group'   => 'root',
         'path'    => file_path,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# file managed by puppet (unless config_file_replace=false)`
	`2`	`+#`
`1`	`3`	`## sudoers file.`
`2`	`4`	`##`
`3`	`5`	`## This file MUST be edited with the 'visudo' command as root.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
	`1`	`+# file managed by puppet (unless config_file_replace=false)`
`1`	`2`	`#`
`2`		`-# This file is managed by puppet.`
`3`		`-#`
`4`		`-`
`5`	`3`	`Defaults env_reset`
`6`	`4`	`Defaults mail_badpass`
`7`	`5`	`Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-# NOTE: This file is managed via Puppet, manual changes will be lost`
`2`		`-# on next puppet run.`
`3`		`-#`
	`1`	`+# file managed by puppet (unless config_file_replace=false)`
	`2`	`+#`
`4`	`3`	`# sudoers file.`
`5`	`4`	`#`
`6`	`5`	`# This file MUST be edited with the 'visudo' command as root.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# file managed by puppet (unless config_file_replace=false)`
`1`	`2`	`#`
`2`	`3`	`# This file MUST be edited with the 'visudo' command as root.`
`3`	`4`	`#`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@`
`86`	`86`	`$lines = join($content, "\n")`
`87`	`87`	`$content_real = "${lines}\n"`
`88`	`88`	`} else {`
`89`		`- $content_real = "${content}\n"`
	`89`	`+ $content_real = "# This file is managed by Puppet; changes may be overwritten\n${content}\n"`
`90`	`90`	`}`
`91`	`91`	`} else {`
`92`	`92`	`$content_real = undef`