casey/casey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup old config keys

Browse Source
This commit is contained in:
Chris
2025-08-15 02:11:56 +02:00
parent 756131b219
commit ec9e585cfd
2 changed files with 33 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
etc/casey.yaml.dist
View File

@@ -1,6 +1,7 @@
# #
# NOTE: Committing the configuration will remove all these comments. If you want to keep # NOTE: Committing the configuration will remove all these comments. If you want to keep
# this as a reference or something, make sure to keep a copy! # this as a reference or something, make sure to keep a copy! It is recommended that you
# copy this file to casey.yaml, edit it, and then configure casey to use this config.
# #
# - Periods and durations can usually be configured as a number, or as a duration string # - Periods and durations can usually be configured as a number, or as a duration string
# listing the number of d(ays), h(ours), m(inutes) etc; eg. "6h30m" # listing the number of d(ays), h(ours), m(inutes) etc; eg. "6h30m"
@@ -50,6 +51,7 @@ mailInboxConfig:
username: '' username: ''
password: '' password: ''
secure: true secure: true
options: { }
mailOutboxAdapter: spool mailOutboxAdapter: spool
mailOutboxConfig: mailOutboxConfig:
server: 127.0.0.1 server: 127.0.0.1
@@ -57,21 +59,4 @@ mailOutboxConfig:
username: '' username: ''
password: '' password: ''
secure: true secure: true
options: { }
# ///////////////////////////////////////////////////////////////////////////////
# Deprecated options, these move into mailInboxConfig and mailOutboxConfig above
smtpAdapter: spool
smtpServer: 127.0.0.1
smtpOptions: { }
smtpPort: ''
smtpUsername: ''
smtpPassword: ''
smtpEncryption: true
imapAdapter: spool
imapOptions: { }
imapServer: 127.0.0.1
imapPort: ''
imapUsername: ''
imapPassword: ''
imapEncryption: true
# ///////////////////////////////////////////////////////////////////////////////

57
src/Configuration.php
View File

@@ -36,20 +36,20 @@ class Configuration implements EventEmitterInterface
const CONFIG_MAIL_INBOX_CONFIG = 'mailInboxConfig'; const CONFIG_MAIL_INBOX_CONFIG = 'mailInboxConfig';
const CONFIG_MAIL_OUTBOX_ADAPTER = 'mailOutboxAdapter'; const CONFIG_MAIL_OUTBOX_ADAPTER = 'mailOutboxAdapter';
const CONFIG_MAIL_OUTBOX_CONFIG = 'mailOutboxConfig'; const CONFIG_MAIL_OUTBOX_CONFIG = 'mailOutboxConfig';
const CONFIG_SMTP_ADAPTER = 'smtpAdapter'; // const CONFIG_SMTP_ADAPTER = 'smtpAdapter';
const CONFIG_SMTP_OPTIONS = 'smtpOptions'; // const CONFIG_SMTP_OPTIONS = 'smtpOptions';
const CONFIG_SMTP_SERVER = 'smtpServer'; // const CONFIG_SMTP_SERVER = 'smtpServer';
const CONFIG_SMTP_PORT = 'smtpPort'; // const CONFIG_SMTP_PORT = 'smtpPort';
const CONFIG_SMTP_USERNAME = 'smtpUsername'; // const CONFIG_SMTP_USERNAME = 'smtpUsername';
const CONFIG_SMTP_PASSWORD = 'smtpPassword'; // const CONFIG_SMTP_PASSWORD = 'smtpPassword';
const CONFIG_SMTP_ENCRYPTION = 'smtpEncryption'; // const CONFIG_SMTP_ENCRYPTION = 'smtpEncryption';
const CONFIG_IMAP_ADAPTER = 'imapAdapter'; // const CONFIG_IMAP_ADAPTER = 'imapAdapter';
const CONFIG_IMAP_OPTIONS = 'imapOptions'; // const CONFIG_IMAP_OPTIONS = 'imapOptions';
const CONFIG_IMAP_SERVER = 'imapServer'; // const CONFIG_IMAP_SERVER = 'imapServer';
const CONFIG_IMAP_PORT = 'imapPort'; // const CONFIG_IMAP_PORT = 'imapPort';
const CONFIG_IMAP_USERNAME = 'imapUsername'; // const CONFIG_IMAP_USERNAME = 'imapUsername';
const CONFIG_IMAP_PASSWORD = 'imapPassword'; // const CONFIG_IMAP_PASSWORD = 'imapPassword';
const CONFIG_IMAP_ENCRYPTION = 'imapEncryption'; // const CONFIG_IMAP_ENCRYPTION = 'imapEncryption';
private static array $config = [ private static array $config = [
self::CONFIG_CACHE_DEFAULT_TTL => 600, self::CONFIG_CACHE_DEFAULT_TTL => 600,
@@ -87,20 +87,20 @@ class Configuration implements EventEmitterInterface
'password' => "", 'password' => "",
'secure' => true, 'secure' => true,
], ],
self::CONFIG_SMTP_ADAPTER => null, // self::CONFIG_SMTP_ADAPTER => null,
self::CONFIG_SMTP_SERVER => "127.0.0.1", // self::CONFIG_SMTP_SERVER => "127.0.0.1",
self::CONFIG_SMTP_OPTIONS => [], // self::CONFIG_SMTP_OPTIONS => [],
self::CONFIG_SMTP_PORT => 25, // self::CONFIG_SMTP_PORT => 25,
self::CONFIG_SMTP_USERNAME => "", // self::CONFIG_SMTP_USERNAME => "",
self::CONFIG_SMTP_PASSWORD => "", // self::CONFIG_SMTP_PASSWORD => "",
self::CONFIG_SMTP_ENCRYPTION => true, // self::CONFIG_SMTP_ENCRYPTION => true,
self::CONFIG_IMAP_ADAPTER => null, // self::CONFIG_IMAP_ADAPTER => null,
self::CONFIG_IMAP_OPTIONS => [], // self::CONFIG_IMAP_OPTIONS => [],
self::CONFIG_IMAP_SERVER => "127.0.0.1", // self::CONFIG_IMAP_SERVER => "127.0.0.1",
self::CONFIG_IMAP_PORT => 143, // self::CONFIG_IMAP_PORT => 143,
self::CONFIG_IMAP_USERNAME => "", // self::CONFIG_IMAP_USERNAME => "",
self::CONFIG_IMAP_PASSWORD => "", // self::CONFIG_IMAP_PASSWORD => "",
self::CONFIG_IMAP_ENCRYPTION => true, // self::CONFIG_IMAP_ENCRYPTION => true,
]; ];
@@ -119,6 +119,7 @@ class Configuration implements EventEmitterInterface
self::$config, self::$config,
$config $config
); );
ksort(self::$config);
if ($primary) { if ($primary) {
self::$configFile = $filename; self::$configFile = $filename;
} }