From 52a71a3f4ec3702e442e9e6b43e8ce5d8d08b360 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Wed, 12 Aug 2020 19:58:59 +0200 Subject: [PATCH 1/3] Fix FeedTask collecting reddit rules & update deploy job --- gitlab-ci/deploy.yml | 2 +- src/newsreader/news/collection/tasks.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gitlab-ci/deploy.yml b/gitlab-ci/deploy.yml index 07ba824..85a2ba8 100644 --- a/gitlab-ci/deploy.yml +++ b/gitlab-ci/deploy.yml @@ -13,7 +13,7 @@ deploy: - echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key - mkdir /root/.vaults - - echo "$VAULT_PASSWORD" > /root/.vaults/newsreader && chmod 0600 /root/.vaults/newsreader + - echo "$VAULT_PASSWORD" > /root/.vaults/newsreader script: - > ansible-playbook deployment/playbook.yml diff --git a/src/newsreader/news/collection/tasks.py b/src/newsreader/news/collection/tasks.py index d368a5c..a04c5f9 100644 --- a/src/newsreader/news/collection/tasks.py +++ b/src/newsreader/news/collection/tasks.py @@ -8,6 +8,7 @@ from celery.utils.log import get_task_logger from newsreader.accounts.models import User from newsreader.celery import app +from newsreader.news.collection.choices import RuleTypeChoices from newsreader.news.collection.feed import FeedCollector from newsreader.news.collection.utils import post from newsreader.utils.celery import MemCacheLock @@ -33,7 +34,7 @@ class FeedTask(app.Task): if acquired: logger.info(f"Running task for user {user_pk}") - rules = user.rules.enabled() + rules = user.rules.enabled().filter(type=RuleTypeChoices.feed) collector = FeedCollector() collector.collect(rules=rules) From 34c5318c42640c64551824d1ac79b6641de10ccd Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Wed, 12 Aug 2020 20:22:00 +0200 Subject: [PATCH 2/3] Update deploy job --- gitlab-ci/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-ci/deploy.yml b/gitlab-ci/deploy.yml index 85a2ba8..758ba55 100644 --- a/gitlab-ci/deploy.yml +++ b/gitlab-ci/deploy.yml @@ -13,7 +13,7 @@ deploy: - echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key - mkdir /root/.vaults - - echo "$VAULT_PASSWORD" > /root/.vaults/newsreader + - echo "$VAULT_PASSWORD" > deployment/vault && chmod 0600 deployment/vault script: - > ansible-playbook deployment/playbook.yml @@ -21,4 +21,4 @@ deploy: --limit newsreader --user ansible --private-key deployment/deploy_key - --vault-password-file /root/.vaults/newsreader + --vault-password-file deployment/vault From c94158a3a667a1ac8485fa116fc2cd5eca6726c7 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Wed, 12 Aug 2020 20:31:43 +0200 Subject: [PATCH 3/3] Make vault file executable --- gitlab-ci/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci/deploy.yml b/gitlab-ci/deploy.yml index 758ba55..8902721 100644 --- a/gitlab-ci/deploy.yml +++ b/gitlab-ci/deploy.yml @@ -13,7 +13,7 @@ deploy: - echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key - mkdir /root/.vaults - - echo "$VAULT_PASSWORD" > deployment/vault && chmod 0600 deployment/vault + - echo "$VAULT_PASSWORD" > deployment/vault && chmod 0700 deployment/vault script: - > ansible-playbook deployment/playbook.yml