diff options
Diffstat (limited to 'ci')
-rw-r--r-- | ci/config/SimpleBookmark.json | 8 | ||||
-rw-r--r-- | ci/config/config.json | 5 | ||||
-rw-r--r-- | ci/container/Dockerfile | 1 | ||||
-rw-r--r-- | ci/container/config-templates/SimpleBookmark-template.json | 20 | ||||
-rw-r--r-- | ci/container/config-templates/config-template.json | 3 | ||||
-rw-r--r-- | ci/container/docker-compose.yaml | 1 | ||||
-rw-r--r-- | ci/plugins.taskfile.yaml | 10 | ||||
-rw-r--r-- | ci/taskfile.yaml | 2 |
8 files changed, 28 insertions, 22 deletions
diff --git a/ci/config/SimpleBookmark.json b/ci/config/SimpleBookmark.json index 64be3c1..2cb64bf 100644 --- a/ci/config/SimpleBookmark.json +++ b/ci/config/SimpleBookmark.json @@ -8,9 +8,9 @@ "path": "/api/bookmarks", //Path for the bookmarks endpoint "config": { - "max_limit": 100, //Max results per page - "default_limit": 20, //Default results per page - "user_quota": 5000 //Max bookmarks per user + "max_limit": 100, //Max results per page + "default_limit": 20, //Default results per page + "user_quota": 5000 //Max bookmarks per user } }, @@ -23,7 +23,7 @@ "--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 + "--location" //Follow redirects ] }, diff --git a/ci/config/config.json b/ci/config/config.json index 61293b6..37b952a 100644 --- a/ci/config/config.json +++ b/ci/config/config.json @@ -51,6 +51,9 @@ //Collection of objects to define hosts+interfaces to build server listeners from "virtual_hosts": [ { + //Enable nginx-style connection tracing for this endpoint + "trace": false, + //The interface to bind to, you may not mix TLS and non-TLS connections on the same interface "interface": { "address": "0.0.0.0", @@ -84,7 +87,7 @@ "X-Content-Type-Options": "nosniff", "X-Xss-Protection": "1; mode=block", "X-Frame-Options": "DENY", - "Server":"VNLib.Webserver", + "Server": "VNLib.Webserver", "Content-Security-Policy": "default-src 'self' 'unsafe-inline'; img-src 'self' blob: data:; frame-src 'none'; object-src 'none'; referrer no-referrer-when-downgrade; upgrade-insecure-requests; block-all-mixed-content;" }, diff --git a/ci/container/Dockerfile b/ci/container/Dockerfile index b7898d4..05517df 100644 --- a/ci/container/Dockerfile +++ b/ci/container/Dockerfile @@ -84,6 +84,7 @@ ENV VNCACHE_CACHE_PUBLIC_KEY="" #HTTP/PROXY Config ENV HTTP_DOWNSTREAM_SERVERS=[] ENV SSL_JSON="{}" +ENV HTTP_TRACE_ON=false #run the init script within dumb-init ENTRYPOINT ["dumb-init", "--"] diff --git a/ci/container/config-templates/SimpleBookmark-template.json b/ci/container/config-templates/SimpleBookmark-template.json index c2bf780..610673e 100644 --- a/ci/container/config-templates/SimpleBookmark-template.json +++ b/ci/container/config-templates/SimpleBookmark-template.json @@ -7,7 +7,7 @@ "path": "/api/bookmarks", //Path for the bookmarks endpoint - "config": { + "config": { "max_limit": 100, //Max results per page "default_limit": 20, //Default results per page "user_quota": ${MAX_BOOKMARKS} //Max bookmarks per user @@ -19,19 +19,17 @@ "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 + "--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 - "key_regen_interval_mins": ${REG_TOKEN_DURATION_MIN}0 //Signing key regeneration interval in minutes + "path": "/api/register", //Path for the registration endpoint + "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/config-templates/config-template.json b/ci/container/config-templates/config-template.json index e226efb..0bd0ddb 100644 --- a/ci/container/config-templates/config-template.json +++ b/ci/container/config-templates/config-template.json @@ -52,6 +52,9 @@ //Collection of objects to define hosts+interfaces to build server listeners from "virtual_hosts": [ { + + "trace": ${HTTP_TRACE_ON}, + //The interface to bind to, you may not mix TLS and non-TLS connections on the same interface "interface": { "address": "0.0.0.0", diff --git a/ci/container/docker-compose.yaml b/ci/container/docker-compose.yaml index 1ffee2f..465615d 100644 --- a/ci/container/docker-compose.yaml +++ b/ci/container/docker-compose.yaml @@ -43,6 +43,7 @@ services: #HTTP HTTP_DOWNSTREAM_SERVERS: '[]' + HTTP_TRACE_ON: "false" #SSL_JSON: '{"cert": "ssl/cert.pem", "privkey":"ssl/priv.pem"}' SERVER_ARGS: "" diff --git a/ci/plugins.taskfile.yaml b/ci/plugins.taskfile.yaml index dfc22b2..e35f508 100644 --- a/ci/plugins.taskfile.yaml +++ b/ci/plugins.taskfile.yaml @@ -10,12 +10,12 @@ includes: taskfile: install.taskfile.yaml vars: - CORE_VERSION: 'e07537a3dde8e16100ef1bcc2a54f9ade8ae856f' - ESSENTIALS_VERSION: 'a7cf7c8987b8847984629293d8eb27908f3de3dd' - CACHE_VERSION: '49c3641def5ae1b7557ed61ed7bb28bbf425ccc9' + CORE_VERSION: '107b058a38d6785b350826c6fb01bb64997c630a' + ESSENTIALS_VERSION: '8d57b050d499c2d85005bebbc2892b190cbb18cc' + CACHE_VERSION: '2468774cb54a7ac381988af6fa8ed0b09264762d' USERS_VERSION: 'cbe49da211039957b431b307a0cb2c3a20bd2c10' - SESSION_VERSION: '9c8da6ea8fabe1d752bb28fd5eaeeb0b1d06d94d' - EXTENSIONS_VERSION: '40c634b0f37ce9922dbc32c86e26d5a771daeca3' + SESSION_VERSION: '84f81db6ec729e24e2818557564e7da92259be43' + EXTENSIONS_VERSION: '87bfa8367bf5e66a1cee0f70c45a1748ef7c433b' tasks: diff --git a/ci/taskfile.yaml b/ci/taskfile.yaml index f9168b0..fca7deb 100644 --- a/ci/taskfile.yaml +++ b/ci/taskfile.yaml @@ -8,7 +8,7 @@ version: "3" vars: BUILDS_URL: https://www.vaughnnugent.com/public/resources/software/builds SQLITE_OUT_DIR: "plugins/assets/VNLib.Plugins.Extensions.Loading.Sql.SQLite" - WEBSERVER_VERSION: 'ed0c71876ec04528e24e612ce723d3aed8971262' + WEBSERVER_VERSION: '7ac8ec4fa49e330a48343e3405a3577bbfa76b6a' includes: install: |