Commit graph

13872 commits

Author SHA1 Message Date
Jonathan Math
b185efcec4 add image building and deployment functionality to Makefile 2021-01-19 09:54:14 -05:00
Jonathan Math
32707c057b update docker files to include code in the image so we can use with swarm (without configuring shared volumes yet) 2021-01-19 09:49:49 -05:00
Jonathan Math
ac5a9e8da1 change beat_tasks to cron_queue in config/supervision_celeryd_beat.conf 2021-01-19 09:47:30 -05:00
Jonathan Math
0933d3bb0a change pymysql version in __init__ to the new django compatible version 2021-01-19 09:45:32 -05:00
Jonathan Math
728b1e76a7 change names for swarm service in swarm haproxy.conf file 2021-01-19 09:44:43 -05:00
Jonathan Math
fd33bc76cb remove ssl from nginx 2021-01-19 09:42:24 -05:00
Jonathan Math
be24ec241e fix dependency issues 2021-01-19 09:41:47 -05:00
Jonathan Math
d69f5473e3 change nginx check time in haproxy 2021-01-19 09:41:17 -05:00
Jonathan Math
1f5c830df3 add .dockerignore 2021-01-19 09:40:51 -05:00
Jonathan Math
934550fde7 update newsblur dir to newsblur_web in code 2021-01-19 09:40:13 -05:00
Jonathan Math
dab9fc957f Merge branch 'docker_django3.1' of https://github.com/samuelclay/NewsBlur into docker_django3.1 2021-01-19 00:48:46 -05:00
Jonathan Math
9ec11003c6 adjust resource limits on containers in stack-compose and correct monitor command 2021-01-19 00:40:56 -05:00
Jonathan Math
a8d154bff6 clean up and fix stack-compose.yml file 2021-01-18 22:23:43 -05:00
Jonathan Math
2b09f59efe correct docker-compose images 2021-01-18 11:59:29 -05:00
Samuel Clay
10af9a8c3b Merge branch 'master' into docker_django3.1
* master:
  Adding imageproxy check using a real image.
  Adding httpchk
  Imageproxy behind haproxy.
2021-01-12 14:31:05 -05:00
Samuel Clay
28788b43b0 Adding imageproxy check using a real image. 2021-01-12 14:30:51 -05:00
Samuel Clay
e688e3dd5d Adding httpchk 2021-01-12 13:59:01 -05:00
Samuel Clay
173beef3d7 Imageproxy behind haproxy. 2021-01-11 18:46:24 -05:00
Samuel Clay
e5287c80f9 Merge branch 'master' into docker_django3.1
* master:
  Moving imageproxy and push to behind HAProxy for single point configuration.
  Installing certbot.
2021-01-11 17:50:35 -05:00
Samuel Clay
74a2fe0d5d Moving imageproxy and push to behind HAProxy for single point configuration. 2021-01-11 17:49:52 -05:00
Samuel Clay
fc7cb389f5 Installing certbot. 2021-01-11 16:44:25 -05:00
Samuel Clay
a02cdec9a3 Merge branch 'master' into docker_django3.1
* master:
  Removing unused types key from index.
2021-01-11 11:14:24 -05:00
Samuel Clay
6b384b51a2 Removing unused types key from index. 2021-01-06 18:00:55 -05:00
Samuel Clay
30828e8291 Merge branch 'master' into docker_django3.1
* master:
  Ignore send_message_with_response if not available (for some reason).
  Updating to latest pymongo and mongoengine for py2.
2021-01-06 16:39:00 -05:00
Samuel Clay
28cb9702dd Ignore send_message_with_response if not available (for some reason). 2021-01-06 16:37:51 -05:00
Samuel Clay
aff5d1d0a9 Updating to latest pymongo and mongoengine for py2. 2021-01-06 15:52:46 -05:00
Samuel Clay
a0f157dd97 Adding docker to node scripts. 2021-01-05 19:34:28 -05:00
Samuel Clay
678610208b Removing node_modules from repo 2021-01-05 19:21:34 -05:00
Samuel Clay
6e07dbaf0f Merge branch 'master' into docker_django3.1
* master: (22 commits)
  Whoops
  Better logging for broken paypal ipns.
  Adding RSS Tracker for Windows to Goodies.
  Refactoring socketio so real-time works around username restrictions.
  Socket.IO v3 on the server too.
  Switching to Socket.IO v3.
  Haproxy splitting for socketio 3
  Socket.io 3
  Handling missing feed.
  Only nb.local.com uses ports for websockets.
  Adding GrazeTEN
  Full node install on setup.
  Updating toprc
  Changing mongodb server.
  Fixing toprc
  Attempting to collect queries for 1% of requests by using DEBUG.
  Fixing mongo install.
  Recalculating premium expiration to take into account forced expirations after gifts.
  Fixing never expire -> 1 year
  Adding 1 year expire to admin.
  ...
2021-01-05 19:12:19 -05:00
Samuel Clay
d05b84e673 Whoops 2021-01-05 14:57:46 -05:00
Samuel Clay
8c3fe964f2 Better logging for broken paypal ipns. 2021-01-05 14:55:53 -05:00
Samuel Clay
00269d94b9 Adding RSS Tracker for Windows to Goodies. 2021-01-04 20:03:26 -05:00
Samuel Clay
e7e8bd88cd Refactoring socketio so real-time works around username restrictions. 2021-01-04 19:01:30 -05:00
Samuel Clay
06ec0d1099 Socket.IO v3 on the server too. 2021-01-04 18:14:52 -05:00
Samuel Clay
5892a8a9c0 Switching to Socket.IO v3. 2021-01-04 17:55:47 -05:00
Samuel Clay
75f0288c62 Haproxy splitting for socketio 3 2021-01-04 17:53:06 -05:00
Samuel Clay
d58e0257df Socket.io 3 2021-01-04 17:35:25 -05:00
Samuel Clay
a7ae7602ac Handling missing feed. 2021-01-04 17:00:28 -05:00
Samuel Clay
8bb1be8de6 Only nb.local.com uses ports for websockets. 2021-01-04 16:47:24 -05:00
Samuel Clay
ee186a9a81 Adding GrazeTEN 2021-01-04 15:55:26 -05:00
Samuel Clay
078b59e13f Full node install on setup. 2021-01-04 15:55:16 -05:00
Samuel Clay
86328a403d Updating toprc 2021-01-04 15:54:08 -05:00
Jonathan Math
a2c7acf3ff correct newsblur to newsblur_web in tasks 2021-01-04 13:33:56 -05:00
Samuel Clay
757b778658 Changing mongodb server. 2021-01-04 13:33:07 -05:00
Samuel Clay
79f1ad7143 Fixing toprc 2021-01-04 11:27:17 -05:00
Samuel Clay
a5cac63a74 Attempting to collect queries for 1% of requests by using DEBUG. 2021-01-04 10:22:04 -05:00
Samuel Clay
b3b705dfe8 Fixing mongo install. 2021-01-04 09:07:42 -05:00
Samuel Clay
5aadbc5413 Recalculating premium expiration to take into account forced expirations after gifts. 2021-01-03 17:48:08 -05:00
Samuel Clay
49e058d9fa Fixing never expire -> 1 year 2021-01-03 14:05:17 -05:00
Samuel Clay
83d7357306 Adding 1 year expire to admin. 2021-01-03 13:59:33 -05:00