Merge pull request #516 from DefGuard/dev

Merge dev into main
DefGuard · Jan 23, 2024 · e568697 · e568697
2 parents 5571834 + 0c15f1c
commit e568697
Show file tree

Hide file tree

Showing 169 changed files with 5,284 additions and 2,538 deletions.
diff --git a/.env b/.env
@@ -11,6 +11,10 @@ DEFGUARD_AUTH_SESSION_LIFETIME=604800
 DEFGUARD_ADMIN_GROUPNAME=admin
 DEFGUARD_DEFAULT_ADMIN_PASSWORD=pass123
 
+### Proxy configuration ###
+# Optional. URL of proxy gRPC server
+# DEFGUARD_PROXY_URL: http://localhost:50051
+
 ### LDAP configuration ###
 DEFGUARD_LDAP_URL=ldap://localhost:389
 DEFGUARD_LDAP_SERVICE_PASSWORD=adminpassword

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ env:
 jobs:
   test:
     runs-on: [self-hosted, Linux]
-    container: rust:1.74
+    container: rust:1.75
 
     services:
       postgres:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   rustdoc:
     runs-on: [self-hosted, Linux]
-    container: rust:1.74
+    container: rust:1.75
     services:
       postgres:
         image: postgres:15-alpine

diff --git a/...c657d3018d01be7e095683a40160d533f410.json → ...fb648b288f49586113cea21d889dca9655b9.json b/...c657d3018d01be7e095683a40160d533f410.json → ...fb648b288f49586113cea21d889dca9655b9.json
diff --git a/...38ceab97af014b51bfa24933e296e803effc.json → ...87a85eb04e2b0eec2d9bc63e8fee6abda27e.json b/...38ceab97af014b51bfa24933e296e803effc.json → ...87a85eb04e2b0eec2d9bc63e8fee6abda27e.json
diff --git a/...8de725cbec807ae286ae5900f426f2492f9d.json → ...861c744c520880d33815044babe0eff1d644.json b/...8de725cbec807ae286ae5900f426f2492f9d.json → ...861c744c520880d33815044babe0eff1d644.json
diff --git a/.sqlx/query-06888dd28b82c3b72612889932adba022ef520a90d23903c84595f0502e86e1d.json b/.sqlx/query-06888dd28b82c3b72612889932adba022ef520a90d23903c84595f0502e86e1d.json
diff --git a/.sqlx/query-06d1ac982dc99c5dae010089cfb73a044397c5cb6bb9654dc5df420bf00d2955.json b/.sqlx/query-06d1ac982dc99c5dae010089cfb73a044397c5cb6bb9654dc5df420bf00d2955.json
diff --git a/...3d7d15049caf771aec6b0fcd42bea7169998.json → ...40442a7ed65c986eef4e79e9d12aeb32edef.json b/...3d7d15049caf771aec6b0fcd42bea7169998.json → ...40442a7ed65c986eef4e79e9d12aeb32edef.json
diff --git a/.sqlx/query-0cf5e325412549a381f4a2309ccbdc9289ef5ce5169c5b8c853e7c4e7dfb1877.json b/.sqlx/query-0cf5e325412549a381f4a2309ccbdc9289ef5ce5169c5b8c853e7c4e7dfb1877.json
diff --git a/.sqlx/query-1a01b8b88444b493abf74b2ec0ad649018244de3c7f23d98bfab71faa1a9fae1.json b/.sqlx/query-1a01b8b88444b493abf74b2ec0ad649018244de3c7f23d98bfab71faa1a9fae1.json