Merge pull request #319 from saz/move-sudo-defaults

Revert "Include defaults as last line on all platforms"

Author: saz

templates/sudoers.aix.erb

@@ -63,6 +63,7 @@
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!/sbin/reboot !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -105,4 +106,3 @@ root ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.archlinux.erb

@@ -63,6 +63,7 @@
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!/sbin/reboot !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -104,4 +105,3 @@ root ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.darwin.erb

@@ -16,6 +16,7 @@
 # Cmnd alias specification
 
 # Defaults specification
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 Defaults	env_keep += "BLOCKSIZE"
 Defaults	env_keep += "COLORFGBG COLORTERM"
 Defaults	env_keep += "__CF_USER_TEXT_ENCODING"
@@ -61,4 +62,3 @@ root	ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.debian.erb

@@ -1,5 +1,6 @@
 # file managed by puppet (unless config_file_replace=false)
 #
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 Defaults	secure_path="<%= @secure_path %>"
 
 <% if @use_sudoreplay %>
@@ -26,4 +27,4 @@ root	ALL=(ALL:ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>
+

templates/sudoers.freebsd.erb

@@ -78,6 +78,7 @@
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!REBOOT !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -120,4 +121,3 @@ root ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.gentoo.erb

@@ -64,6 +64,7 @@
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!REBOOT !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -106,4 +107,3 @@ root ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.omnios.erb

@@ -63,6 +63,7 @@
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!/sbin/reboot !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -105,4 +106,3 @@ root ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.openbsd.erb

@@ -32,6 +32,7 @@ Defaults:%wsrc env_keep +="SUBPACKAGE WRKOBJDIR SUDO_PORT_V1"
 
 # Uncomment to preserve the environment for users in group wheel
 #Defaults:%wheel !env_reset
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -67,4 +68,3 @@ root	ALL=(ALL) SETENV: ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.rhel.erb

@@ -63,6 +63,7 @@ Defaults   !visiblepw
 # this option is only effective for configurations where either
 # env_reset is disabled or HOME is present in the env_keep list.
 #
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 Defaults    always_set_home
 Defaults    match_group_by_gid
 
@@ -134,4 +135,3 @@ root	ALL=(ALL) 	ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.smartos.erb

@@ -55,6 +55,7 @@
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!/sbin/reboot !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -98,4 +99,3 @@ root ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.solaris.erb

@@ -63,6 +63,7 @@
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!/sbin/reboot !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -104,4 +105,3 @@ Defaults!<%= command %> !log_output
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.suse.erb

@@ -57,6 +57,7 @@ Defaults !insults
 # Defaults log_output
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/sbin/reboot !log_output
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 
 <% if @use_sudoreplay %>
 Defaults log_output
@@ -98,4 +99,3 @@ root ALL=(ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>

templates/sudoers.ubuntu.erb

@@ -7,6 +7,7 @@
 #
 # See the man page for details on how to write a sudoers file.
 #
+<%= scope.call_function('sudo::defaults', @defaults) -%>
 Defaults	secure_path="<%= @secure_path %>"
 
 <% if @use_sudoreplay %>
@@ -40,4 +41,3 @@ root	ALL=(ALL:ALL) ALL
 <% @extra_include_dirs.each do |include_dir| -%>
 #includedir <%= include_dir %>
 <% end if @extra_include_dirs -%>
-<%= scope.call_function('sudo::defaults', @defaults) -%>