Merge pull request #202 from acouvreur/main

Merge Main back to Beta

config/sessions.go

@@ -4,7 +4,7 @@ import "time"
 
 type Sessions struct {
 	DefaultDuration    time.Duration `mapstructure:"DEFAULT_DURATION" yaml:"defaultDuration" default:"5m"`
-	ExpirationInterval time.Duration `mapstructure:"EXPIRATION_INTERVAL" yaml:"expirationIntrerval" default:"20s"`
+	ExpirationInterval time.Duration `mapstructure:"EXPIRATION_INTERVAL" yaml:"expirationInterval" default:"20s"`
 }
 
 func NewSessionsConfig() Sessions {

docker-compose.yml

@@ -22,12 +22,12 @@ services:
     labels:
       - traefik.enable=true
       # Dynamic Middleware
-      - traefik.http.middlewares.dynamic.plugin.sablier.names=sablier-whoami-1
+      - traefik.http.middlewares.dynamic.plugin.sablier.names=sablier_whoami_1
       - traefik.http.middlewares.dynamic.plugin.sablier.sablierUrl=http://sablier:10000
       - traefik.http.middlewares.dynamic.plugin.sablier.sessionDuration=1m
       - traefik.http.middlewares.dynamic.plugin.sablier.dynamic.theme=hacker-terminal
       # Blocking Middleware
-      - traefik.http.middlewares.blocking.plugin.sablier.names=sablier-whoami-1
+      - traefik.http.middlewares.blocking.plugin.sablier.names=sablier_whoami_1
       - traefik.http.middlewares.blocking.plugin.sablier.sablierUrl=http://sablier:10000
       - traefik.http.middlewares.blocking.plugin.sablier.sessionDuration=1m
       - traefik.http.middlewares.blocking.plugin.sablier.blocking.timeout=30s

plugins/traefik/README.md

@@ -27,23 +27,24 @@ http:
   middlewares:
     my-sablier:
       plugin:
-        sablierUrl: http://sablier:10000  # The sablier URL service, must be reachable from the Traefik instance
-        names: whoami,nginx               # Comma separated names of containers/services/deployments etc.
-        sessionDuration: 1m               # The session duration after which containers/services/deployments instances are shutdown
-        # You can only use one strategy at a time
-        # To do so, only declare `dynamic` or `blocking`
+        sablier:
+          sablierUrl: http://sablier:10000  # The sablier URL service, must be reachable from the Traefik instance
+          names: whoami,nginx               # Comma separated names of containers/services/deployments etc.
+          sessionDuration: 1m               # The session duration after which containers/services/deployments instances are shutdown
+          # You can only use one strategy at a time
+          # To do so, only declare `dynamic` or `blocking`
 
-        # Dynamic strategy, provides the waiting webui
-        dynamic:
-          displayName: My Title       # (Optional) Defaults to the middleware name
-          showDetails: true           # (Optional) Set to true or false to show details specifcally for this middleware, unset to use Sablier server defaults
-          theme: hacker-terminal      # (Optional) The theme to use
-          refreshFrequency: 5s        # (Optional) The loading page refresh frequency
+          # Dynamic strategy, provides the waiting webui
+          dynamic:
+            displayName: My Title       # (Optional) Defaults to the middleware name
+            showDetails: true           # (Optional) Set to true or false to show details specifcally for this middleware, unset to use Sablier server defaults
+            theme: hacker-terminal      # (Optional) The theme to use
+            refreshFrequency: 5s        # (Optional) The loading page refresh frequency
 
-        # Blocking strategy, waits until services are up and running
-        # but will not wait more than `timeout`
-        # blocking: 
-        #   timeout: 1m
+          # Blocking strategy, waits until services are up and running
+          # but will not wait more than `timeout`
+          # blocking: 
+          #   timeout: 1m
 ```
 
 You can also checkout the End to End tests here: [e2e](./e2e/).
@@ -176,4 +177,4 @@ services:
       - './dynamic-config.yml:/etc/traefik/dynamic-config.yml'
 ```
 
-But I recommend you to use the [`e2e`](./e2e/) folder.
+But I recommend you to use the [`e2e`](./e2e/) folder.

renovate.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "baseBranches": ["beta"]
+}