From 4fb8dee0b640e9201f706db0250e281d47a2c8a3 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 16 Apr 2025 15:00:11 +0200
Subject: [PATCH] Update to 2025-04-16 15:00

---
 roles/nomad/files/iptables_cleanup.pl                   | 1 +
 roles/nomad/templates/iptables-nomad-cleanup.service.j2 | 2 +-
 roles/nomad_bin/defaults/main.yml                       | 4 ++--
 roles/samba/tasks/conf.yml                              | 2 +-
 roles/squid/files/acl/software_windows.domains          | 3 +++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/roles/nomad/files/iptables_cleanup.pl b/roles/nomad/files/iptables_cleanup.pl
index 4c643d6..37a23a4 100644
--- a/roles/nomad/files/iptables_cleanup.pl
+++ b/roles/nomad/files/iptables_cleanup.pl
@@ -16,6 +16,7 @@ while (<IPT>){
       (m/.*\-o\s+docker0.*/)
      ){
     $change = 1;
+    print "Removing line $_ from $ipt\n";
     next;
   }
   push @rules, $_;
diff --git a/roles/nomad/templates/iptables-nomad-cleanup.service.j2 b/roles/nomad/templates/iptables-nomad-cleanup.service.j2
index d37366f..e3dbbb6 100644
--- a/roles/nomad/templates/iptables-nomad-cleanup.service.j2
+++ b/roles/nomad/templates/iptables-nomad-cleanup.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=Cleanup Nomad and Docker runtime rules
-Before=iptables.service
+Before=iptables.service nomad.service docker.service
 
 [Service]
 Type=oneshot
diff --git a/roles/nomad_bin/defaults/main.yml b/roles/nomad_bin/defaults/main.yml
index 6222d35..921858f 100644
--- a/roles/nomad_bin/defaults/main.yml
+++ b/roles/nomad_bin/defaults/main.yml
@@ -1,9 +1,9 @@
 ---
 
 # Version of Nomad to install
-nomad_version: 1.9.7
+nomad_version: 1.10.0
 # URL of the archive
 nomad_archive_url: https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_amd64.zip
 # Expected sha256 of the archive
-nomad_archive_sha256: e9c7337893eceb549557ef9ad341b3ae64f5f43e29ff1fb167b70cfd16748d2d
+nomad_archive_sha256: d0936673cfa026b87744d60ad21ba85db70fe792b0685bfce95ac06a98d30b9d
 
diff --git a/roles/samba/tasks/conf.yml b/roles/samba/tasks/conf.yml
index dd8c28c..031d8c7 100644
--- a/roles/samba/tasks/conf.yml
+++ b/roles/samba/tasks/conf.yml
@@ -57,7 +57,7 @@
     cron_file: samba_sync_sysvol
     minute: '*/16'
     user: root
-    job: rsync -XAavz --delete-after {{ (samba_sysvol_rsync_pass is defined) | ternary('--password-file=/etc/samba/rsync-sysvol.secret','') }} rsync://{{ (samba_sysvol_rsync_pass is defined) | ternary('sysvol-replication@','') }}{{ samba_primary_dc }}/sysvol/ /var/lib/samba/sysvol/
+    job: rsync -XAavz --delete-after {{ (samba_sysvol_rsync_pass is defined) | ternary('--password-file=/etc/samba/rsync-sysvol.secret','') }} rsync://{{ (samba_sysvol_rsync_pass is defined) | ternary('sysvol-replication@','') }}{{ samba_primary_dc }}/sysvol/ /var/lib/samba/sysvol/ && samba-tool ntacl sysvolreset
     state: "{{ samba_i_am_primary_dc | ternary('absent','present') }}"
   when: samba_role in ['dc', 'rodc']
   tags: samba
diff --git a/roles/squid/files/acl/software_windows.domains b/roles/squid/files/acl/software_windows.domains
index bac79ac..d013f64 100644
--- a/roles/squid/files/acl/software_windows.domains
+++ b/roles/squid/files/acl/software_windows.domains
@@ -22,6 +22,9 @@ dmd.metaservices.microsoft.com
 activation-v2.sls.microsoft.com
 download.visualstudio.microsoft.com
 activation.sls.microsoft.com
+cxcs.microsoft.net
+licensing.mp.microsoft.com
+validation-v2.sls.microsoft.com
 
 # comon CRL / OCSP
 crl.microsoft.com