* master: (84 commits)
Deploying new analytics server.
Create mongodb database user. Only runs on analytics, but should work fine on main mongo.
Adding second mongo analytics db, cleaning up mongo analytics auth.
Adding RSS autodiscovery to blog. Thanks https://forum.newsblur.com/t/irony-newsblur-cant-auto-extract-rss-feed-from-blog-newsblur-com/8849.
Revert "Merge branch 'state_timeline'"
Fixing syntax error
Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo.
fix flask_metrics ansible role
add state timeline dashboard to grafana
move state timeline to one single flask that gets astate for all services
Mongo analytics monitor not reayd yet
Turning consul monitor back on.
Turning on analytics
Need to strip csv values.
Binding redis to public interface.
Restore postgres backup. Needs work.
Prepping postgres backup
Prepping postgres transition, writing redis db maintenance.
Prepping redis for moving back to primary.
Updating redis backup to include percentage progress and access to the correct data dump.
...
* 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