diff options
| -rw-r--r-- | ci/container/config-templates/SimpleBookmark-template.json | 15 | ||||
| -rw-r--r-- | ci/container/docker-compose.yaml | 4 | ||||
| -rw-r--r-- | ci/container/run.sh | 2 | ||||
| -rw-r--r-- | ci/release.taskfile.yaml | 14 | ||||
| -rw-r--r-- | ci/taskfile.yaml | 2 |
5 files changed, 24 insertions, 13 deletions
diff --git a/ci/container/config-templates/SimpleBookmark-template.json b/ci/container/config-templates/SimpleBookmark-template.json index a64a10a..c2bf780 100644 --- a/ci/container/config-templates/SimpleBookmark-template.json +++ b/ci/container/config-templates/SimpleBookmark-template.json @@ -14,6 +14,21 @@ } }, + //System website lookup endpoint (aka curl) + "curl": { + "path": "/api/lookup", + "exe_path": "curl", //Path to the curl executable + "extra_args": [ + "--globoff", //Disables unsafe url globbing + "--no-keepalive", //Disables keepalive, uneeded for a single lookup request + "--max-filesize", + "100K", //Max file size 100K + "--max-redirs", + "5", //Max redirects 5 + "--location", //Follow redirects + ] + }, + "registration": { "path": "/api/register", //Path for the registration endpoint "token_lifetime_mins": ${REG_TOKEN_DURATION_MIN}, //Token lifetime in minutes diff --git a/ci/container/docker-compose.yaml b/ci/container/docker-compose.yaml index eb28055..03eb815 100644 --- a/ci/container/docker-compose.yaml +++ b/ci/container/docker-compose.yaml @@ -27,6 +27,7 @@ services: CACHE_ASM_PATH: "VNLib.Data.Caching.Providers.VNCache.dll" MEMCACHE_ONLY: "true" REDIS_CONNECTION_STRING: "" + #at least one node required if MEMCACHE_ONLY is false VNCACHE_INITIAL_NODES: "[]" #ACCOUNTS MAX_LOGIN_ATTEMPS: "10" @@ -35,6 +36,7 @@ services: PASSWORD_PEPPER: "" DATABASE_PASSWORD: "" REDIS_PASSWORD: "" + #if MEMCACHE_ONLY is false, then the following keys are required to connect to a VNCACHE cluster VNCACHE_CLIENT_PRIVATE_KEY: "" VNCACHE_CACHE_PUBLIC_KEY: "" @@ -42,5 +44,5 @@ services: HTTP_DOWNSTREAM_SERVERS: '[]' #SSL_JSON: '{"cert": "ssl/cert.pem", "privkey":"ssl/priv.pem"}' - SERVER_ARGS: "--input-off" + SERVER_ARGS: "" diff --git a/ci/container/run.sh b/ci/container/run.sh index 2c2636c..c780929 100644 --- a/ci/container/run.sh +++ b/ci/container/run.sh @@ -12,4 +12,4 @@ done cp usr/assets/* plugins/assets/ -rf #start the server -dotnet webserver/VNLib.WebServer.dll --config config/config.json $SERVER_ARGS
\ No newline at end of file +dotnet webserver/VNLib.WebServer.dll --config config/config.json --input-off $SERVER_ARGS
\ No newline at end of file diff --git a/ci/release.taskfile.yaml b/ci/release.taskfile.yaml index 3fbb9c0..f6fdf62 100644 --- a/ci/release.taskfile.yaml +++ b/ci/release.taskfile.yaml @@ -34,7 +34,7 @@ tasks: - apt install -y dotnet-runtime-8.0 gcc cmake curl - task: setup - echo "Setup complete" - + setup-dnf: desc: "Performs initial setup on Fedora/Redhat amd (dnf) based machines" silent: true @@ -43,7 +43,7 @@ tasks: - dnf install -y dotnet-runtime-8.0 gcc cmake curl - task: setup - echo "Setup complete" - + setup-apk: desc: "Performs initial setup using the APK package manager for amd64 based machines" silent: true @@ -73,12 +73,6 @@ tasks: desc: "Genereates a new self-signed TLS certificate" cmds: - openssl req -new -x509 -days 365 -keyout {{.SSL_DIR}}/key.pem -out {{.SSL_DIR}}/cert.pem -newkey ec -pkeyopt ec_paramgen_curve:{{.DEFAULT_EC_CURVE}} --nodes - - set-perms: - desc: "(Linux/MacOS only) Sets proper file security for the entire application" - cmds: - - cmd: chmod -R 0750 . && chmod -R 0770 data/ #set to read/exec only for all files except the data dir - platforms: [ linux, darwin ] build-rpmalloc: internal: true @@ -112,6 +106,6 @@ tasks: #build the native compressor library for linux/mac - cmd: cd vnlib_compress/ && cp build/libvn_compress{{if eq OS "darwin"}}.dylib{{else}}.so{{end}} ../vnlib_compress.dll platforms: [ linux, darwin ] - + - cmd: powershell -Command "cp vnlib_compress/build/Release/vnlib_compress.dll vnlib_compress.dll" - platforms: [ windows/amd64 ]
\ No newline at end of file + platforms: [ windows/amd64 ]
\ No newline at end of file diff --git a/ci/taskfile.yaml b/ci/taskfile.yaml index fb7b677..43e11a8 100644 --- a/ci/taskfile.yaml +++ b/ci/taskfile.yaml @@ -96,7 +96,7 @@ tasks: cmd: powershell -Command "cp -Recurse -Force {{.ITEM}} {{.BUILD_DIR}}" #copy release taskfile and rename it - - cmd: powershell -Command "cp -Force release.taskfile.yaml {{.BUILD_DIR}}/taskfile.yaml" + - cmd: powershell -Command "cp -Force release.taskfile.yaml {{.BUILD_DIR}}/Taskfile.yaml" pack: internal: true |