Commit graph

70 commits

Author SHA1 Message Date
Samuel Clay
1f7816f8ab Getting the old non-docker servers working in concert with the new ones. Now to give them all the shared firewall and install consul. 2021-02-23 15:53:46 -05:00
Jonathan Math
f55121f4f3 fix ssh keys issue in makefile 2021-02-21 11:46:41 -05:00
Samuel Clay
a4e18295d7 make plan and make apply to run terraform. 2021-02-19 17:58:01 -05:00
Jonathan Math
3d7d4133c3 fix makefile keys command 2021-02-17 09:29:16 -05:00
Samuel Clay
b22ad738a0 make list should read the token dynamically. 2021-02-08 14:15:03 -05:00
Samuel Clay
e485c46c46 Removing etc/hosts role, adding makefile commands for using ansible-playbook 2021-01-29 12:12:27 -05:00
Samuel Clay
4cffbba942 Stubbing in ansible roel for consul. Not sure how to hook it up yet, but need Terraform first. 2021-01-29 09:49:39 -05:00
Samuel Clay
d3449db1ec Merge branch 'docker_django3.1' into dashboard3
* docker_django3.1:
  add swarm_instructions.sh
  update celery task name to cron_queue in settings.py.orig
  change redis port to 6579 in docker local settings
  update celery task name to cron_queue in settings.py
  add image building and deployment functionality to Makefile
  update docker files to include code in the image so we can use with swarm (without configuring shared volumes yet)
  change beat_tasks to cron_queue in config/supervision_celeryd_beat.conf
  change pymysql version in __init__ to the new django compatible version
  change names for swarm service in swarm haproxy.conf file
  remove ssl from nginx
  fix dependency issues
  change nginx check time in haproxy
  add .dockerignore
  update newsblur dir to newsblur_web in code
  adjust resource limits on containers in stack-compose and correct monitor command
  clean up and fix stack-compose.yml file
  correct docker-compose images
2021-01-23 19:31:06 -05:00
Samuel Clay
dc5d390cf1 Updating postgres. Stubbing in nginx in ansible, but this needs to be rewritten with docker-compose. 2021-01-22 19:22:45 -05:00
Jonathan Math
b185efcec4 add image building and deployment functionality to Makefile 2021-01-19 09:54:14 -05:00
Jonathan Math
dcc70d44a4 change makefile to run tests individually 2020-11-19 11:49:16 -05:00
Jonathan Math
cbd08902c5 change makefile 2020-11-06 14:40:36 +07:00
Jonathan Math
80bae3608d Update makefile 2020-11-03 11:25:31 +07:00
Jonathan Math
1f406bbb49 add nosetest, nosetest-exclude, and update Makefile 2020-10-27 16:24:34 +07:00
Jonathan Math
eb31ce6bf4 fix test functionality for Makefile 2020-10-13 22:05:21 +07:00
Jonathan Math
a13309b950 change makefile to use newsblur.test_settings instead of utils.test_settings 2020-10-12 12:33:13 +07:00
Jonathan Math
e27ad0d69a change makefile command name 2020-10-12 12:28:02 +07:00
Jonathan Math
039c7b20e9 clean up makefile so the default command is 'make start' 2020-10-09 12:28:10 +07:00
Jonathan Math
34184027a6 update makefile commands for django3.0 2020-10-05 00:40:54 +07:00
Jonathan Math
f8ee044446 add makefile 2020-10-04 17:41:35 +07:00