From 27b41a491e9ac1c629d26adac6d9d556f36af20d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 1 Sep 2021 12:54:40 +0200 Subject: [PATCH] Deploy mirrors-countme (only) as RPM package This also ensures that the previously cloned git repository and local installation of the Python package and associated scripts are removed. Signed-off-by: Nils Philippsen --- roles/web-data-analysis/tasks/main.yml | 35 ++++++++++++++++---------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index cb4c721bae..4cd0b1ac2b 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -110,23 +110,32 @@ tags: - web-data -- name: install countme user gitconfig - copy: src=countme.gitconfig dest=/srv/countme/.gitconfig mode=0664 owner=countme group=countme +- name: install the python3-mirrors-countme RPM package + package: + name: python3-mirrors-countme + state: present tags: - web-data + - packages -- name: checkout mirrors-countme from git - git: - repo: https://pagure.io/mirrors-countme - dest: /srv/countme/mirrors-countme - version: prod - register: gitcountme - tags: - - web-data -- name: install mirrors-countme from git checkout - command: "pip3 install --no-index --no-deps /srv/countme/mirrors-countme" - when: "gitcountme is changed" +- name: remove local mirrors-countme git repo, scripts and Python package + # Using `shell` here because `file` doesn't know wild cards + shell: >- + shopt -s nullglob; + rm -rfv \ + /srv/countme/mirrors-countme \ + /usr/local/bin/countme-csv2sqlite.sh \ + /usr/local/bin/countme-sqlite2csv.sh \ + /usr/local/bin/countme-totals.py \ + /usr/local/bin/countme-update-rawdb.sh \ + /usr/local/bin/countme-update-totals.sh \ + /usr/local/bin/parse-access-log.py \ + /usr/local/lib/python3.*/site-packages/countme \ + /usr/local/lib/python3.*/site-packages/mirrors_countme-*-py3.*.egg* + register: wda_rm_local_pypkg + changed_when: wda_rm_local_pypkg.stdout != "" + failed_when: wda_rm_local_pypkg.rc != 0 tags: - web-data