Skip to content

Commit 1883368

Browse files
committed
chore: add headscale repo
1 parent ac7ef63 commit 1883368

File tree

6 files changed

+56
-7
lines changed

6 files changed

+56
-7
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "drop-base"]
22
path = drop-base
33
url = https://github.com/Drop-OSS/drop-base.git
4+
[submodule "headscale"]
5+
path = headscale
6+
url = https://github.com/juanfont/headscale.git

headscale

Submodule headscale added at ade7f2a

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
"@types/turndown": "^5.0.5",
5858
"autoprefixer": "^10.4.20",
5959
"eslint": "^9.24.0",
60-
"eslint-config-prettier": "^10.1.1",
60+
"eslint-config-prettier": "^10.1.5",
61+
"eslint-plugin-prettier": "^5.4.0",
6162
"h3": "^1.15.1",
6263
"ofetch": "^1.4.1",
6364
"postcss": "^8.4.47",

server/internal/config/sys-conf.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
import path from "path";
2+
13
class SystemConfig {
24
private libraryFolder = process.env.LIBRARY ?? "./.data/library";
35
private dataFolder = process.env.DATA ?? "./.data/data";
6+
private headscaleFolder = path.join(this.dataFolder, "headscale");
47

58
getLibraryFolder() {
69
return this.libraryFolder;
@@ -9,6 +12,10 @@ class SystemConfig {
912
getDataFolder() {
1013
return this.dataFolder;
1114
}
15+
16+
getHeadscaleFolder() {
17+
return this.headscaleFolder;
18+
}
1219
}
1320

1421
export const systemConfig = new SystemConfig();

server/internal/p2p/headscale.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import type { HeadscaleService} from "@drop-oss/headscalez";
1+
import type { HeadscaleService } from "@drop-oss/headscalez";
22
import { startHeadscale } from "@drop-oss/headscalez";
3+
import { systemConfig } from "../config/sys-conf";
34

45
export class HeadscaleManager {
56
private headscaleService?: HeadscaleService;
@@ -11,7 +12,10 @@ export class HeadscaleManager {
1112
async setup() {
1213
const externalUrl = process.env.CONTROL_URL;
1314
if (externalUrl) {
14-
const headscale = await startHeadscale({ externalUrl });
15+
const headscale = await startHeadscale({
16+
externalUrl,
17+
dir: systemConfig.getHeadscaleFolder(),
18+
});
1519
this.headscaleService = headscale;
1620
}
1721
}

yarn.lock

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,6 +1469,11 @@
14691469
resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.1.tgz#6d083acfddae21fb329c8df8c94bf895ce7d0c15"
14701470
integrity sha512-VzgHzGblFmUeBmmrk55zPyrQIArQN4vujc9shWytaPdB3P7qhi0cpaiKIr7tlCmFv2lYUwnLospIqjL9ZSAhhg==
14711471

1472+
"@pkgr/core@^0.2.3":
1473+
version "0.2.4"
1474+
resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.4.tgz#d897170a2b0ba51f78a099edccd968f7b103387c"
1475+
integrity sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==
1476+
14721477
"@polka/url@^1.0.0-next.24":
14731478
version "1.0.0-next.28"
14741479
resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.28.tgz#d45e01c4a56f143ee69c54dd6b12eade9e270a73"
@@ -3566,10 +3571,10 @@ eslint-config-flat-gitignore@^2.1.0:
35663571
dependencies:
35673572
"@eslint/compat" "^1.2.5"
35683573

3569-
eslint-config-prettier@^10.1.1:
3570-
version "10.1.1"
3571-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz#cf0ff6e5c4e7e15f129f1f1ce2a5ecba92dec132"
3572-
integrity sha512-4EQQr6wXwS+ZJSzaR5ZCrYgLxqvUjdXctaEtBqHcbkW944B1NQyO4qpdHQbXBONfwxXdkAY81HH4+LUfrg+zPw==
3574+
eslint-config-prettier@^10.1.5:
3575+
version "10.1.5"
3576+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz#00c18d7225043b6fbce6a665697377998d453782"
3577+
integrity sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==
35733578

35743579
eslint-flat-config-utils@^2.0.1:
35753580
version "2.0.1"
@@ -3628,6 +3633,14 @@ eslint-plugin-jsdoc@^50.6.9:
36283633
spdx-expression-parse "^4.0.0"
36293634
synckit "^0.9.1"
36303635

3636+
eslint-plugin-prettier@^5.4.0:
3637+
version "5.4.0"
3638+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz#54d4748904e58eaf1ffe26c4bffa4986ca7f952b"
3639+
integrity sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==
3640+
dependencies:
3641+
prettier-linter-helpers "^1.0.0"
3642+
synckit "^0.11.0"
3643+
36313644
eslint-plugin-regexp@^2.7.0:
36323645
version "2.7.0"
36333646
resolved "https://registry.yarnpkg.com/eslint-plugin-regexp/-/eslint-plugin-regexp-2.7.0.tgz#84fa2d2b122e343f596cfb83ed8a5517a1dfef2a"
@@ -3866,6 +3879,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
38663879
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
38673880
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
38683881

3882+
fast-diff@^1.1.2:
3883+
version "1.3.0"
3884+
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
3885+
integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
3886+
38693887
fast-fifo@^1.2.0, fast-fifo@^1.3.2:
38703888
version "1.3.2"
38713889
resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
@@ -6227,6 +6245,13 @@ prelude-ls@^1.2.1:
62276245
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
62286246
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
62296247

6248+
prettier-linter-helpers@^1.0.0:
6249+
version "1.0.0"
6250+
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
6251+
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
6252+
dependencies:
6253+
fast-diff "^1.1.2"
6254+
62306255
prettier@^3.5.3:
62316256
version "3.5.3"
62326257
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5"
@@ -7037,6 +7062,14 @@ svgo@^3.2.0, svgo@^3.3.2:
70377062
csso "^5.0.5"
70387063
picocolors "^1.0.0"
70397064

7065+
synckit@^0.11.0:
7066+
version "0.11.4"
7067+
resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.4.tgz#48972326b59723fc15b8d159803cf8302b545d59"
7068+
integrity sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==
7069+
dependencies:
7070+
"@pkgr/core" "^0.2.3"
7071+
tslib "^2.8.1"
7072+
70407073
synckit@^0.9.1:
70417074
version "0.9.2"
70427075
resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.2.tgz#a3a935eca7922d48b9e7d6c61822ee6c3ae4ec62"

0 commit comments

Comments
 (0)