Update variables

Author: tiredofit

README.md

@@ -116,7 +116,17 @@ Below is the complete list of available options that can be used to customize yo
 | `ALLOW_ENCRYPTION`   | Allow encrypted rooms and events                                 | `true`                 |          |
 | `ALLOW_ROOM_CREATION` | Allow standard users to create rooms                            | `true`                 |          |
 
-Any `CONTINUWUITY_*` environment variable is passed directly into the TOML config. Use `__` as a section separator. Examples:
+All configuration is generated from environment variables prefixed with `CONTINUWUITY_*`. Each variable maps directly to a TOML config key. Use `__` (double underscore) for section nesting.
+
+Three ways to set any config value (listed in precedence order):
+
+| Method | Example | Description |
+|--------|---------|-------------|
+| `CONTINUWUITY_*` | `CONTINUWUITY_OAUTH__OIDC__CLIENT_SECRET=xxx` | Full prefix — always takes priority |
+| Short section alias | `OAUTH__OIDC__CLIENT_SECRET=xxx` | Same as above, without the prefix. Any var containing `__` is auto-mapped |
+| Short name alias | `OIDC_CLIENT_SECRET=xxx` | Convenience alias for common vars (see table below) |
+
+**TOML section mapping examples:**
 
 | Example Variable | Generated TOML |
 |---|---|
@@ -126,14 +136,28 @@ Any `CONTINUWUITY_*` environment variable is passed directly into the TOML confi
 
 The `well_known` and `proxy` sections are automatically mapped under `[global]`.
 
+##### OIDC / Well-Known Short Name Aliases
+
+| Short Name | Maps to TOML |
+|---|---|
+| `OIDC_CLIENT_SECRET` | `[oauth.oidc]` → `client_secret` |
+| `OIDC_DISCOVERY_URL` | `[oauth.oidc]` → `discovery_url` |
+| `OIDC_CLIENT_ID` | `[oauth.oidc]` → `client_id` |
+| `OIDC_ADDITIONAL_SCOPES` | `[oauth.oidc]` → `additional_scopes` |
+| `OIDC_PROMPT_FOR_LOCALPART` | `[oauth.oidc]` → `prompt_for_localpart` |
+| `OIDC_AUTOLOGIN` | `[oauth.oidc]` → `autologin` |
+| `OIDC_PREFERRED_USERNAME_CLAIM` | `[oauth.oidc]` → `preferred_username_claim` |
+| `WELL_KNOWN_CLIENT` | `[global.well_known]` → `client` |
+| `WELL_KNOWN_SERVER` | `[global.well_known]` → `server` |
+
 #### Log Configuration
 
-| Parameter   | Description                                                  | Default                 | Advanced |
-| ----------- | ------------------------------------------------------------ | ----------------------- | -------- |
-| `LOG_TYPE`  | Log output type `console` `file` `both` `none`               | `both`                  |          |
-| `LOG_LEVEL` | Log level (`trace`, `debug`, `info`, `warn`, `error`, `off`) | `info`                  |          |
-| `LOG_PATH`  | Logfiles path                                                | `/logs/continuwuity/`   |          |
-| `LOG_FILE`  | Logfile name                                                 | `continuwuity.log`      |          |
+| Parameter   | Description                                                  | Default                 | Advanced | TOML Key |
+| ----------- | ------------------------------------------------------------ | ----------------------- | -------- | -------- |
+| `LOG_TYPE`  | Log output type `console` `file` `both` `none`               | `both`                  |          | — |
+| `LOG_LEVEL` | Log level (`trace`, `debug`, `info`, `warn`, `error`, `off`) | `info`                  |          | `log` |
+| `LOG_PATH`  | Logfiles path                                                | `/logs/continuwuity/`   |          | — |
+| `LOG_FILE`  | Logfile name                                                 | `continuwuity.log`      |          | — |
 
 ## Users and Groups
 

rootfs/container/defaults/20-continuwuity

@@ -5,6 +5,13 @@
 
 SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
 
+
+CONFIG_PATH=${CONFIG_PATH:-"/config/"}
+CONFIG_FILE=${CONFIG_FILE:-"conduwuit.toml"}
+LOG_TYPE=${LOG_TYPE:-"both"}
+LOG_PATH=${LOG_PATH:-"/logs/continuwuity/"}
+LOG_FILE=${LOG_FILE:-"continuwuity.log"}
+
 CONTINUWUITY_SERVER_NAME=${CONTINUWUITY_SERVER_NAME:-${SERVER_NAME:-}}
 CONTINUWUITY_DATABASE_PATH=${CONTINUWUITY_DATABASE_PATH:-${DATA_PATH:-"/data/"}}
 CONTINUWUITY_PORT=${CONTINUWUITY_PORT:-${LISTEN_PORT:-"8008"}}
