diff --git a/ansible/playbooks/deploy_app.yml b/ansible/playbooks/deploy_app.yml index a6205f5ac..8f22954a9 100644 --- a/ansible/playbooks/deploy_app.yml +++ b/ansible/playbooks/deploy_app.yml @@ -20,6 +20,7 @@ -d '{"version": "{{ lookup('pipe', 'date "+%Y-%m-%d %H:%M:%S"') }}"}' - name: Cleanup static assets before compression + run_once: yes connection: local file: state: absent @@ -84,7 +85,7 @@ git: repo: https://github.com/samuelclay/NewsBlur.git dest: /srv/newsblur/ - version: pipeline + version: master register: pulled tags: - static diff --git a/ansible/playbooks/setup_app.yml b/ansible/playbooks/setup_app.yml index f8d402e32..f31ab70da 100644 --- a/ansible/playbooks/setup_app.yml +++ b/ansible/playbooks/setup_app.yml @@ -1,7 +1,7 @@ --- - name: SETUP -> app containers hosts: web - serial: "50%" + # serial: "50%" vars_files: - ../env_vars/base.yml vars: diff --git a/ansible/roles/repo/tasks/main.yml b/ansible/roles/repo/tasks/main.yml index a98784f7e..3d8a19f76 100644 --- a/ansible/roles/repo/tasks/main.yml +++ b/ansible/roles/repo/tasks/main.yml @@ -21,4 +21,4 @@ git: repo: https://github.com/samuelclay/NewsBlur.git dest: /srv/newsblur/ - version: pipeline + version: master diff --git a/docker/newsblur_deploy.Dockerfile b/docker/newsblur_deploy.Dockerfile index 4def586db..e1b943508 100644 --- a/docker/newsblur_deploy.Dockerfile +++ b/docker/newsblur_deploy.Dockerfile @@ -24,4 +24,4 @@ RUN npm -g install yuglify RUN apt-get clean WORKDIR /srv/newsblur -CMD python manage.py collectstatic --no-input --clear -v 3 -l +CMD python manage.py collectstatic --no-input --clear -v 1 -l diff --git a/templates/maintenance_off.html b/templates/maintenance_off.html index ee23ea51a..e1928a3ae 100644 --- a/templates/maintenance_off.html +++ b/templates/maintenance_off.html @@ -85,7 +85,7 @@

NewsBlur is in maintenance mode

-

This is a unique maintenance mode. This is only for deploying the new front-end asset packager we're switching to (here's the merge on GitHub). It's a bit messy though, since there is a brief moment when switching from the old to the new that can be in a buggy, liminal state of using part of one system and part of another. So to avoid that I'm just going to throw up a maintenance page for a quick minute.

+

This is a unique maintenance mode. This is only for deploying the new front-end asset packager we're switching to (here's the merge on GitHub). It's a bit messy though, since there is a brief moment when switching from the old to the new that can be in a buggy, liminal state of using part of one system and part of another. So to avoid that I'm just going to throw up a maintenance page for a quick minute.

To pass the time, check out what's popular on MLTSHP.