※ Other environment variables
@@ -456,7 +382,107 @@ Default: `${DATA_DIR}/sends` -## Using `.env` file +## Notification + +### Mail + +Starting from v1.19.0, we will be using [`s-nail`](https://www.sdaoden.eu/code-nail.html) instead of [`heirloom-mailx`](https://www.systutorials.com/docs/linux/man/1-heirloom-mailx/) to send emails. + +Please note that `heirloom-mailx` is a stub for `s-nail`, and most of its functionality is compatible. Therefore, you may not need to modify any environment variables for this change. + +| Environment Variable | Default Value | Description | +| --- | --- |-------------------------------------------------------| +| MAIL_SMTP_ENABLE | `FALSE` | Enable sending mail. | +| MAIL_SMTP_VARIABLES | | Mail sending options. | +| MAIL_TO | | The recipient of the notification email. | +| MAIL_WHEN_SUCCESS | `TRUE` | Send an email when the backup completes successfully. | +| MAIL_WHEN_FAILURE | `TRUE` | Send an email if the backup fails. | + +For `MAIL_SMTP_VARIABLES`, you need to configure the mail sending options yourself. **We will set the email subject based on the usage scenario, so you should not use the `-s` flag.** + +```text +# My example: + +# For Zoho +-S smtp-use-starttls \ +-S smtp=smtp://smtp.zoho.com:587 \ +-S smtp-auth=login \ +-S smtp-auth-user=+ + + +### Mail Test + +You can use the following command to test mail sending. We will add the `-v` flag to display detailed information, so you do not need to set it again in `MAIL_SMTP_VARIABLES`. + +```shell +docker run --rm -it -e MAIL_SMTP_VARIABLES='
+ + + +### Ping + +We provide functionality to send notifications when the backup is completed, started, successful, or failed. + +**Using a [healthcheck.io](https://healthchecks.io/) address or other similar cron monitoring addresses is a good choice, and it is also recommended.** For more complex notification scenarios, you can use environment variables with the `_CURL_OPTIONS` suffix to set curl options. For example, you can add request headers, change the request method, etc. + +For different notification scenarios, **the backup tool provides `%{subject}` and `%{content}` placeholders to replace the actual title and content**. You can use them in the following environment variables. Note that the title and content may contain spaces. For the four environment variables containing `_CURL_OPTIONS`, the placeholders will be directly replaced, retaining spaces. For other `PING_URL` environment variables, spaces will be replaced with `+` to comply with URL rules. + +| Environment Variable | Trigger Status | Test Identifier | Description | +|------------------------------------|-------------|--------------|----------------------------------------------------------------------| +| PING_URL | completion (success or failure) | `completion` | The URL to which the request is sent after the backup is completed. | +| PING_URL_CURL_OPTIONS | | | Curl options used with `PING_URL` | +| PING_URL_WHEN_START | start | `start` | The URL to which the request is sent when the backup starts. | +| PING_URL_WHEN_START_CURL_OPTIONS | | | Curl options used with `PING_URL_WHEN_START` | +| PING_URL_WHEN_SUCCESS | success | `success` | The URL to which the request is sent after the backup is successful. | +| PING_URL_WHEN_SUCCESS_CURL_OPTIONS | | | Curl options used with `PING_URL_WHEN_SUCCESS` | +| PING_URL_WHEN_FAILURE | failure | `failure` | The URL to which the request is sent after the backup fails. | +| PING_URL_WHEN_FAILURE_CURL_OPTIONS | | | Curl options used with `PING_URL_WHEN_FAILURE` | + +
+ + + +### Ping Test + +You can use the following command to test the Ping sending. + +The "test identifier" is the identifier in the table in the [previous section](#ping). You can use `completion`, `start`, `success`, or `failure`, which determines which set of environment variables to use. + +```shell +docker run --rm -it \ + -e PING_URL='
+ + + +## Environment Variables Considerations + +### Using `.env` file If you prefer using an env file instead of environment variables, you can map the env file containing the environment variables to the `/.env` file in the container. @@ -466,13 +492,15 @@ docker run -d \ ttionya/vaultwarden-backup:latest ``` +**Please do not use the `--env-file` flag directly**; make sure to map the environment variables by mounting the file. The `--env-file` flag incorrectly handles quotes, which can lead to unexpected situations. For more information, please see [docker/cli#3630](https://github.com/docker/cli/issues/3630). +
-## Docker Secrets +### Docker Secrets -As an alternative to passing sensitive information via environment variables, `_FILE` may be appended to the previously listed environment variables. This causes the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in `/run/secrets/
+1. Directly read the value of the environment variable +2. Read the content of the file pointed to by the environment variable ending in `_FILE` +3. Read the content of the file pointed to by the environment variable ending in `_FILE` in the `.env` file +4. Read the value of the environment variable in the `.env` file +Example: +```txt +# For 1 +MY_ENV="example1" -## Mail Test +# For 2 +MY_ENV_FILE="/path/to/example2" -You can use the following command to test mail sending. Remember to replace your SMTP variables. +# For 3 (.env file) +MY_ENV_FILE: "/path/to/example3" -```shell -docker run --rm -it -e MAIL_SMTP_VARIABLES='
@@ -510,11 +543,17 @@ docker run --rm -it -e MAIL_SMTP_VARIABLES='
@@ -544,7 +583,7 @@ Check out the [CHANGELOG](CHANGELOG.md) file. I am grateful for the OSS license provided by [JetBrains](https://www.jetbrains.com/). -
+
diff --git a/README_zh.md b/README_zh.md index 8ff7a40..ea0a5ee 100644 --- a/README_zh.md +++ b/README_zh.md @@ -14,20 +14,6 @@ -## 重命名 - -**用 Rust 编写的非官方 Bitwarden 服务器，以前称为 `bitwarden_rs`，现在已经改名为 `vaultwarden`。** - -所以这个备份工具迁移到了 [ttionya/vaultwarden-backup](https://github.com/ttionya/vaultwarden-backup) 。 - -旧的镜像仍然可以使用，只是 **DEPRECATED** 了。建议迁移到新的镜像 [ttionya/vaultwarden-backup](https://hub.docker.com/r/ttionya/vaultwarden-backup) 。 - -**请在[这里](#迁移)查看如何迁移**。 - -
- - - ## 功能 本工具会备份以下文件或目录。 @@ -326,68 +312,6 @@ Rclone 全局参数，详见 [flags](https://rclone.org/flags/)。 默认值：`UTC` -#### PING_URL - -使用 [healthcheck.io](https://healthchecks.io/) 地址或者其他类似的 cron 监控，以便在备份**完成（不论成功或失败）**后执行 `GET` 请求。 - -#### PING_URL_WHEN_START - -使用 [healthcheck.io](https://healthchecks.io/) 地址或者其他类似的 cron 监控，以便在备份**开始**前执行 `GET` 请求。 - -#### PING_URL_WHEN_SUCCESS - -使用 [healthcheck.io](https://healthchecks.io/) 地址或者其他类似的 cron 监控，以便在备份**成功**后执行 `GET` 请求。 - -#### PING_URL_WHEN_FAILURE - -使用 [healthcheck.io](https://healthchecks.io/) 地址或者其他类似的 cron 监控，以便在备份**失败**后执行 `GET` 请求。 - -#### MAIL_SMTP_ENABLE - -从 v1.19.0 开始，本工具使用 [`s-nail`](https://www.sdaoden.eu/code-nail.html) 代替 [`heirloom-mailx`](https://www.systutorials.com/docs/linux/man/1-heirloom-mailx/) 发送邮件。 - -请注意，`heirloom-mailx` 是 `s-nail` 的基础，它们大部分功能是兼容的。因此你可能不需要为这个改变修改任何环境变量。 - -默认值：`FALSE` - -#### MAIL_SMTP_VARIABLES - -因为发送邮件的配置太复杂，请自己配置邮件发送参数。 - -**我们会根据使用场景设置邮件主题，所以你不应该使用 `-s` 选项。** - -测试期间，我们将增加 `-v` 选项来显示详细信息。 - -```text -# 提供一个能正常使用的例子： - -# For Zoho --S smtp-use-starttls \ --S smtp=smtp://smtp.zoho.com:587 \ --S smtp-auth=login \ --S smtp-auth-user=
※ 其他环境变量
@@ -453,7 +379,107 @@ Default: `%Y%m%d` -## Use `.env` file +## 通知 + +### Mail + +从 v1.19.0 开始，本工具使用 [`s-nail`](https://www.sdaoden.eu/code-nail.html) 代替 [`heirloom-mailx`](https://www.systutorials.com/docs/linux/man/1-heirloom-mailx/) 发送邮件。 + +请注意，`heirloom-mailx` 是 `s-nail` 的存根，它们大部分功能是兼容的。因此你可能不需要为这个改变修改任何环境变量。 + +| 环境变量 | 默认值 | 描述 | +| --- |--------|-----------| +| MAIL_SMTP_ENABLE | `FALSE` | 启用邮件发送功能 | +| MAIL_SMTP_VARIABLES | | 邮件发送参数 | +| MAIL_TO | | 接收邮件的地址 | +| MAIL_WHEN_SUCCESS | `TRUE` | 备份成功后发送邮件 | +| MAIL_WHEN_FAILURE | `TRUE` | 备份失败后发送邮件 | + +对于 `MAIL_SMTP_VARIABLES`，你需要自行配置邮件发送参数。**我们会根据使用场景设置邮件主题，所以你不应该使用 `-s` 标志。** + +```text +# 提供一个能正常使用的例子： + +# For Zoho +-S smtp-use-starttls \ +-S smtp=smtp://smtp.zoho.com:587 \ +-S smtp-auth=login \ +-S smtp-auth-user=+ + + +### 邮件发送测试 + +你可以使用下面的命令测试邮件发送功能。我们会增加 `-v` 标志以显示详细信息，你无需在 `MAIL_SMTP_VARIABLES` 中重复设置。 + +```shell +docker run --rm -it -e MAIL_SMTP_VARIABLES='
+ + + +### Ping + +我们提供了在备份完成、开始、成功、失败时发送通知的功能。 + +**搭配 [healthcheck.io](https://healthchecks.io/) 地址或者其他类似的 cron 监控地址是一个不错的选择，这也是我们推荐的。** 对于一些更复杂的通知场景，你可以使用 `_CURL_OPTIONS` 后缀的环境变量来设置 curl 选项。比如你可以添加请求头，改变请求方法等。 + +对于不同的通知场景，**备份工具提供了 `%{subject}` 和 `%{content}` 占位符用于替换实际的标题和内容**，你可以在以下环境变量中随意使用它们。请注意，标题和内容可能包含空格。对于包含 `_CURL_OPTIONS` 的四个环境变量，将直接替换占位符，保留空格。对于其他 `PING_URL` 环境变量，空格将被替换为 `+`，以符合 URL 规则。 + +| 环境变量 | 触发状态 | 测试标识 | 描述 | +|------------------------------------|-------------|--------------|-----------------------------------------| +| PING_URL | 完成（不论成功或失败） | `completion` | 备份完成后发送请求的地址 | +| PING_URL_CURL_OPTIONS | | | 与 `PING_URL` 搭配使用的 curl 选项 | +| PING_URL_WHEN_START | 开始 | `start` | 备份开始时发送请求的地址 | +| PING_URL_WHEN_START_CURL_OPTIONS | | | 与 `PING_URL_WHEN_START` 搭配使用的 curl 选项 | +| PING_URL_WHEN_SUCCESS | 成功 | `success` | 备份成功后发送请求的地址 | +| PING_URL_WHEN_SUCCESS_CURL_OPTIONS | | | 与 `PING_URL_WHEN_SUCCESS` 搭配使用的 curl 选项 | +| PING_URL_WHEN_FAILURE | 失败 | `failure` | 备份失败后发送请求的地址 | +| PING_URL_WHEN_FAILURE_CURL_OPTIONS | | | 与 `PING_URL_WHEN_FAILURE` 搭配使用的 curl 选项 | + +
+ + + +### Ping 发送测试 + +你可以使用下面的命令测试 Ping 发送功能。 + +“test identifier”是[上一节](#ping)表格中的测试标识，你可以使用 `completion`、`start`、`success` 或 `failure`，它决定了使用哪一组环境变量。 + +```shell +docker run --rm -it \ + -e PING_URL='
+ + + +## 环境变量注意事项 + +### 使用 `.env` 文件 如果你喜欢使用 env 文件而不是环境变量，可以将包含环境变量的 env 文件映射到容器中的 `/.env` 文件。 @@ -463,13 +489,15 @@ docker run -d \ ttionya/vaultwarden-backup:latest ``` +请不要直接使用 `--env-file` 标志，务必通过挂载文件的方式映射环境变量。`--env-file` 标志会错误地处理引号，导致发生意外情况。更多信息请参见 [docker/cli#3630](https://github.com/docker/cli/issues/3630)。 +
-## Docker Secrets +### Docker Secrets -作为通过环境变量传递敏感信息的替代方法，`_FILE` 可以追加到前面列出的环境变量后面，使初始化脚本从容器中存在的文件加载这些变量的值。特别是这可以用来从存储在 `/run/secrets/
+1. 直接读取环境变量的值 +2. 读取以 `_FILE` 结尾的环境变量指向的文件的内容 +3. 读取 `.env` 文件中以 `_FILE` 结尾的环境变量指向的文件的内容 +4. 读取 `.env` 文件中环境变量的值 +示例： +```txt +# 对于 1 +MY_ENV="example1" -## 邮件发送测试 +# 对于 2 +MY_ENV_FILE="/path/to/example2" -你可以使用下面的命令来测试邮件的发送。记得替换你的 SMTP 变量。 +# 对于 3 (.env 文件) +MY_ENV_FILE: "/path/to/example3" -```shell -docker run --rm -it -e MAIL_SMTP_VARIABLES='
@@ -507,11 +540,17 @@ docker run --rm -it -e MAIL_SMTP_VARIABLES='
@@ -541,7 +580,7 @@ docker run --rm -it -e MAIL_SMTP_VARIABLES='
+
diff --git a/docker-compose.yml b/docker-compose.yml index 274bbfa..0e79356 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,9 +27,13 @@ services: # BACKUP_FILE_SUFFIX: '%Y%m%d' # BACKUP_KEEP_DAYS: 0 # PING_URL: '' + # PING_URL_CURL_OPTIONS: '' # PING_URL_WHEN_START: '' + # PING_URL_WHEN_START_CURL_OPTIONS: '' # PING_URL_WHEN_SUCCESS: '' + # PING_URL_WHEN_SUCCESS_CURL_OPTIONS: '' # PING_URL_WHEN_FAILURE: '' + # PING_URL_WHEN_FAILURE_CURL_OPTIONS: '' # MAIL_SMTP_ENABLE: 'FALSE' # MAIL_SMTP_VARIABLES: '' # MAIL_TO: '' diff --git a/scripts/backup.sh b/scripts/backup.sh index 6a4a774..18f7ae6 100644 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -43,9 +43,7 @@ function backup_db_postgresql() { if [[ $? != 0 ]]; then color red "backup vaultwarden postgresql database failed" - send_ping "${PING_URL_WHEN_FAILURE}" "failure" - send_ping "${PING_URL}" "completion" - send_mail_content "FALSE" "Backup failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Backup postgresql database failed." + send_notification "failure" "Backup failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Backup postgresql database failed." exit 1 fi @@ -58,9 +56,7 @@ function backup_db_mysql() { if [[ $? != 0 ]]; then color red "backup vaultwarden mysql database failed" - send_ping "${PING_URL_WHEN_FAILURE}" "failure" - send_ping "${PING_URL}" "completion" - send_mail_content "FALSE" "Backup failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Backup mysql database failed." + send_notification "failure" "Backup failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Backup mysql database failed." exit 1 fi @@ -167,9 +163,7 @@ function upload() { if [[ ! -e "${UPLOAD_FILE}" ]]; then color red "upload file not found" - send_ping "${PING_URL_WHEN_FAILURE}" "failure" - send_ping "${PING_URL}" "completion" - send_mail_content "FALSE" "File upload failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Upload file not found." + send_notification "failure" "File upload failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Upload file not found." exit 1 fi @@ -190,9 +184,7 @@ function upload() { done if [[ "${HAS_ERROR}" == "TRUE" ]]; then - send_ping "${PING_URL_WHEN_FAILURE}" "failure" - send_ping "${PING_URL}" "completion" - send_mail_content "FALSE" "File upload failed at $(date +"%Y-%m-%d %H:%M:%S %Z")." + send_notification "failure" "File upload failed at $(date +"%Y-%m-%d %H:%M:%S %Z")." exit 1 fi @@ -223,7 +215,7 @@ color blue "running the backup program at $(date +"%Y-%m-%d %H:%M:%S %Z")" init_env -send_ping "${PING_URL_WHEN_START}" "start" +send_notification "start" "Start backup at $(date +"%Y-%m-%d %H:%M:%S %Z")" check_rclone_connection @@ -235,8 +227,6 @@ upload clear_dir clear_history -send_mail_content "TRUE" "The file was successfully uploaded at $(date +"%Y-%m-%d %H:%M:%S %Z")." -send_ping "${PING_URL}" "completion" -send_ping "${PING_URL_WHEN_SUCCESS}" "success" +send_notification "success" "The file was successfully uploaded at $(date +"%Y-%m-%d %H:%M:%S %Z")." color none "" diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 67047e2..e755e13 100644 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -21,7 +21,19 @@ if [[ "$1" == "mail" ]]; then MAIL_TO="$2" fi - send_mail "vaultwarden Backup Test" "Your SMTP looks configured correctly." + send_mail "vaultwarden Backup Test" "Your SMTP configuration looks correct." + + exit 0 +fi + +# ping test +if [[ "$1" == "ping" ]]; then + export_env_file + init_env_ping + + PING_DEBUG="TRUE" + + send_ping "$2" "vaultwarden Backup Test" "Your PING configuration looks correct." exit 0 fi diff --git a/scripts/includes.sh b/scripts/includes.sh index 3074eb4..de0d168 100644 --- a/scripts/includes.sh +++ b/scripts/includes.sh @@ -103,44 +103,84 @@ function send_mail() { } ######################################## -# Send mail. +# Send health check or notification ping. # Arguments: -# backup successful -# mail content +# ping status (completion / start / success / failure) +# ping subject +# ping content +# Outputs: +# send ping result ######################################## -function send_mail_content() { - if [[ "${MAIL_SMTP_ENABLE}" == "FALSE" ]]; then +function send_ping() { + local CURL_URL="" + local CURL_OPTIONS="" + + case "$1" in + completion) CURL_URL="${PING_URL}" CURL_OPTIONS="${PING_URL_CURL_OPTIONS}" ;; + start) CURL_URL="${PING_URL_WHEN_START}" CURL_OPTIONS="${PING_URL_WHEN_START_CURL_OPTIONS}" ;; + success) CURL_URL="${PING_URL_WHEN_SUCCESS}" CURL_OPTIONS="${PING_URL_WHEN_SUCCESS_CURL_OPTIONS}" ;; + failure) CURL_URL="${PING_URL_WHEN_FAILURE}" CURL_OPTIONS="${PING_URL_WHEN_FAILURE_CURL_OPTIONS}" ;; + *) color red "illegal identifier, only supports completion, start, success, failure" ;; + esac + + if [[ -z "${CURL_URL}" ]]; then return fi - # successful - if [[ "$1" == "TRUE" && "${MAIL_WHEN_SUCCESS}" == "TRUE" ]]; then - send_mail "vaultwarden Backup Success" "$2" + CURL_URL=$(echo "${CURL_URL}" | sed "s/%{subject}/$(echo "$2" | tr ' ' '+')/g") + CURL_URL=$(echo "${CURL_URL}" | sed "s/%{content}/$(echo "$3" | tr ' ' '+')/g") + CURL_OPTIONS=$(echo "${CURL_OPTIONS}" | sed "s/%{subject}/$2/g") + CURL_OPTIONS=$(echo "${CURL_OPTIONS}" | sed "s/%{content}/$3/g") + + local CURL_COMMAND="curl -m 15 --retry 10 --retry-delay 1 -o /dev/null -s${CURL_OPTIONS:+" ${CURL_OPTIONS}"} \"${CURL_URL}\"" + + if [[ "${PING_DEBUG}" == "TRUE" ]]; then + color yellow "curl command: ${CURL_COMMAND}" fi - # failed - if [[ "$1" == "FALSE" && "${MAIL_WHEN_FAILURE}" == "TRUE" ]]; then - send_mail "vaultwarden Backup Failed" "$2" + eval "${CURL_COMMAND}" + if [[ $? != 0 ]]; then + color red "$1 ping sending has failed" + else + color blue "$1 ping has been sent successfully" fi } ######################################## -# Send health check ping. +# Send notification. # Arguments: -# url -# ping name +# status (start / success / failure) +# notification content ######################################## -function send_ping() { - if [[ -z "$1" ]]; then - return - fi - - wget "$1" -T 15 -t 10 -O /dev/null -q - if [[ $? != 0 ]]; then - color red "$2 ping sending has failed" - else - color blue "$2 ping has been sent successfully" - fi +function send_notification() { + local SUBJECT_START="vaultwarden Backup Start" + local SUBJECT_SUCCESS="vaultwarden Backup Success" + local SUBJECT_FAILURE="vaultwarden Backup Failed" + + case "$1" in + start) + # ping + send_ping "start" "${SUBJECT_START}" "$2" + ;; + success) + # mail + if [[ "${MAIL_SMTP_ENABLE}" == "TRUE" && "${MAIL_WHEN_SUCCESS}" == "TRUE" ]]; then + send_mail "${SUBJECT_SUCCESS}" "$2" + fi + # ping + send_ping "success" "${SUBJECT_SUCCESS}" "$2" + send_ping "completion" "${SUBJECT_SUCCESS}" "$2" + ;; + failure) + # mail + if [[ "${MAIL_SMTP_ENABLE}" == "TRUE" && "${MAIL_WHEN_FAILURE}" == "TRUE" ]]; then + send_mail "${SUBJECT_FAILURE}" "$2" + fi + # ping + send_ping "failure" "${SUBJECT_FAILURE}" "$2" + send_ping "completion" "${SUBJECT_FAILURE}" "$2" + ;; + esac } ######################################## @@ -345,16 +385,16 @@ function init_env() { color yellow "BACKUP_FILE_DATE_FORMAT: ${BACKUP_FILE_DATE_FORMAT} (example \"[filename].$(date +"${BACKUP_FILE_DATE_FORMAT}").[ext]\")" color yellow "BACKUP_KEEP_DAYS: ${BACKUP_KEEP_DAYS}" if [[ -n "${PING_URL}" ]]; then - color yellow "PING_URL: ${PING_URL}" + color yellow "PING_URL: curl${PING_URL_CURL_OPTIONS:+" ${PING_URL_CURL_OPTIONS}"} \"${PING_URL}\"" fi if [[ -n "${PING_URL_WHEN_START}" ]]; then - color yellow "PING_URL_WHEN_START: ${PING_URL_WHEN_START}" + color yellow "PING_URL_WHEN_START: curl${PING_URL_WHEN_START_CURL_OPTIONS:+" ${PING_URL_WHEN_START_CURL_OPTIONS}"} \"${PING_URL_WHEN_START}\"" fi if [[ -n "${PING_URL_WHEN_SUCCESS}" ]]; then - color yellow "PING_URL_WHEN_SUCCESS: ${PING_URL_WHEN_SUCCESS}" + color yellow "PING_URL_WHEN_SUCCESS: curl${PING_URL_WHEN_SUCCESS_CURL_OPTIONS:+" ${PING_URL_WHEN_SUCCESS_CURL_OPTIONS}"} \"${PING_URL_WHEN_SUCCESS}\"" fi if [[ -n "${PING_URL_WHEN_FAILURE}" ]]; then - color yellow "PING_URL_WHEN_FAILURE: ${PING_URL_WHEN_FAILURE}" + color yellow "PING_URL_WHEN_FAILURE: curl${PING_URL_WHEN_FAILURE_CURL_OPTIONS:+" ${PING_URL_WHEN_FAILURE_CURL_OPTIONS}"} \"${PING_URL_WHEN_FAILURE}\"" fi color yellow "MAIL_SMTP_ENABLE: ${MAIL_SMTP_ENABLE}" if [[ "${MAIL_SMTP_ENABLE}" == "TRUE" ]]; then @@ -452,17 +492,33 @@ function init_env_ping() { get_env PING_URL PING_URL="${PING_URL:-""}" + # PING_URL_CURL_OPTIONS + get_env PING_URL_CURL_OPTIONS + PING_URL_CURL_OPTIONS="${PING_URL_CURL_OPTIONS:-""}" + # PING_URL_WHEN_START get_env PING_URL_WHEN_START PING_URL_WHEN_START="${PING_URL_WHEN_START:-""}" + # PING_URL_WHEN_START_CURL_OPTIONS + get_env PING_URL_WHEN_START_CURL_OPTIONS + PING_URL_WHEN_START_CURL_OPTIONS="${PING_URL_WHEN_START_CURL_OPTIONS:-""}" + # PING_URL_WHEN_SUCCESS get_env PING_URL_WHEN_SUCCESS PING_URL_WHEN_SUCCESS="${PING_URL_WHEN_SUCCESS:-""}" + # PING_URL_WHEN_SUCCESS_CURL_OPTIONS + get_env PING_URL_WHEN_SUCCESS_CURL_OPTIONS + PING_URL_WHEN_SUCCESS_CURL_OPTIONS="${PING_URL_WHEN_SUCCESS_CURL_OPTIONS:-""}" + # PING_URL_WHEN_FAILURE get_env PING_URL_WHEN_FAILURE PING_URL_WHEN_FAILURE="${PING_URL_WHEN_FAILURE:-""}" + + # PING_URL_WHEN_FAILURE_CURL_OPTIONS + get_env PING_URL_WHEN_FAILURE_CURL_OPTIONS + PING_URL_WHEN_FAILURE_CURL_OPTIONS="${PING_URL_WHEN_FAILURE_CURL_OPTIONS:-""}" } function init_env_mail() { diff --git a/version b/version index c858d1e..c78223f 100644 --- a/version +++ b/version @@ -1 +1 @@ -v1.20.0 +v1.21.0-beta.0