From 0026d53da6467c71c9d8edb83707eae2aaf95979 Mon Sep 17 00:00:00 2001
From: HPCesia <me@hpcesia.com>
Date: Sun, 17 Nov 2024 17:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/authelia/4.38.17-lite/data.yml           |  17 ++++++++
 .../4.38.17-lite/data/configuration.yml       |   0
 .../4.38.17-lite/data/users_database.yml      |   0
 .../authelia}/4.38.17-lite/docker-compose.yml |   7 ++--
 apps/authelia/README.md                       |   9 +++++
 {authelia => apps/authelia}/data.yml          |   0
 {authelia => apps/authelia}/logo.png          | Bin
 authelia/4.38.17-lite/data.yml                |  38 ------------------
 authelia/README.md                            |   6 ---
 9 files changed, 30 insertions(+), 47 deletions(-)
 create mode 100644 apps/authelia/4.38.17-lite/data.yml
 rename {authelia => apps/authelia}/4.38.17-lite/data/configuration.yml (100%)
 rename {authelia => apps/authelia}/4.38.17-lite/data/users_database.yml (100%)
 rename {authelia => apps/authelia}/4.38.17-lite/docker-compose.yml (55%)
 create mode 100644 apps/authelia/README.md
 rename {authelia => apps/authelia}/data.yml (100%)
 rename {authelia => apps/authelia}/logo.png (100%)
 delete mode 100644 authelia/4.38.17-lite/data.yml
 delete mode 100644 authelia/README.md

diff --git a/apps/authelia/4.38.17-lite/data.yml b/apps/authelia/4.38.17-lite/data.yml
new file mode 100644
index 0000000..7f429a8
--- /dev/null
+++ b/apps/authelia/4.38.17-lite/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: 9091
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: Asia/Shanghai
+      edit: true
+      envKey: TIME_ZONE
+      labelEn: Time zone
+      labelZh: 时区
+      required: true
+      type: text
diff --git a/authelia/4.38.17-lite/data/configuration.yml b/apps/authelia/4.38.17-lite/data/configuration.yml
similarity index 100%
rename from authelia/4.38.17-lite/data/configuration.yml
rename to apps/authelia/4.38.17-lite/data/configuration.yml
diff --git a/authelia/4.38.17-lite/data/users_database.yml b/apps/authelia/4.38.17-lite/data/users_database.yml
similarity index 100%
rename from authelia/4.38.17-lite/data/users_database.yml
rename to apps/authelia/4.38.17-lite/data/users_database.yml
diff --git a/authelia/4.38.17-lite/docker-compose.yml b/apps/authelia/4.38.17-lite/docker-compose.yml
similarity index 55%
rename from authelia/4.38.17-lite/docker-compose.yml
rename to apps/authelia/4.38.17-lite/docker-compose.yml
index e0f5abc..3fc42ed 100644
--- a/authelia/4.38.17-lite/docker-compose.yml
+++ b/apps/authelia/4.38.17-lite/docker-compose.yml
@@ -15,9 +15,10 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=${TIME_ZONE}
-      - AUTHELIA_STORAGE_ENCRYPTION_KEY=${PANEL_STORAGE_ENCRYPTION_KEY}
-      - AUTHELIA_SESSION_SECRET=${PANEL_SESSION_SECRET}
-      - AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=${PANEL_RESET_PWD_SECRET}
+      - AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE=/config/secrets/STORAGE_ENCRYPTION
+      - AUTHELIA_SESSION_SECRET_FILE=/config/secrets/SESSION_SECRET
+      - AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE=/config/secrets/JWT_SECRET
+      - AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET=/config/secrets/HMAC_SECRET
 
 networks:
   1panel-network:
diff --git a/apps/authelia/README.md b/apps/authelia/README.md
new file mode 100644
index 0000000..9a5b2c1
--- /dev/null
+++ b/apps/authelia/README.md
@@ -0,0 +1,9 @@
+## 简介
+Authelia 是一个开源的身份验证和授权服务器，它通过 Web 界面提供应用程序的两因素认证（2FA）和单点登录（SSO）。它作为反向代理的伴侣，能够允许、拒绝或重定向请求。
+
+更多信息请参阅[官方文档](https://www.authelia.com/)。
+
+## 配置
+安装完成后，请到应用目录的 `data` 目录下修改 `configuration.yml` 与 `users_database.yml` 修改配置。
+
+本版本为 `lite` 版本，适用于个人轻量使用环境，不依赖其他任何服务。
\ No newline at end of file
diff --git a/authelia/data.yml b/apps/authelia/data.yml
similarity index 100%
rename from authelia/data.yml
rename to apps/authelia/data.yml
diff --git a/authelia/logo.png b/apps/authelia/logo.png
similarity index 100%
rename from authelia/logo.png
rename to apps/authelia/logo.png
diff --git a/authelia/4.38.17-lite/data.yml b/authelia/4.38.17-lite/data.yml
deleted file mode 100644
index a4d3d21..0000000
--- a/authelia/4.38.17-lite/data.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-additionalProperties:
-  formFields:
-    - default: 9091
-      edit: true
-      envKey: PANEL_APP_PORT_HTTP
-      labelEn: Port
-      labelZh: 端口
-      required: true
-      rule: paramPort
-      type: number
-    - default: a_random_string_with_20_or_more_chars
-      envKey: PANEL_STORAGE_ENCRYPTION_KEY
-      labelEn: Storage encryption key
-      labelZh: 存储加密密钥
-      required: true
-      rule: paramComplexity
-      type: password
-    - default: a_random_alphanumeric_string_with_64_or_more_chars
-      envKey: PANEL_SESSION_SECRET
-      labelEn: Session password
-      labelZh: 会话加密密钥
-      required: true
-      rule: paramComplexity
-      type: password
-    - default: "a_random_alphanumeric_string_with_64_or_more_chars"
-      envKey: PANEL_RESET_PWD_SECRET
-      labelEn: Reset password secret
-      labelZh: 重置密码加密密钥
-      required: true
-      rule: paramComplexity
-      type: password
-    - default: Asia/Shanghai
-      edit: true
-      envKey: TIME_ZONE
-      labelEn: Time zone
-      labelZh: 时区
-      required: true
-      type: text
diff --git a/authelia/README.md b/authelia/README.md
deleted file mode 100644
index 817d665..0000000
--- a/authelia/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## 简介
-Authelia 是一个开源的身份验证和授权服务器，它通过 Web 界面提供应用程序的两因素认证（2FA）和单点登录（SSO）。它作为反向代理的伴侣，能够允许、拒绝或重定向请求。
-
-有关详细信息，请访问 https://www.authelia.com/。
-
-## 配置