@@ -14,14 +21,21 @@ CONTINUWUITY_ALLOW_REGISTRATION=${CONTINUWUITY_ALLOW_REGISTRATION:-${ALLOW_REGIS
 CONTINUWUITY_ALLOW_FEDERATION=${CONTINUWUITY_ALLOW_FEDERATION:-${ALLOW_FEDERATION:-"true"}}
 CONTINUWUITY_ALLOW_ENCRYPTION=${CONTINUWUITY_ALLOW_ENCRYPTION:-${ALLOW_ENCRYPTION:-"true"}}
 CONTINUWUITY_ALLOW_ROOM_CREATION=${CONTINUWUITY_ALLOW_ROOM_CREATION:-${ALLOW_ROOM_CREATION:-"true"}}
+CONTINUWUITY_NEW_USER_DISPLAYNAME_SUFFIX=${CONTINUWUITY_NEW_USER_DISPLAYNAME_SUFFIX:-"${NEW_USER_DISPLAY_NAME_SUFFIX:-""}"}
+CONTINUWUITY_OAUTH__OIDC__CLIENT_SECRET=${CONTINUWUITY_OAUTH__OIDC__CLIENT_SECRET:-${OIDC_CLIENT_SECRET:-}}
+CONTINUWUITY_OAUTH__OIDC__DISCOVERY_URL=${CONTINUWUITY_OAUTH__OIDC__DISCOVERY_URL:-${OIDC_DISCOVERY_URL:-}}
+CONTINUWUITY_OAUTH__OIDC__CLIENT_ID=${CONTINUWUITY_OAUTH__OIDC__CLIENT_ID:-${OIDC_CLIENT_ID:-}}
+CONTINUWUITY_OAUTH__OIDC__ADDITIONAL_SCOPES=${CONTINUWUITY_OAUTH__OIDC__ADDITIONAL_SCOPES:-${OIDC_ADDITIONAL_SCOPES:-}}
+CONTINUWUITY_OAUTH__OIDC__PROMPT_FOR_LOCALPART=${CONTINUWUITY_OAUTH__OIDC__PROMPT_FOR_LOCALPART:-${OIDC_PROMPT_FOR_LOCALPART:-}}
+CONTINUWUITY_OAUTH__OIDC__AUTOLOGIN=${CONTINUWUITY_OAUTH__OIDC__AUTOLOGIN:-${OIDC_AUTOLOGIN:-}}
+CONTINUWUITY_OAUTH__OIDC__PREFERRED_USERNAME_CLAIM=${CONTINUWUITY_OAUTH__OIDC__PREFERRED_USERNAME_CLAIM:-${OIDC_PREFERRED_USERNAME_CLAIM:-}}
+CONTINUWUITY_WELL_KNOWN__CLIENT=${CONTINUWUITY_WELL_KNOWN__CLIENT:-${WELL_KNOWN_CLIENT:-}}
+CONTINUWUITY_WELL_KNOWN__SERVER=${CONTINUWUITY_WELL_KNOWN__SERVER:-${WELL_KNOWN_SERVER:-}}
 
-# not mapped to CONTINUWUITY_* — used by scripts, not TOML
-CONFIG_PATH=${CONFIG_PATH:-"/config/"}
-CONFIG_FILE=${CONFIG_FILE:-"conduwuit.toml"}
-LOG_TYPE=${LOG_TYPE:-"both"}
-LOG_PATH=${LOG_PATH:-"/logs/continuwuity/"}
-LOG_FILE=${LOG_FILE:-"continuwuity.log"}
+# Auto-map vars with __ to TOML sections - OAUTH__OIDC__* directly
+for var in $(env | sed 's/=.*//' | grep '^[A-Z]' | grep -v '^CONTINUWUITY_' | grep -F '__'); do
+    eval "CONTINUWUITY_${var}=\${CONTINUWUITY_${var}:-\${${var}}}"
+done
 
-CONTINUWUITY_NEW_USER_DISPLAYNAME_SUFFIX=${CONTINUWUITY_NEW_USER_DISPLAYNAME_SUFFIX:-""}
 
 get_defaults_advanced