From 3883de080e263d2f076f65b4600a5021d3d64a21 Mon Sep 17 00:00:00 2001 From: vnugent Date: Fri, 1 Mar 2024 17:58:48 -0500 Subject: fix: merge latest package updates to fix registation --- ci/container/Dockerfile | 1 + ci/container/Taskfile.yaml | 4 +--- ci/container/config-templates/SimpleBookmark-template.json | 4 ++-- ci/container/docker-compose.yaml | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ci') diff --git a/ci/container/Dockerfile b/ci/container/Dockerfile index 365f1c7..6804a6e 100644 --- a/ci/container/Dockerfile +++ b/ci/container/Dockerfile @@ -54,6 +54,7 @@ ENV VNLIB_ARGON2_DLL_PATH=/app/lib/libargon2.so #set default env variables ENV MAX_BOOKMARKS=5000 +ENV REG_TOKEN_DURATION_MIN=360 #SQL Config ENV SQL_LIB_PATH=VNLib.Plugins.Extensions.Sql.SQLite.dll diff --git a/ci/container/Taskfile.yaml b/ci/container/Taskfile.yaml index bbf2b30..97548dc 100644 --- a/ci/container/Taskfile.yaml +++ b/ci/container/Taskfile.yaml @@ -32,9 +32,7 @@ tasks: #build rpmalloc library - cd lib/vnlib_rpmalloc/ && task && cp build/libvn_rpmalloc.so {{.OUT_DIR}}/libvn_rpmalloc.so #install zlib and brotli native libraries from the source repos (they dont have active releases anymore :() - - mkdir -p lib/third-party - - cd lib/third-party && git clone https://github.com/cloudflare/zlib.git - - cd lib/third-party && git clone https://github.com/google/brotli.git + - cd lib/vnlib_compress/ && task && cp build/libvn_compress.so {{.OUT_DIR}}/libvn_compress.so #build native compression lib and put in lib dir - cd lib/vnlib_compress && cmake -B./build && cmake --build build/ --config Release && cp build/libvn_compress.so {{.OUT_DIR}}/libvn_compress.so diff --git a/ci/container/config-templates/SimpleBookmark-template.json b/ci/container/config-templates/SimpleBookmark-template.json index 6f39001..a64a10a 100644 --- a/ci/container/config-templates/SimpleBookmark-template.json +++ b/ci/container/config-templates/SimpleBookmark-template.json @@ -16,7 +16,7 @@ "registration": { "path": "/api/register", //Path for the registration endpoint - "token_lifetime_mins": 360, //Token lifetime in minutes - "key_regen_interval_mins": 3600 //Signing key regeneration interval in minutes + "token_lifetime_mins": ${REG_TOKEN_DURATION_MIN}, //Token lifetime in minutes + "key_regen_interval_mins": ${REG_TOKEN_DURATION_MIN}0 //Signing key regeneration interval in minutes } } \ No newline at end of file diff --git a/ci/container/docker-compose.yaml b/ci/container/docker-compose.yaml index 92745dd..eb28055 100644 --- a/ci/container/docker-compose.yaml +++ b/ci/container/docker-compose.yaml @@ -16,6 +16,7 @@ services: - 8080:8080 environment: MAX_BOOKMARKS: "5000" + REG_TOKEN_DURATION_MIN: "360" #6 hours #SQL Config SQL_LIB_PATH: "VNLib.Plugins.Extensions.Sql.SQLite.dll" SQL_CONNECTION_STRING: "Data Source=data/simple-bookmark.db;" -- cgit