diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-06 12:07:51 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-01-06 12:07:51 +0100 |
| commit | 15d74d934708896706278574af159a9dcb3a4313 (patch) | |
| tree | facd38bcfde4271f3eaae0ad3637c60f452c14b5 /Docker/README.md | |
| parent | 6c423881d09fe7f3b52987359e74579c6f2025e3 (diff) | |
Changelog + Revert mistakes from 2202 and 2204 (#2210)
* GMP is needed because Alpine on e.g. ARM runs 32-bit
https://github.com/FreshRSS/FreshRSS/pull/2202
* Remove documentation for Træfik HTTP authentication as it is not
compatible with API
https://github.com/FreshRSS/FreshRSS/pull/2204
https://github.com/FreshRSS/FreshRSS/pull/2208
https://github.com/FreshRSS/FreshRSS/pull/2207
Diffstat (limited to 'Docker/README.md')
| -rw-r--r-- | Docker/README.md | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/Docker/README.md b/Docker/README.md index b991409bd..1a915f326 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -205,35 +205,20 @@ sudo docker run -d --restart unless-stopped --log-opt max-size=10m \ ## More deployment options -### Use HTTP-based login (advanced users) - -FreshRSS allows logins using either a Web form (easiest) or based on HTTP authentication. -If you want HTTP authentication, [Træfik can do it](https://docs.traefik.io/configuration/entrypoints/#authentication) (otherwise, see section below for giving this task to Apache inside the FreshRSS Docker image): - -``` -sudo docker run ... - --label traefik.frontend.auth.basic.users='admin:$2y$05$BJ3eexf8gkyfHR1L38nVMeQ2RbQ5PF6KW4/PlttXeR6IOGZKH4sbC,alice:$2y$05$0vv8eexRq4qujzyBCYh6a.bo/KUvuXCmjJ54RqEHBApaHdQrpzFJC' \ - --label traefik.frontend.auth.removeheader=true \ - --label traefik.frontend.auth.headerField=X-WebAuth-User \ - --name freshrss freshrss/freshrss -``` - -N.B.: You can create password hashes for instance with: `htpasswd -nB alice` - ### Custom Apache configuration (advanced users) Changes in Apache `.htaccess` files are applied when restarting the container. -In particular, if you want FreshRSS to use HTTP-based login (instead of the easier Web form login, and instead of letting Træfik do it), you can mount your own `./FreshRSS/p/i/.htaccess`: +In particular, if you want FreshRSS to use HTTP-based login (instead of the easier Web form login), you can mount your own `./FreshRSS/p/i/.htaccess`: ``` sudo docker run ... - -v ./your/.htaccess:/var/www/FreshRSS/p/i/.htaccess \ - -v ./your/.htpasswd:/var/www/FreshRSS/data/.htpasswd \ + -v /your/.htaccess:/var/www/FreshRSS/p/i/.htaccess \ + -v /your/.htpasswd:/var/www/FreshRSS/data/.htpasswd \ ... --name freshrss freshrss/freshrss ``` -Example of `./your/.htaccess` referring to `./your/.htpasswd`: +Example of `/your/.htaccess` referring to `/your/.htpasswd`: ``` AuthUserFile /var/www/FreshRSS/data/.htpasswd AuthName "FreshRSS" |