Merge branch 'main' into features/authorized-node

.github/renovate.json

@@ -8,7 +8,7 @@
   "ignorePresets": [":prHourlyLimit2"],
   "enabledManagers": ["dockerfile", "gomod", "github-actions", "regex"],
   "includeForks": true,
-  "repositories": ["juanfont/headscale"],
+  "repositories": ["hopleus/headscale"],
   "platform": "github",
   "packageRules": [
     {

.github/workflows/docs.yml

@@ -35,18 +35,18 @@ jobs:
         with:
           path: ./site
 
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    permissions:
-      pages: write
-      id-token: write
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Configure Pages
-        uses: actions/configure-pages@v4
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+#  deploy:
+#    environment:
+#      name: github-pages
+#      url: ${{ steps.deployment.outputs.page_url }}
+#    permissions:
+#      pages: write
+#      id-token: write
+#    runs-on: ubuntu-latest
+#    needs: build
+#    steps:
+#      - name: Configure Pages
+#        uses: actions/configure-pages@v4
+#      - name: Deploy to GitHub Pages
+#        id: deployment
+#        uses: actions/deploy-pages@v4

.github/workflows/release.yml

@@ -16,11 +16,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#      - name: Login to DockerHub
+#        uses: docker/login-action@v3
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USERNAME }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GHCR
         uses: docker/login-action@v3

.goreleaser.yml

@@ -59,7 +59,7 @@ nfpms:
     priority: optional
     vendor: headscale
     maintainer: Kristoffer Dalby <kristoffer@dalby.cc>
-    homepage: https://github.com/juanfont/headscale
+    homepage: https://github.com/hopleus/headscale
     license: BSD
     bindir: /usr/bin
     formats:
@@ -82,7 +82,7 @@ nfpms:
 
 kos:
   - id: ghcr
-    repository: ghcr.io/juanfont/headscale
+    repository: ghcr.io/hopleus/headscale
 
     # bare tells KO to only use the repository
     # for tagging and naming the container.
@@ -110,31 +110,31 @@ kos:
       - '{{ trimprefix .Tag "v" }}'
       - "sha-{{ .ShortCommit }}"
 
-  - id: dockerhub
-    build: headscale
-    base_image: gcr.io/distroless/base-debian12
-    repository: headscale/headscale
-    bare: true
-    platforms:
-      - linux/amd64
-      - linux/386
-      - linux/arm64
-      - linux/arm/v7
-    tags:
-      - "{{ if not .Prerelease }}latest{{ end }}"
-      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}{{ end }}"
-      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}{{ end }}"
-      - "{{ if not .Prerelease }}{{ .Major }}{{ end }}"
-      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}{{ end }}"
-      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}{{ end }}"
-      - "{{ if not .Prerelease }}v{{ .Major }}{{ end }}"
-      - "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}"
-      - "{{ .Tag }}"
-      - '{{ trimprefix .Tag "v" }}'
-      - "sha-{{ .ShortCommit }}"
+#  - id: dockerhub
+#    build: headscale
+#    base_image: gcr.io/distroless/base-debian12
+#    repository: hopleus/headscale
+#    bare: true
+#    platforms:
+#      - linux/amd64
+#      - linux/386
+#      - linux/arm64
+#      - linux/arm/v7
+#    tags:
+#      - "{{ if not .Prerelease }}latest{{ end }}"
+#      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}{{ end }}"
+#      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}{{ end }}"
+#      - "{{ if not .Prerelease }}{{ .Major }}{{ end }}"
+#      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}{{ end }}"
+#      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}{{ end }}"
+#      - "{{ if not .Prerelease }}v{{ .Major }}{{ end }}"
+#      - "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}"
+#      - "{{ .Tag }}"
+#      - '{{ trimprefix .Tag "v" }}'
+#      - "sha-{{ .ShortCommit }}"
 
   - id: ghcr-debug
