Commit graph

358 commits

Author SHA1 Message Date
Samuel Clay
c87d1c12bd Easiest way to both delete the default.conf and to insert our own is to call it default.conf. Hope that doesn't hurt things. Maybe this should be explicit. 2021-02-19 17:13:33 -05:00
Samuel Clay
7b9d7a0178 Exposing nginx ports. 2021-02-18 22:06:05 -05:00
Samuel Clay
cc76ab21db Splitting nginx into docker and consul due to hostname changes. 2021-02-18 22:00:54 -05:00
Samuel Clay
56cea73a9c Beginning to add consul to old servers. 2021-02-18 18:59:00 -05:00
Samuel Clay
d498cca9e1 Handling multiple servers of the same name. Adding node-images for imageproxy. 2021-02-18 18:03:36 -05:00
Samuel Clay
95552c9415 Attempting to fix haproxy but dns still isn't resolving between container and host. 2021-02-17 21:44:47 -05:00
Samuel Clay
06bdbf48e9 Splitting task into four task servers. Renaming elasticsearch to db-elasticsearch. Working on HAProxy. 2021-02-17 21:07:12 -05:00
Jonathan Math
2d192607fd remove line copying haproxy.cfg from Dockerfile because it will be volumized instead 2021-02-17 09:31:18 -05:00
Jonathan Math
859de6e0ce template haproxy.cfg file to use ssh key variable from the letsencrypt role, finish the haproxy file 2021-02-16 13:11:26 -05:00
Jonathan Math
8287262d6c rename haproxy.cfg for compose to haproxy.docker-compose.cfg 2021-02-16 12:28:37 -05:00
Samuel Clay
a7c05a8b3a HAProxy config 2021-02-08 22:44:07 -05:00
Samuel Clay
4981978046 Updating keys to fix haproxy. 2021-02-08 22:40:06 -05:00
Samuel Clay
30eab70fdf SSL cert location. 2021-02-08 22:25:16 -05:00
Samuel Clay
e72488bd93 Updating haproxy config, updating DB motd, and finishing up letsencrypt ansible role. 2021-02-08 22:21:03 -05:00
Samuel Clay
f02f43dd18 New Lets Encrypt role, uses DNSimple token. 2021-02-08 20:49:55 -05:00
Samuel Clay
94d900aedc Working on inventories. 2021-02-08 19:22:51 -05:00
Jonathan Math
ee107c95f9 change dockerfile to remove codebase and only hold dependencies 2021-02-03 11:06:37 -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
Samuel Clay
1d87af414d Adding docker start commands. Should this be docker-compose instead? 2021-01-20 21:21:24 -05:00
Jonathan Math
b9c17b232a add swarm_instructions.sh 2021-01-19 11:42:07 -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
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
d69f5473e3 change nginx check time in haproxy 2021-01-19 09:41:17 -05:00
Jonathan Math
9f4a7481c8 remove python swarm automation script, add WIP swarm automation shell script 2021-01-03 11:27:41 -05:00
Jonathan Math
f0cc45bdd0 fix haproxy Dockerfile 2021-01-03 11:12:14 -05:00
Jonathan Math
cc1896c1aa add haproxy dockerfile and haproxy config for swarm 2021-01-03 11:11:28 -05:00
Jonathan Math
278b4b96ac work on the rest of the deployment steps for stack-compose.yml and remove hardcoded user value. Create functionality for machine build failure handling 2020-12-08 11:00:58 -05:00
Jonathan Math
698da6f2f4 make changes to Dockefiles and add new dockerfiles for stack-compose to you since swarm can't build from docker images 2020-12-07 21:08:33 -05:00
Jonathan Math
0be4953dfe add docker_swarm_automation.py WIP 2020-12-02 09:54:26 -05:00
Jonathan Math
62a7d60d9f update requirements.txt and fix haproxy/docker-compose to see if dns upgrade will work out query resolution issue 2020-10-27 09:59:00 +07:00
Jonathan Math
0be547bbeb make redis run on port 6579 2020-10-26 10:36:24 +07:00
Jonathan Math
a2ba62eb22 Revert "get rid of 'The host 0.0.0.0:8000 does not belong to the domain nb.local.com, unable to identify the subdomain for this request' issue in the logs". It introduced a new bug and will be handled later
This reverts commit 340024e930.
2020-10-26 09:54:09 +07:00
Jonathan Math
55014fdc1b change db_monitor port 2020-10-25 12:26:41 +07:00
Jonathan Math
defe294fb3 fix haproxy issue 2020-10-25 11:59:26 +07:00
Jonathan Math
340024e930 get rid of 'The host 0.0.0.0:8000 does not belong to the domain nb.local.com, unable to identify the subdomain for this request' issue in the logs 2020-10-24 19:20:45 +07:00
Jonathan Math
454308f0d2 remove unnecessary dockerfile 2020-10-05 00:16:37 +07:00
Jonathan Math
37586bcf6e add dockerfile for haproxy and haproxy.conf 2020-10-04 17:40:37 +07:00
Jonathan Math
bb5028f568 add python3 docker base image 2020-10-04 17:40:13 +07:00
Jonathan Math
19c1319259 add node_base.Dockerfile base image 2020-10-04 17:39:53 +07:00
Jonathan Math
1f5d949cc4 add nginx.local.conf file for docker-compose 2020-10-04 17:39:20 +07:00
Jonathan Math
7279171e4c update dockerfile and readme to use wsgi/settings files that have been moved 2020-07-01 02:32:35 -04:00
Jonathan Math
df48eb50f5 update dockerfile and change settings.py to support non-containerized local setup 2020-06-20 01:11:42 -04:00
jmath1
f623b3c3ab remove startup.py run from Dockerfile 2020-06-12 03:03:24 -04:00
jmath1
09b9583b7a Update README files to replace syncdb with migrate 2020-06-07 08:12:51 -04:00
jmath1
4e89bcd67a upgrade to django 1.6 and make migrations 2020-06-05 11:00:54 -04:00
Samuel Clay
27096549a9 6 hour minimum for craigslist 2020-04-06 09:42:11 -04:00
Blallo
65c1e4c397
Fix: build postgres container without error 2018-12-28 11:56:30 +01:00
myoriginalusername
6a5a123e92 Updating Dockerfile to use default-libmysqlclient-dev 2018-07-12 20:15:16 +01:00