12 commits

Author	SHA1	Message	Date
Joachim	d862be0564	Merge remote-tracking branch 'upstream/main' into storage-s3	2021-06-19 11:53:05 +02:00
Joachim	6b873e6bcd	Fix newline	2021-06-18 18:29:59 +02:00
Joachim	e07672fff1	Fix tests	2021-06-18 18:28:24 +02:00
Mouse Reeve	973b23856c	Merge branch 'main' into opengraph-image-generation	2021-06-17 15:17:54 -07:00
Joachim	689fefb096	Merge remote-tracking branch 'upstream/main' into storage-s3	2021-06-08 18:20:57 +02:00
Mouse Reeve	948a5dea10	Cleans up .env and settings files ... Some outdated stuff doesn't need to be in there	2021-06-07 12:53:57 -07:00
Joachim	cba34780d8	Use S3 as static and media storage ... TODO - [ ] Write some documentation for non-AWS, S3-compatible services - [ ] Make a management command to move existing media to the new S3 bucket - [ ] See if Nginx can reverse-proxy the S3 bucket in order to keep the files accessible through the domain name	2021-06-07 18:12:48 +02:00
Joachim	f206f61e9a	Use global switch to enable/disable preview images	2021-05-28 17:00:07 +02:00
bcj	31deb36c85	URL-Encode password in broker_url ... Needed to prevent connection errors if the password contains non-urlsafe characters. Dockerfile change because all the services using it are mirroring ./ in /app now anyway. Flower needs because it needs bookwyrm in order to read the celerywyrm config (because flower only allows overwriting broker_url from the command line and we want to do it in Python so we have access to a urlencode function).	2021-05-23 23:49:12 -05:00
bcj	213a9508d8	Don't hardcode postres port in bookwyrm.settings ... Have bookwyrm.settings check for an alternative postgres port.	2021-05-18 18:35:32 -05:00
Mouse Reeve	b1c38d291c	Set preferred language	2021-04-29 10:40:49 -07:00
Pablo Barton	d38efa9a9d	Easier to deploy by avoiding merge conflicts in production	2021-04-11 13:12:50 -04:00