mirror of
https://git.ecdf.ed.ac.uk/win_automation/windows-ansible.git
synced 2026-10-26 10:07:21 +00:00
fix runonce script for .Renviron
This commit is contained in:
1 parent
f4dfc67e55
commit
cb7abdfaf6
10 files changed
+40
-19
No files matched your search
@@ -44,4 +44,6 @@ community_packages:
|
|||||||
- visualstudio2019professional
|
- visualstudio2019professional
|
||||||
- sql-server-2017
|
- sql-server-2017
|
||||||
- sql-server-management-studio
|
- sql-server-management-studio
|
||||||
- netfx-4.7.2
|
- netfx-4.7.2
|
||||||
|
- rtools
|
||||||
|
|
||||||
@@ -3,3 +3,4 @@
|
|||||||
- import_tasks: chocolatey.yml
|
- import_tasks: chocolatey.yml
|
||||||
- import_tasks: rdgw.yml
|
- import_tasks: rdgw.yml
|
||||||
- import_tasks: start_menu.yml
|
- import_tasks: start_menu.yml
|
||||||
|
- import_tasks: runonce.yml
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
- name: Copy logon script to VMs
|
||||||
|
tags: runonce
|
||||||
|
win_template:
|
||||||
|
src: "logon.ps1.j2"
|
||||||
|
dest: "C:\\eidf\\logon.ps1"
|
||||||
|
force: true
|
||||||
|
when: project_zone == 'protected'
|
||||||
|
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
$bashProfilePath = Join-Path $HOME ".bash_profile"
|
||||||
|
|
||||||
|
if ( -not ( Test-Path -Path $bashProfilePath ) ) {
|
||||||
|
$requiredLine = 'eval "$(''/C/tools/miniforge3/Scripts/conda.exe'' ''shell.bash'' ''hook'')"'
|
||||||
|
|
||||||
|
Add-Content -Path $bashProfilePath -Value $requiredLine
|
||||||
|
Set-ItemProperty -Path $bashProfilePath -Name Attributes -Value ([System.IO.FileAttributes]::Hidden)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$Renviron_path = Join-Path $HOME "Documents\.Renviron"
|
||||||
|
|
||||||
|
if ( -not ( Test-Path -Path $Renviron_path ) ) {
|
||||||
|
$Renviron_contents = @"
|
||||||
|
http_proxy=http://{{ proxy_address }}
|
||||||
|
https_proxy=http://{{ proxy_address }}
|
||||||
|
"@
|
||||||
|
|
||||||
|
Add-Content $Renviron_path $Renviron_contents
|
||||||
|
}
|
||||||
@@ -3,3 +3,5 @@ start_menu_xml: "C:\\eidf\\{{ win_project }}.xml"
|
|||||||
backup_xml: "C:\\eidf\\{{ win_project }}-old.xml"
|
backup_xml: "C:\\eidf\\{{ win_project }}-old.xml"
|
||||||
script_name: newXML.py
|
script_name: newXML.py
|
||||||
script_path: "C:\\eidf\\{{ script_name }}"
|
script_path: "C:\\eidf\\{{ script_name }}"
|
||||||
|
proxy_vm: "{{ os_project }}-{{ win_project }}-proxy"
|
||||||
|
proxy_address: "{{ hostvars[proxy_vm].ansible_host }}:3128"
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
$bashProfilePath = Join-Path $HOME ".bash_profile"
|
|
||||||
$requiredLine = 'eval "$(''/C/tools/miniforge3/Scripts/conda.exe'' ''shell.bash'' ''hook'')"'
|
|
||||||
|
|
||||||
Add-Content -Path $bashProfilePath -Value $requiredLine
|
|
||||||
Set-ItemProperty -Path $bashProfilePath -Name Attributes -Value ([System.IO.FileAttributes]::Hidden)
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Copy logon script to VMs
|
|
||||||
tags:
|
|
||||||
- logon
|
|
||||||
block:
|
|
||||||
- name: Copy logon script to VMs
|
|
||||||
win_copy:
|
|
||||||
src: "logon.ps1"
|
|
||||||
dest: "C:\\eidf\\"
|
|
||||||
force: true
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
---
|
---
|
||||||
- import_tasks: features.yml
|
- import_tasks: features.yml
|
||||||
- import_tasks: setup.yml
|
- import_tasks: setup.yml
|
||||||
- import_tasks: logon.yml
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
New-GPO -Name "Squid Proxy" -comment "Configure Client VMs to use Squid HTTP proxy"
|
New-GPO -Name "Squid Proxy" -comment "Configure Client VMs to use Squid HTTP proxy"
|
||||||
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "ProxyEnable" -key "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Value 1 -Type DWord
|
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "ProxyEnable" -key "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Value 1 -Type DWord
|
||||||
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "ProxyServer" -key "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Value "{{ proxy_address }}" -Type String
|
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "ProxyServer" -key "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Value "{{ proxy_address }}" -Type String
|
||||||
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "ProxyOverride" -key "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Value "<local>,{{ win_project }}-choc.{{ win_project }}.loc" -Type String
|
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "ProxyOverride" -key "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Value "<local>,{{ win_project }}-choc.{{ win_project }}.loc,{{ win_project }}-wsus.{{ win_project }}.loc" -Type String
|
||||||
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "Proxy" -key "HKEY_CURRENT_USER\Software\Policies\Microsoft\Internet Explorer\Control Panel" -Value 1 -Type DWord
|
Set-GPRegistryValue -Name "Squid Proxy" -ValueName "Proxy" -key "HKEY_CURRENT_USER\Software\Policies\Microsoft\Internet Explorer\Control Panel" -Value 1 -Type DWord
|
||||||
|
|
||||||
$DomainInfo = Get-ADDomain
|
$DomainInfo = Get-ADDomain
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ study_data_dfs: \\{{ win_project }}\{{ share_name }}
|
|||||||
study_data_label: Study Data
|
study_data_label: Study Data
|
||||||
study_data_letter: S
|
study_data_letter: S
|
||||||
|
|
||||||
|
proxy_vm: "{{ os_project }}-{{ win_project }}-proxy"
|
||||||
|
proxy_address: "{{ hostvars[proxy_vm].ansible_host }}:3128"
|
||||||
|
|
||||||
OUs:
|
OUs:
|
||||||
- Project Users
|
- Project Users
|
||||||
- Project Groups
|
- Project Groups
|
||||||
|
|||||||
Reference in new issue
Block a user