Merge 25771d1 into 05d4af1

lib/facter/account_names.rb

@@ -0,0 +1,24 @@
+# Custom fact that shows the current name of the Administrator and
+# Guest accounts based on well-known SID's.
+#
+# http://support.microsoft.com/kb/243330
+#
+require 'puppet'
+
+Facter.add(:account_names) do
+  confine osfamily: :windows
+
+  setcode do
+    account_names = {}
+
+    Puppet::Type.type('user').instances.find_all do |user|
+      user_values = user.retrieve
+      # Check for the well-known admin SID.
+      account_names['Administrator'] = user.name if user_values[user.property(:uid)] =~ /^S-1-5-21.*-500$/
+      # Check for the well-known guest SID.
+      account_names['Guest'] = user.name if user_values[user.property(:uid)] =~ /^S-1-5-21.*-501$/
+    end
+
+    account_names
+  end
+end

manifests/package.pp

@@ -97,8 +97,8 @@
         file { "${msoffice::params::temp_dir}\\office_config.ini":
           content => template('msoffice/setup.ini.erb'),
           mode    => '0755',
-          owner   => 'Administrator',
-          group   => 'Administrators',
+          owner   => $facts['account_names']['Administrator'],
+          group   => 'S-1-5-32-544',
         }
 
         exec { 'install-office':
@@ -114,8 +114,8 @@
         file { "${msoffice::params::temp_dir}\\office_config.xml":
           content => template('msoffice/config.erb'),
           mode    => '0755',
-          owner   => 'Administrator',
-          group   => 'Administrators',
+          owner   => $facts['account_names']['Administrator'],
+          group   => 'S-1-5-32-544',
         }
 
         exec { 'install-office':