From 93022add310cf3be00b2c92a9ee9b7b19b72b33b Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Tue, 27 Aug 2024 10:47:09 +0100
Subject: [PATCH] Add dns record for choco server to proxy

---
 ansible/roles/win_proxy/tasks/dns.yml  | 8 ++++++++
 ansible/roles/win_proxy/tasks/main.yml | 4 ++++
 ansible/roles/win_proxy/vars/main.yml  | 5 ++++-
 ansible/roles/win_proxy/vars/rules.yml | 5 +++++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ansible/roles/win_proxy/tasks/dns.yml

diff --git a/ansible/roles/win_proxy/tasks/dns.yml b/ansible/roles/win_proxy/tasks/dns.yml
new file mode 100644
index 0000000..40a020c
--- /dev/null
+++ b/ansible/roles/win_proxy/tasks/dns.yml
@@ -0,0 +1,8 @@
+---
+
+- name: Create chocolatey server dns record
+  ansible.builtin.lineinfile:
+    path: /etc/hosts
+    regexp: '{{ choco_hostname }}$'
+    line: "{{ hostvars[choco_server].ansible_host }} {{ choco_hostname }}"
+    state: present
\ No newline at end of file
diff --git a/ansible/roles/win_proxy/tasks/main.yml b/ansible/roles/win_proxy/tasks/main.yml
index 6d97772..2cc1aa4 100644
--- a/ansible/roles/win_proxy/tasks/main.yml
+++ b/ansible/roles/win_proxy/tasks/main.yml
@@ -6,6 +6,10 @@
   run_once: true
   delegate_to: localhost
 
+- name: Import dns.yml
+  import_tasks:
+    file: dns.yml
+
 - name: Create group
   ansible.builtin.group:
     name: "{{ squid_group }}"
diff --git a/ansible/roles/win_proxy/vars/main.yml b/ansible/roles/win_proxy/vars/main.yml
index a112b79..1719152 100644
--- a/ansible/roles/win_proxy/vars/main.yml
+++ b/ansible/roles/win_proxy/vars/main.yml
@@ -21,4 +21,7 @@ squid_allowed_domain_file: allowed_domains.acl
 
 squid_config_file: squid.conf
 
-squid_service: squid
\ No newline at end of file
+squid_service: squid
+
+choco_server: "{{ os_project }}-{{ win_project }}-choc"
+choco_hostname: "{{ win_project }}-choc.{{ win_project }}.loc"
\ No newline at end of file
diff --git a/ansible/roles/win_proxy/vars/rules.yml b/ansible/roles/win_proxy/vars/rules.yml
index 238c6e8..2eb5578 100644
--- a/ansible/roles/win_proxy/vars/rules.yml
+++ b/ansible/roles/win_proxy/vars/rules.yml
@@ -14,6 +14,9 @@ squid_acls:
   - name: agent_dl
     classifier: dst
     value: "{{ checkmk_server }}/32"
+  - name: choco
+    classifier: dstdomain
+    value: "{{ win_project }}-choc.{{ win_project }}.loc"
   - name: allowed_domains
     classifier: dstdomain
     value: "\"{{ squid_config_directory }}/{{ squid_allowed_domain_file }}\""
@@ -29,6 +32,8 @@ squid_rules:
     decision: allow
   - acl: agent_dl
     decision: allow
+  - acl: choco
+    decision: allow
   - acl: localhost allowed_domains
     decision: allow
   - acl: all