diff options
-rw-r--r-- | deno/deno.json | 7 | ||||
-rw-r--r-- | deno/service-manager/deno.json | 12 | ||||
-rw-r--r-- | deno/tools/deno.json | 1 | ||||
-rw-r--r-- | deno/tools/generate-geosite-rules.ts (renamed from deno/tools/gen-geosite-rules.ts) | 0 | ||||
-rw-r--r-- | deno/tools/manage-service.ts (renamed from deno/service-manager/main.ts) | 2 | ||||
-rw-r--r-- | deno/tools/template.ts (renamed from deno/service-manager/template.ts) | 0 | ||||
-rwxr-xr-x | services/manage | 2 |
7 files changed, 7 insertions, 17 deletions
diff --git a/deno/deno.json b/deno/deno.json index 55ffcb8..569f97f 100644 --- a/deno/deno.json +++ b/deno/deno.json @@ -1,8 +1,7 @@ { - "workspace": ["./base", "./service-manager", "./mail-relay", "./tools" ], + "workspace": ["./base", "./mail-relay", "./tools" ], "tasks": { "compile:mail-relay": "deno task --cwd=mail-relay compile", - "compile:service-manager": "deno task --cwd=service-manager compile" }, "imports": { "@std/cli": "jsr:@std/cli@^1.0.19", @@ -12,6 +11,8 @@ "@std/expect": "jsr:@std/expect@^1.0.16", "@std/io": "jsr:@std/io@^0.225.2", "@std/path": "jsr:@std/path@^1.1.0", - "@std/testing": "jsr:@std/testing@^1.0.13" + "@std/testing": "jsr:@std/testing@^1.0.13", + "@std/dotenv": "jsr:@std/dotenv@^0.225.5", + "@std/fs": "jsr:@std/fs@^1.0.18" } } diff --git a/deno/service-manager/deno.json b/deno/service-manager/deno.json deleted file mode 100644 index 9f30853..0000000 --- a/deno/service-manager/deno.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": "0.1.0", - "tasks": { - "run": "deno run -A main.ts", - "compile": "deno compile -o out/manage -A main.ts" - }, - "imports": { - "@std/dotenv": "jsr:@std/dotenv@^0.225.5", - "@std/fs": "jsr:@std/fs@^1.0.18", - "mustache": "npm:mustache@^4.2.0" - } -} diff --git a/deno/tools/deno.json b/deno/tools/deno.json index 3597182..355046a 100644 --- a/deno/tools/deno.json +++ b/deno/tools/deno.json @@ -3,5 +3,6 @@ "tasks": { }, "imports": { + "mustache": "npm:mustache@^4.2.0" } } diff --git a/deno/tools/gen-geosite-rules.ts b/deno/tools/generate-geosite-rules.ts index c59d34f..c59d34f 100644 --- a/deno/tools/gen-geosite-rules.ts +++ b/deno/tools/generate-geosite-rules.ts diff --git a/deno/service-manager/main.ts b/deno/tools/manage-service.ts index 93f4c1b..45e09ec 100644 --- a/deno/service-manager/main.ts +++ b/deno/tools/manage-service.ts @@ -1,5 +1,5 @@ import { parseArgs } from "@std/cli"; -import { loadVariables, TemplateDir } from "./template.ts"; +import { TemplateDir } from "./template.ts"; import { join } from "@std/path"; if (import.meta.main) { diff --git a/deno/service-manager/template.ts b/deno/tools/template.ts index 0b043a1..0b043a1 100644 --- a/deno/service-manager/template.ts +++ b/deno/tools/template.ts diff --git a/services/manage b/services/manage index c81e6dc..9248945 100755 --- a/services/manage +++ b/services/manage @@ -14,4 +14,4 @@ export CRUPEST_PROJECT_DIR echo "Project Dir: $CRUPEST_PROJECT_DIR" -exec deno run -A "$CRUPEST_PROJECT_DIR/deno/service-manager/main.ts" --project-dir "$CRUPEST_PROJECT_DIR" "$@" +exec deno run -A "$CRUPEST_PROJECT_DIR/deno/tools/manage-service.ts" --project-dir "$CRUPEST_PROJECT_DIR" "$@" |