diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-05-23 14:03:19 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-05-23 14:03:19 +0200 |
| commit | f89819bd64bb5ada706f9b85abd6f7b600a95786 (patch) | |
| tree | 9bc1649eb12d54f0cf9a6e6385772e91be6481f7 /cli | |
| parent | 8668ca7230e9198981e33f9882a6030c1733e7f3 (diff) | |
Custom logo HTML (#4369)
* Custom logo HTML
Add option for custom HTML logo/title in the main Web UI view.
Can potentially be different per user.
#fix https://github.com/FreshRSS/FreshRSS/pull/3830/files#r850472247
* logo_html in main config
With new `./data/config.custom.php` to provide custom values before install
* Docker documentation
* whitespace
* Auto relax CSP to allow images for HTML logo
* Documentation
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/README.md | 6 | ||||
| -rwxr-xr-x | cli/do-install.php | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/cli/README.md b/cli/README.md index 1f5c3a549..284f675d4 100644 --- a/cli/README.md +++ b/cli/README.md @@ -49,6 +49,8 @@ cd /usr/share/FreshRSS # Same parameters as for do-install.php. Used to update an existing installation. ``` +> ℹ️ More options for [the configuration of your instance](../config.default.php#L3-L5) may be set in `./data/config.custom.php` before the install process, or in `./data/config.php` after the install process. + ### User ```sh @@ -59,7 +61,11 @@ cd /usr/share/FreshRSS ./cli/update-user.php --user username [ ... ] # Same options as create-user.php, except --no_default_feeds which is only available for create-user.php +``` +> ℹ️ More options for [the configuration of users](../config-user.default.php#L3-L5) may be set in `./data/config-user.custom.php` prior to creating new users, or in `./data/users/*/config.php` for existing users. + +```sh ./cli/actualize-user.php --user username # Fetch feeds for the specified user diff --git a/cli/do-install.php b/cli/do-install.php index 296b2bd31..db1af8ea5 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -46,6 +46,14 @@ $config = array( 'db' => FreshRSS_Context::$system_conf->db, ); +$customConfigPath = DATA_PATH . '/config.custom.php'; +if (file_exists($customConfigPath)) { + $customConfig = include($customConfigPath); + if (is_array($customConfig)) { + $config = array_merge($customConfig, $config); + } +} + foreach ($params as $param) { $param = rtrim($param, ':'); if (isset($options[$param])) { |