From 6b41b80b09946d6a8d3ee401e56da70e408a237b Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 22 Jun 2015 09:40:49 -0500 Subject: [PATCH 1/2] init commit win_timezone --- windows/win_timezone.ps1 | 70 ++++++++++++++++++++++++++++++++++++++++ windows/win_timezone.py | 47 +++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 windows/win_timezone.ps1 create mode 100644 windows/win_timezone.py diff --git a/windows/win_timezone.ps1 b/windows/win_timezone.ps1 new file mode 100644 index 00000000000..4626dd10b54 --- /dev/null +++ b/windows/win_timezone.ps1 @@ -0,0 +1,70 @@ +#!powershell +# This file is part of Ansible +# +# Copyright 2015, Phil Schwartz +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +# WANT_JSON +# POWERSHELL_COMMON + +$params = Parse-Args $args; + +$result = New-Object psobject @{ + win_timezone = New-Object psobject + changed = $false +} + +If ($params.timezone) { + Try { + # Get the current timezone set + $currentTZ = $(C:\Windows\System32\tzutil /g) + + If ( $currentTZ -eq $params.timezone ) { + Exit-Json $result "$params.timezone is already set on this machine" + } + Else { + $tzExists = $false + #Check that timezone can even be set (if it is listed from tzutil as an available timezone to the machine) + $tzList = $(C:\Windows\System32\tzutil /l) + ForEach ($tz in $tzList) { + If ( $tz -eq $params.timezone ) { + $tzExists = $true + break + } + } + + If ( $tzExists ) { + C:\Windows\System32\tzutil /s "$params.timezone" + $newTZ = $(C:\Windows\System32\tzutil /g) + + If ( $params.timezone -eq $newTZ ) { + $result.changed = $true + } + } + Else { + Fail-Json $result "The specified timezone: $params.timezone isn't supported on the machine." + } + } + } + Catch { + Fail-Json $result "Error setting timezone to: $params.timezone." + } +} +Else { + Fail-Json $result "Parameter: timezone is required." +} + + +Exit-Json $result; \ No newline at end of file diff --git a/windows/win_timezone.py b/windows/win_timezone.py new file mode 100644 index 00000000000..abe52be1680 --- /dev/null +++ b/windows/win_timezone.py @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# (c) 2015, Phil Schwartz +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +# this is a windows documentation stub. actual code lives in the .ps1 +# file of the same name + +DOCUMENTATION = ''' +--- +module: win_timezone +version_added: "2.0" +short_description: Sets Windows machine timezone +description: + - Sets machine time to the specified timezone, the module will check if the provided timezone is supported on the machine. +options: + timezone: + description: + - Timezone to set to. Example: Central Standard Time + required: true + default: null + aliases: [] + +author: Phil Schwartz +''' + + +EXAMPLES = ''' + # Set machine's timezone to Central Standard Time + win_timezone: + timezone: "Central Standard Time" +''' From b5d724c2fbdf0dbea8f614c569e65bfcace48b96 Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 25 Jun 2015 15:55:23 -0500 Subject: [PATCH 2/2] removed hardcoded paths, check for .exe error exit code, use get-attr for required param check. --- windows/win_timezone.ps1 | 61 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/windows/win_timezone.ps1 b/windows/win_timezone.ps1 index 4626dd10b54..03a6935052d 100644 --- a/windows/win_timezone.ps1 +++ b/windows/win_timezone.ps1 @@ -26,44 +26,45 @@ $result = New-Object psobject @{ changed = $false } -If ($params.timezone) { - Try { - # Get the current timezone set - $currentTZ = $(C:\Windows\System32\tzutil /g) +$timezone = Get-Attr -obj $params -name timezone -failifempty $true -resultobj $result - If ( $currentTZ -eq $params.timezone ) { - Exit-Json $result "$params.timezone is already set on this machine" - } - Else { - $tzExists = $false - #Check that timezone can even be set (if it is listed from tzutil as an available timezone to the machine) - $tzList = $(C:\Windows\System32\tzutil /l) - ForEach ($tz in $tzList) { - If ( $tz -eq $params.timezone ) { - $tzExists = $true - break - } +Try { + # Get the current timezone set + $currentTZ = $(tzutil.exe /g) + If ($LASTEXITCODE -ne 0) { Throw "An error occured when getting the current machine's timezone setting." } + + If ( $currentTZ -eq $timezone ) { + Exit-Json $result "$timezone is already set on this machine" + } + Else { + $tzExists = $false + #Check that timezone can even be set (if it is listed from tzutil as an available timezone to the machine) + $tzList = $(tzutil.exe /l) + If ($LASTEXITCODE -ne 0) { Throw "An error occured when listing the available timezones." } + ForEach ($tz in $tzList) { + If ( $tz -eq $timezone ) { + $tzExists = $true + break } + } - If ( $tzExists ) { - C:\Windows\System32\tzutil /s "$params.timezone" - $newTZ = $(C:\Windows\System32\tzutil /g) + If ( $tzExists ) { + tzutil.exe /s "$timezone" + If ($LASTEXITCODE -ne 0) { Throw "An error occured when setting the specified timezone with tzutil." } + $newTZ = $(tzutil.exe /g) + If ($LASTEXITCODE -ne 0) { Throw "An error occured when getting the current machine's timezone setting." } - If ( $params.timezone -eq $newTZ ) { - $result.changed = $true - } - } - Else { - Fail-Json $result "The specified timezone: $params.timezone isn't supported on the machine." + If ( $timezone -eq $newTZ ) { + $result.changed = $true } } - } - Catch { - Fail-Json $result "Error setting timezone to: $params.timezone." + Else { + Fail-Json $result "The specified timezone: $timezone isn't supported on the machine." + } } } -Else { - Fail-Json $result "Parameter: timezone is required." +Catch { + Fail-Json $result "Error setting timezone to: $timezone." }