From c99ca23d169553db944ebd84a3f048509c30076a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=A4rkle?= <stefan@abgruen.de>
Date: Fri, 17 Jan 2025 21:23:19 +0100
Subject: [PATCH] Updated headscale version and new config file format

---
 roles/headscale-server/tasks/main.yml        | 12 +++++------
 roles/headscale-server/templates/config.yaml | 21 ++++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/roles/headscale-server/tasks/main.yml b/roles/headscale-server/tasks/main.yml
index 4adfc02..d287ede 100644
--- a/roles/headscale-server/tasks/main.yml
+++ b/roles/headscale-server/tasks/main.yml
@@ -13,13 +13,13 @@
     - "joe"
     - "fail2ban"
 
-#- name: Download headscale .deb
-#  get_url: 
-#    url="https://github.com/juanfont/headscale/releases/download/v0.22.3/headscale_0.22.3_linux_arm64.deb"
-#    dest="/tmp/headscale.deb"
+- name: Download headscale .deb
+  get_url: 
+    url="https://github.com/juanfont/headscale/releases/download/v0.24.0/headscale_0.24.0_linux_arm64.deb"
+    dest="/tmp/headscale.deb"
 
-#- name: Install my_package
-#  apt: deb="/tmp/headscale.deb"
+- name: Install my_package
+  apt: deb="/tmp/headscale.deb"
 
 - name: determine name of host
   ansible.builtin.set_fact:
diff --git a/roles/headscale-server/templates/config.yaml b/roles/headscale-server/templates/config.yaml
index f2d313b..d6a644c 100644
--- a/roles/headscale-server/templates/config.yaml
+++ b/roles/headscale-server/templates/config.yaml
@@ -10,13 +10,15 @@ private_key_path: /var/lib/headscale/private.key
 noise:
   private_key_path: /var/lib/headscale/noise_private.key
 # IP ranges & dns
-ip_prefixes:
-  - fd7a:115c:a1e0::/48
-  - 10.13.100.0/24
-dns_config:
-  override_local_dns: true
+# IP ranges & dns
+prefixes:
+  v6: fd7a:115c:a1e0::/48
+  v4: 10.13.100.0/24
+dns:
+  #override_local_dns: true
   nameservers:
-  - 1.1.1.1
+    global:
+    - 1.1.1.1
   magic_dns: true
   base_domain: {{ headscale_base_domain }}
 
@@ -28,13 +30,16 @@ derp:
     region_code: "aws-headscale-maecki"
     region_name: "aws-headscale-maecki"
     stun_listen_addr: "0.0.0.0:3478"
+    private_key_path: /var/lib/headscale/derp_server_private.key
   paths: []
   auto_update_enabled: false
   update_frequency: 24h
 
 # DB
-db_type: sqlite3
-db_path: /var/lib/headscale/db.sqlite
+database:
+  type: sqlite3
+  sqlite:
+    path: /var/lib/headscale/db.sqlite
 
 # TLS
 acme_url: https://acme-v02.api.letsencrypt.org/directory