-    repository: ghcr.io/juanfont/headscale
+    repository: ghcr.io/hopleus/headscale
     bare: true
     base_image: gcr.io/distroless/base-debian12:debug
     build: headscale
@@ -159,28 +159,28 @@ kos:
       - '{{ trimprefix .Tag "v" }}-debug'
       - "sha-{{ .ShortCommit }}-debug"
 
-  - id: dockerhub-debug
-    build: headscale
-    base_image: gcr.io/distroless/base-debian12:debug
-    repository: headscale/headscale
-    bare: true
-    platforms:
-      - linux/amd64
-      - linux/386
-      - linux/arm64
-      - linux/arm/v7
-    tags:
-      - "{{ if not .Prerelease }}latest-debug{{ end }}"
-      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug{{ end }}"
-      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}-debug{{ end }}"
-      - "{{ if not .Prerelease }}{{ .Major }}-debug{{ end }}"
-      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug{{ end }}"
-      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}-debug{{ end }}"
-      - "{{ if not .Prerelease }}v{{ .Major }}-debug{{ end }}"
-      - "{{ if not .Prerelease }}stable{{ else }}unstable-debug{{ end }}"
-      - "{{ .Tag }}-debug"
-      - '{{ trimprefix .Tag "v" }}-debug'
-      - "sha-{{ .ShortCommit }}-debug"
+#  - id: dockerhub-debug
+#    build: headscale
+#    base_image: gcr.io/distroless/base-debian12:debug
+#    repository: hopleus/headscale
+#    bare: true
+#    platforms:
+#      - linux/amd64
+#      - linux/386
+#      - linux/arm64
+#      - linux/arm/v7
+#    tags:
+#      - "{{ if not .Prerelease }}latest-debug{{ end }}"
+#      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug{{ end }}"
+#      - "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}-debug{{ end }}"
+#      - "{{ if not .Prerelease }}{{ .Major }}-debug{{ end }}"
+#      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug{{ end }}"
+#      - "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}-debug{{ end }}"
+#      - "{{ if not .Prerelease }}v{{ .Major }}-debug{{ end }}"
+#      - "{{ if not .Prerelease }}stable{{ else }}unstable-debug{{ end }}"
+#      - "{{ .Tag }}-debug"
+#      - '{{ trimprefix .Tag "v" }}-debug'
+#      - "sha-{{ .ShortCommit }}-debug"
 
 checksum:
   name_template: "checksums.txt"

CHANGELOG.md

@@ -21,6 +21,19 @@
 - Allow nodes to use SSH agent forwarding [#2145](https://github.com/juanfont/headscale/pull/2145)
 - Node Approval. Manually approve new nodes before they access the network.
 
+## [FORK] 0.23.0-241005
+### Changes
+
+- Modified Node response
+  - allowedExitNode
+  - hasExitNode
+  - hostInfo
+    - tsVersion
+    - osName
+    - osVersion
+    - deviceModel
+    - deviceArch
+- Added the ability to configure endpoints availability (Platform Configs and Swagger)
 
 ## 0.23.0 (2024-09-18)
 

README.md

@@ -1,3 +1,10 @@
+# Differences from the original HeadScale assembly
+
+- [x] Add HostInfo to Node response
+- [x] Added the ability to configure endpoints availability (Platform Configs and Swagger)
+
+# HeadScale
+
 ![headscale logo](./docs/logo/headscale3_header_stacked_left.png)
 
 ![ci](https://github.com/juanfont/headscale/actions/workflows/test.yml/badge.svg)

config-example.yaml

@@ -385,6 +385,13 @@ logtail:
 # firewall devices. See https://tailscale.com/kb/1181/firewalls/ for more information.
 randomize_client_port: false
 
+# Configuration routes
+routes:
+  # Disabling routes to download configuration for windows and apple
+  platformConfig: false
+  # Disabling routes for Swagger
+  swagger: false
+
 ## NodeManagement
 node_management:
   # Require new nodes to be approved by admins before they can access the network.