From 0002584208e58768504c7ccbc0d9dab5f89fb26a Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 4 Dec 2019 04:45:21 +0100 Subject: [PATCH] Revert "copr: fe: all ./manage.py commands now use '-' instead of '_'" Temporarily, till we have new package on production. For now I expect that we will merge https://pagure.io/copr/copr/pull-request/1134. This reverts commit 90fcd8c96a3bf9ef40862d9dc598460b05c54b4b. --- .../files/cron.daily/copr-frontend-optional | 4 ++-- roles/copr/frontend-cloud/tasks/main.yml | 8 +++----- roles/copr/frontend/files/fedora/copr-gdpr-sar.sh | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional b/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional index 5faf85bd9d..f1cae910fe 100755 --- a/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional +++ b/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional @@ -5,6 +5,6 @@ # $ dnf diff copr-frontend /etc/cron.daily/copr-frontend-optional # to see our changes, and perhaps update when appropriate. -runuser -c 'copr-frontend notify-outdated-chroots' - copr-fe -runuser -c 'copr-frontend delete-outdated-chroots' - copr-fe +runuser -c 'copr-frontend notify_outdated_chroots' - copr-fe +runuser -c 'copr-frontend delete_outdated_chroots' - copr-fe /usr/bin/bash /usr/libexec/copr_dump_db.sh /var/www/html/db_dumps/ diff --git a/roles/copr/frontend-cloud/tasks/main.yml b/roles/copr/frontend-cloud/tasks/main.yml index 76017cbd51..7fd51d1d10 100644 --- a/roles/copr/frontend-cloud/tasks/main.yml +++ b/roles/copr/frontend-cloud/tasks/main.yml @@ -1,7 +1,4 @@ --- -- fail: msg='not ready for production ATM' - when: not devel - - import_tasks: "mount_fs.yml" - name: register security context for pgsql directory @@ -122,8 +119,9 @@ when: devel|bool copy: src=robots.txt dest=/var/www/html/ + - name: register whether indexes rebuild is required - command: copr-frontend update-indexes-required + command: copr-frontend update_indexes_required become: yes become_user: copr-fe register: update_indexes_required_result @@ -131,7 +129,7 @@ failed_when: False - name: rebuild indexes - command: ./manage.py update-indexes + command: ./manage.py update_indexes become: yes become_user: copr-fe args: diff --git a/roles/copr/frontend/files/fedora/copr-gdpr-sar.sh b/roles/copr/frontend/files/fedora/copr-gdpr-sar.sh index b047766d1c..043d801175 100755 --- a/roles/copr/frontend/files/fedora/copr-gdpr-sar.sh +++ b/roles/copr/frontend/files/fedora/copr-gdpr-sar.sh @@ -4,4 +4,4 @@ # Read more: http://fedora-infra-docs.readthedocs.io/en/latest/sysadmin-guide/sops/gdpr_sar.html # Playbook: https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/playbooks/manual/gdpr/sar.yml # Usage: SAR_USERNAME=someusername /home/fedora/copr-gdpr-sar.sh -copr-frontend dump-user $SAR_USERNAME +copr-frontend dump_user $SAR_USERNAME