Commit graph

14496 commits

Author SHA1 Message Date
Daniel Aleksandersen
9082137b72
Move WebSub callbacks to HTTPS 2021-03-05 17:51:57 +01:00
Samuel Clay
f07e841f90 Removing unvendorized APNs dependency. 2021-03-04 19:13:13 -05:00
Samuel Clay
a2f4215e40 Adding a sandbox designator for ios tokens so notifications can be received by testers. Has to be manually turned on for now. 2021-03-04 19:04:01 -05:00
Samuel Clay
0c19aec2a3 Updating to apns2 library for Apple Push Notifications over Http/2. 2021-03-04 18:26:40 -05:00
Jonathan Math
26fe4f82b8 use ansible_ssh_host ip address for consul service health checks 2021-03-04 13:30:02 -05:00
Jonathan Math
7f3d1ca080 delete dockerfile for redis. it is a relic of swarm 2021-03-04 13:29:38 -05:00
Jonathan Math
249653b256 use host networking for monitor 2021-03-04 13:29:08 -05:00
Jonathan Math
98b15fc73c remove dockerbuild=True from monitor 2021-03-04 13:15:03 -05:00
Samuel Clay
14daddc018 Using port 5579 for monitor. 2021-03-04 12:55:41 -05:00
Jonathan Math
e2bdb4b388 update requirements for monitor image so that settings.py can be used 2021-03-04 12:26:50 -05:00
Jonathan Math
3debb6d2ff use localhost for endpoints in db_monitor 2021-03-04 12:26:29 -05:00
Jonathan Math
35a2b0adc7 Merge branch 'dashboard3' of https://github.com/samuelclay/NewsBlur into dashboard3 2021-03-04 11:18:19 -05:00
Jonathan Math
1922e34954 use local_settings.py for db_monitor instead of using dockerbuild env variable to control local settings 2021-03-04 11:18:12 -05:00
Samuel Clay
dbec2708da Only show active feeds in dashboard river. Also link dashboard river title and icon. 2021-03-04 10:24:17 -05:00
Samuel Clay
889d37cebb Smarter merging of repeat feeds/folders when compacting folders. 2021-03-03 17:56:23 -05:00
Samuel Clay
05afdce691 Fixing search indexing. Also removing superfluous search_indexer_tasker queue. 2021-03-03 17:04:05 -05:00
Samuel Clay
f99ae77789 Fixing broken search indexer tasker and its synchronous subtasks. It's ok because MUserSearch.index_subscriptions_for_search is only called for a task itself. 2021-03-03 14:28:09 -05:00
Samuel Clay
eac7e71b81 Refactoring image size fetcher to be much simpler, albeit slower. 2021-03-03 13:50:22 -05:00
Samuel Clay
72791b8e33 Silencing more debug staatements. 2021-03-03 13:09:24 -05:00
Samuel Clay
6395087ef2 Debugging statement 2021-03-03 11:16:52 -05:00
Samuel Clay
b64f06c269 Refactoring tlnb and sshdo commands for new Docker-based installation. 2021-03-03 11:15:09 -05:00
Samuel Clay
28b09b5f3b Adding another exception handler to feed fetcher. 2021-03-03 09:30:20 -05:00
Samuel Clay
b266e3da4e badStatusLine exception handling. 2021-03-02 19:05:37 -05:00
Samuel Clay
5bf3cc251f IncompleteRead error 2021-03-02 19:03:57 -05:00
Samuel Clay
2e8a41c102 Conflict on the name html in python. 2021-03-02 18:44:25 -05:00
Samuel Clay
bf6040017d Convert videos in newsletters to images. 2021-03-02 18:42:24 -05:00
Samuel Clay
94e27a1f7b No need to decode 2021-03-02 18:33:00 -05:00
Samuel Clay
7dcfea68fb Adding certificates for APNS 2021-03-02 18:32:54 -05:00
Samuel Clay
5adbafb046 bytes need bytes 2021-03-02 18:16:57 -05:00
Samuel Clay
5506e99e9a Merge branch 'master' into dashboard3
* master:
  Don't cancel second most recent paypal subscription because it may be the current subscription.
2021-03-02 17:59:59 -05:00
Samuel Clay
9f8f7d39cd Don't cancel second most recent paypal subscription because it may be the current subscription. 2021-03-02 17:59:50 -05:00
Jonathan Math
45a37a5a99 remove unnecessary DOCKERBUILD env variable from postgres container role 2021-03-02 10:42:25 -05:00
Jonathan Math
c84e33bf47 Merge branch 'dashboard3' of https://github.com/samuelclay/NewsBlur into dashboard3 2021-03-02 10:41:29 -05:00
Jonathan Math
78f3db01a1 publish container port 5579 as port 5000 so the db_monitor will be reachable at port 5000 2021-03-02 10:41:21 -05:00
Jonathan Math
90c13af5f8 add monitor roles to setup playbooks for dbs. 2021-03-02 10:39:50 -05:00
Jonathan Math
bcb74c6401 change consul_service.json files to include health checks using local monitor for database services 2021-03-02 10:37:21 -05:00
Samuel Clay
cd62b41acf Convert bytes to str 2021-03-02 10:25:56 -05:00
Samuel Clay
5b980ee4f8 One more HTMLParser -> html.unescape 2021-03-02 10:13:11 -05:00
Samuel Clay
8e088ba350 Switching to py3 html parser. 2021-03-02 09:46:59 -05:00
Jonathan Math
edf8f25414 typo 2021-03-01 21:38:18 -05:00
Jonathan Math
0cdc50e99e fix bug in settings that comes up in flask 2021-03-01 21:32:09 -05:00
Jonathan Math
d3f50c38a3 change back 2021-03-01 21:28:49 -05:00
Jonathan Math
034fb2f49d Merge branch 'dashboard3' of https://github.com/samuelclay/NewsBlur into dashboard3 2021-03-01 21:20:33 -05:00
Jonathan Math
9ffd196182 fixing "No module named 'flask_monitor.flask_settings'" error 2021-03-01 21:20:20 -05:00
Samuel Clay
2455b5e97a Adding make celery 2021-03-01 19:37:12 -05:00
Samuel Clay
cb8e44f33c Whoops, accidentally committed merge conflict 2021-03-01 18:53:50 -05:00
Samuel Clay
5bc2ce3e4a Merge branch 'master' into dashboard3
* master:
  Revert "Merge pull request #1395 from alistair23/alistair/last_read_date"
  apps/reader/views: Send last_read_date when retrieving read stories
2021-03-01 18:39:44 -05:00
Samuel Clay
ae8f856677 Revert "Merge pull request #1395 from alistair23/alistair/last_read_date"
This reverts commit 0c94ead47d, reversing
changes made to 7ee8fb4204.
2021-03-01 18:12:49 -05:00
Samuel Clay
0c94ead47d
Merge pull request #1395 from alistair23/alistair/last_read_date
apps/reader/views: Send last_read_date when retrieving read stories
2021-03-01 18:00:25 -05:00
Filip Czaplicki
b25cbac6a4 Makefile: specify SHELL bash 2021-03-01 17:57:28 -05:00