From d0856a091387634cb5babce35f11f2ea4ebb5793 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <michael.vasseur@vu.nl>
Date: Mon, 23 Oct 2023 15:27:08 +0200
Subject: [PATCH] Less overwrites needed

---
 .../ansible/group_vars/analyst/all.yml.example   | 10 +++-------
 .../ansible/group_vars/wf46/all.yml.example      | 14 +-------------
 .../ansible/group_vars/wf47/all.yml.example      | 16 ++--------------
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/provision-contest/ansible/group_vars/analyst/all.yml.example b/provision-contest/ansible/group_vars/analyst/all.yml.example
index 6f20d20d..194aa8e8 100644
--- a/provision-contest/ansible/group_vars/analyst/all.yml.example
+++ b/provision-contest/ansible/group_vars/analyst/all.yml.example
@@ -1,16 +1,12 @@
 # Server VLAN IP prefix.
-SERVER_IP_PREFIX: 10.3.3
-
-# IP address of the admin machine used as ansible and git server.
-MAIN_ADMIN_IP: "{{SERVER_IP_PREFIX}}.223"
+SERVER_IP_PREFIX: 172.29.1
 
 # URL and IP of domserver from judgehosts. A hostname 'domserver' with
 # DOMSERVER_IP will be added to the judgehost /etc/hosts file.
 DOMSERVER: https://domjudge
-DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.215"
-DOMSERVER_URL: "{{DOMSERVER}}"
+DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.240"
 
 # Set this when on the blue network at the World Finals where no
 # internet access is available and "packages" must be used as APT repo
 # server.
-WF_GREEN: false
+WF_GREEN: true
diff --git a/provision-contest/ansible/group_vars/wf46/all.yml.example b/provision-contest/ansible/group_vars/wf46/all.yml.example
index 6f20d20d..9392945b 100644
--- a/provision-contest/ansible/group_vars/wf46/all.yml.example
+++ b/provision-contest/ansible/group_vars/wf46/all.yml.example
@@ -1,16 +1,4 @@
-# Server VLAN IP prefix.
-SERVER_IP_PREFIX: 10.3.3
-
-# IP address of the admin machine used as ansible and git server.
-MAIN_ADMIN_IP: "{{SERVER_IP_PREFIX}}.223"
-
 # URL and IP of domserver from judgehosts. A hostname 'domserver' with
 # DOMSERVER_IP will be added to the judgehost /etc/hosts file.
-DOMSERVER: https://domjudge
+DOMSERVER: https://domserver-wf46
 DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.215"
-DOMSERVER_URL: "{{DOMSERVER}}"
-
-# Set this when on the blue network at the World Finals where no
-# internet access is available and "packages" must be used as APT repo
-# server.
-WF_GREEN: false
diff --git a/provision-contest/ansible/group_vars/wf47/all.yml.example b/provision-contest/ansible/group_vars/wf47/all.yml.example
index 6f20d20d..8fa67c0d 100644
--- a/provision-contest/ansible/group_vars/wf47/all.yml.example
+++ b/provision-contest/ansible/group_vars/wf47/all.yml.example
@@ -1,16 +1,4 @@
-# Server VLAN IP prefix.
-SERVER_IP_PREFIX: 10.3.3
-
-# IP address of the admin machine used as ansible and git server.
-MAIN_ADMIN_IP: "{{SERVER_IP_PREFIX}}.223"
-
 # URL and IP of domserver from judgehosts. A hostname 'domserver' with
 # DOMSERVER_IP will be added to the judgehost /etc/hosts file.
-DOMSERVER: https://domjudge
-DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.215"
-DOMSERVER_URL: "{{DOMSERVER}}"
-
-# Set this when on the blue network at the World Finals where no
-# internet access is available and "packages" must be used as APT repo
-# server.
-WF_GREEN: false
+DOMSERVER: https://domjudge-wf47
+DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.219"