- Add support for Debian Bookworm

- Bump worker to .NET Core 7.0 because 5.0 is EOL and isn't available for Bookworm

Author: Daniel15

README.md

@@ -8,17 +8,17 @@ DNSTools is split into two pieces:
 
 ## Website
 
-The website is a C# ASP .NET Core 3.0 website, built using React and SignalR.
+The website is a C# ASP .NET Core 7.0 website, built using React and SignalR.
 
 ## Worker
 
-The "worker" (or "agent") is a small app that runs on multiple servers around the world. It's a [gRPC](https://grpc.io/) service written in C# using .NET Core 3.0. In production, the workers are a mix of KVM and OpenVZ7 VPSes running Debian Buster (10).
+The "worker" (or "agent") is a small app that runs on multiple servers around the world. It's a [gRPC](https://grpc.io/) service written in C# using .NET Core 7.0. In production, the workers are a mix of KVM and OpenVZ7 VPSes running Debian Buster (10), Bullseye (11) or Bookworm (12).
 
 Some workers (such as pings and traceroutes) use the standard `ping` and `traceroute` command-line utilities. Pings can only be sent by root, and reusing existing well-tested code is more secure than creating our own setuid binaries. Other tools (like DNS lookups) are all performed using C# code.
 
 # Development
 
-The `DnsTools.sln` VS2019 solution contains both the website and the worker.
+The `DnsTools.sln` Visual Studio 2022 solution contains both the website and the worker.
 
 ## Website
 

ansible/deploy-workers.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ex
-if [ ! -d ../src/DnsTools.Worker/bin/Release/net5.0/linux-x64/publish/ ]; then
+if [ ! -d ../src/DnsTools.Worker/bin/Release/net7.0/linux-x64/publish/ ]; then
 	dotnet.exe publish ../src/DnsTools.Worker --no-self-contained -r linux-x64 -c Release
 fi
 ANSIBLE_CONFIG=/mnt/c/src/dnstools.ws/ansible/ansible.cfg ansible-playbook worker.yml --extra-vars '@passwd.yml' --vault-password-file=vault-password

ansible/roles/dnstools-worker/tasks/main.yml

@@ -12,12 +12,24 @@
   apt_key:
     url: https://packages.microsoft.com/keys/microsoft.asc
 
+- name: .NET Core repository (bookworm)
+  apt_repository:
+    repo: deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/debian/12/prod bookworm main
+    state: present
+  when: ansible_distribution_release == "bookworm"
+
 - name: .NET Core repository (bullseye)
   apt_repository:
     repo: deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/debian/11/prod bullseye main
     state: present
   when: ansible_distribution_release == "bullseye"
 
+- name: Remove Bullseye .NET Core repository from Bookworm
+  apt_repository:
+    repo: deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/debian/11/prod buster main
+    state: absent
+  when: ansible_distribution_release == "bookworm"
+
 - name: Remove Buster .NET Core repository from Bullseye
   apt_repository:
     repo: deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/debian/10/prod buster main
@@ -47,15 +59,17 @@
     name:
       - aspnetcore-runtime-3.1
       - dotnet-runtime-3.1
+      - aspnetcore-runtime-5.0
+      - dotnet-runtime-5.0
     state: absent
   when: clean_old_dotnet|bool
 
 - name: Install packages
   apt:
     name:
-      - aspnetcore-runtime-5.0
+      - aspnetcore-runtime-7.0
       - certbot
-      - dotnet-runtime-5.0
+      - dotnet-runtime-7.0
       - htop
       - iputils-ping
       - mtr-tiny
@@ -116,7 +130,7 @@
 
 - name: Copy worker
   synchronize:
-    src: ../src/DnsTools.Worker/bin/Release/net5.0/linux-x64/publish/
+    src: ../src/DnsTools.Worker/bin/Release/net7.0/linux-x64/publish/
     dest: /opt/dnstools-worker/
     rsync_path: "/usr/bin/rsync" # Avoiding sudo for rsync
 

src/DnsTools.Worker/DnsTools.Worker.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>00cb3cca-d2b7-4c88-87e5-e2d2fdd702a5</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>