Merge pull request #776 from ansible/devel

April 8th, 2020 Release PR
ansible · Apr 8, 2020 · dfb970a · dfb970a
2 parents 69544f7 + 4355d62
commit dfb970a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/exercises/ansible_rhel/1.2-adhoc/README.ja.md b/exercises/ansible_rhel/1.2-adhoc/README.ja.md
@@ -301,7 +301,7 @@ Managed by Ansible
 
       - 最新バージョンのパッケージをインストールするためにはどうすれば良いのかをヘルプの例から探してみてください。
 
-  - Ansibleのアドホックコマンドを実行して、`node1`に`screen`の最新パッケージをインストールしてみてください。
+  - Ansibleのアドホックコマンドを実行して、`node1`に`squid`の最新パッケージをインストールしてみてください。
 
 > **Tip**
 >
@@ -314,7 +314,7 @@ Managed by Ansible
 ```bash
 [student<X>@ansible ~]$ ansible-doc -l | grep -i yum
 [student<X>@ansible ~]$ ansible-doc yum
-[student<X>@ansible ~]$ ansible node1 -m yum -a 'name=screen state=latest' -b
+[student<X>@ansible ~]$ ansible node1 -m yum -a 'name=squid state=latest' -b
 ```
 
 ----

diff --git a/exercises/ansible_rhel/1.2-adhoc/README.md b/exercises/ansible_rhel/1.2-adhoc/README.md
@@ -274,7 +274,7 @@ Run the `ansible node1 -m copy …` command from above again. Note:
 
       - Look up the help examples for the module to learn how to install a package in the latest version.
 
-  - Run an Ansible ad hoc command to install the package "screen" in the latest version on `node1`.
+  - Run an Ansible ad hoc command to install the package "squid" in the latest version on `node1`.
 
 > **Tip**
 >
@@ -287,7 +287,7 @@ Run the `ansible node1 -m copy …` command from above again. Note:
 ```bash
 [student<X>@ansible ~]$ ansible-doc -l | grep -i yum
 [student<X>@ansible ~]$ ansible-doc yum
-[student<X>@ansible ~]$ ansible node1 -m yum -a 'name=screen state=latest' -b
+[student<X>@ansible ~]$ ansible node1 -m yum -a 'name=squid state=latest' -b
 ```
 
 ----

diff --git a/exercises/ansible_rhel/1.2-adhoc/README.pt-br.md b/exercises/ansible_rhel/1.2-adhoc/README.pt-br.md
@@ -273,7 +273,7 @@ Execute o comando `ansible node1 -m copy…` de cima novamente. Nota:
 
        - Procure os exemplos de ajuda do módulo para saber como instalar um pacote na versão mais recente.
 
-       - Execute um comando Ansible ad hoc para instalar o pacote "screen" na versão mais recente no `node1`.
+       - Execute um comando Ansible ad hoc para instalar o pacote "squid" na versão mais recente no `node1`.
 
 > **Dica**
 >
@@ -286,7 +286,7 @@ Execute o comando `ansible node1 -m copy…` de cima novamente. Nota:
 ```bash
 [student<X>@ansible ~]$ ansible-doc -l | grep -i yum
 [student<X>@ansible ~]$ ansible-doc yum
-[student<X>@ansible ~]$ ansible node1 -m yum -a 'name=screen state=latest' -b
+[student<X>@ansible ~]$ ansible node1 -m yum -a 'name=squid state=latest' -b
 ```
 
 ----

diff --git a/provisioner/roles/windows_ws_setup/tasks/smartconsole.yml b/provisioner/roles/windows_ws_setup/tasks/smartconsole.yml
@@ -7,6 +7,14 @@
         - vcredist2012
       state: present
 
+  - name: Set strong cryptography on 64 bit .Net Framework (version 4 and above)
+    win_shell: >
+      Set-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NetFramework\v4.0.30319' -Name 'SchUseStrongCrypto' -Value '1' -Type DWord
+
+  - name: Set strong cryptography on 32 bit .Net Framework (version 4 and above)
+    win_shell: >
+      Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\.NetFramework\v4.0.30319' -Name 'SchUseStrongCrypto' -Value '1' -Type DWord
+
   - name: Ensure the required NuGet package provider version is installed
     win_shell: Find-PackageProvider -Name Nuget -ForceBootstrap -IncludeDependencies -Force