Jonathan Math
ee49bc97b2
add proper healthcheck/wait for postgres in docker-compose and fix docker/local_settings.py
2021-03-14 16:17:14 -05:00
Samuel Clay
f1dd44198d
Switching from SRV based automatic haproxy server identification to manual tempaltes. Not great but not terrible.
2021-03-11 09:51:46 -05:00
Samuel Clay
d11e57c363
Attempting to fix consul issues with haproxy's server-template.
2021-03-11 00:50:59 -05:00
Samuel Clay
a900a46b68
Attempting to fix resolve issues.
2021-03-10 16:54:18 -05:00
Jonathan Math
a577b3ace2
remove work backend from haproxy.consul.cfg.js
2021-03-09 11:20:45 -05:00
Samuel Clay
a69aae6ce3
Moving monitor Dockerfile.
2021-03-09 11:10:42 -05:00
Jonathan Math
059848707f
remove haproxy dockerfile usage
2021-03-09 11:09:52 -05:00
Samuel Clay
4ad908e233
Fixing updates for new premium users. Also attempting to fix redis server data persistance issues.
2021-03-08 19:47:24 -05:00
Samuel Clay
eb173367e1
Removing unused machines from docker compose. Consolidating into task_celery.
2021-03-08 19:04:44 -05:00
Samuel Clay
15a2cda0c8
Renaming servers in docker-compose haproxy.
2021-03-08 18:05:22 -05:00
Jonathan Math
2f5822e3a9
merge changes
2021-03-08 17:40:40 -05:00
Jonathan Math
3d34aea15e
fix haproxy service discovery issues
2021-03-08 17:39:10 -05:00
Samuel Clay
e80f552c7b
Renaming servers in docker-compose haproxy.
2021-03-08 15:50:59 -05:00
Jonathan Math
e10598a99f
fix haproxy docker-compose ssl issue
2021-03-08 15:04:52 -05:00
Jonathan Math
a15a50e686
change db container names in haproxy for docker-compose
2021-03-08 14:19:30 -05:00
Jonathan Math
7f3d1ca080
delete dockerfile for redis. it is a relic of swarm
2021-03-04 13:29:38 -05:00
Samuel Clay
13b0da1f85
Correcting maintenance page for haproxy.
2021-02-25 10:32:10 -05:00
Jonathan Math
496347a1d7
fix port for monitor in haproxy.consul.cfg.j2
2021-02-25 10:17:49 -05:00
Jonathan Math
8a362f385f
move haproxy swarm files to archive
2021-02-25 10:15:26 -05:00
Samuel Clay
883cf8005f
Correcting nginx in haproxy.
2021-02-24 20:17:35 -05:00
Samuel Clay
155f9561db
Updating node dockerfile to place node_modules in a parent directory to allow for volumizing node code.
2021-02-24 20:02:37 -05:00
Samuel Clay
5e284a5752
Fixing haproxy link to node-page.
2021-02-24 18:13:26 -05:00
Jonathan Math
698940ffd6
add archive dir and move old swarm files to archive. also move ansible archive to archive/ansible
2021-02-24 17:23:26 -05:00
Samuel Clay
cf3bec14ad
Trying to get node docker setup but oddly it works locally and not in prod.
2021-02-24 17:17:06 -05:00
Jonathan Math
6c45c465ae
removing prod image dockerfile and reference
2021-02-24 17:11:55 -05:00
Samuel Clay
32eb8539c1
Attempting to get old inventory working with new, but its not yet resolving for hosts. Not sure why. Also reducing node docker image down.
2021-02-19 19:58:11 -05:00
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
