Merge pull request #54 from geotribu/fix/ansible-cdn

fix(ansible): corrige le rôle de déploiement cdn-indexer

Author: Guts

ansible/host_vars/vm_geotributest.yml

@@ -19,16 +19,16 @@ scripts_folder: "/home/geotribu/scripts/"
 cdn_subdomain: cdn
 cdn_path: "/var/www/geotribu/cdn/"
 
-# indexation
-dir_cdn_indexer_scripts: "/home/geotribu/scripts/cdn/indexer/"
-
 # certificats
 georezo_cert_mail: [email protected]
 geotribu_cert_mail: [email protected]
 
 # comments
 comments_subdomain: comments
 
+# indexation
+dir_cdn_indexer_scripts: "{{ scripts_folder }}cdn/indexer/"
+
 # pad
 pad_user_name: geotripad
 pad_pguser: geotripad

ansible/roles/cdn-indexer/tasks/main.yml

@@ -1,31 +1,32 @@
 ---
-- name: "Installation des paquets liés au script d'indexation"
+- name: Installation des paquets liés au script d'indexation
   ansible.builtin.apt:
     name:
       - python3
       - python3-venv
+    state: present
     update_cache: true
   become: true
 
 #  Script d'indexation des images
 - name: "Crée le dossier où stocker le script d'indexation du CDN : {{ dir_cdn_indexer_scripts }}"
   ansible.builtin.file:
+    group: geotribu
     path: "{{ dir_cdn_indexer_scripts }}"
-    state: directory
-    recurse: true
     owner: geotribu
-    group: geotribu
+    recurse: true
+    state: directory
   become_user: geotribu
   become: true
 
-- name: "Copie les fichiers liés au script dans {{ dir_cdn_indexer_scripts }}"
+- name: Copie les fichiers liés au script dans {{ dir_cdn_indexer_scripts }}
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "{{ dir_cdn_indexer_scripts }}"
     owner: geotribu
     group: geotribu
     mode: preserve
-  with_items:
+  loop:
     - files/requirements.txt
     - files/search_indexer.py
   become_user: geotribu
@@ -56,6 +57,7 @@
   ansible.builtin.pip:
     chdir: "{{ dir_cdn_indexer_scripts }}"
     requirements: requirements.txt
+    state: present
     virtualenv: "{{ dir_cdn_indexer_scripts }}.venv"
   become_user: geotribu
   become: true
@@ -64,8 +66,12 @@
 - name: Planifie l'exécution du script d'indexation des images
   ansible.builtin.cron:
     backup: true
-    name: "Indexation des images du CDN"
-    job: "cd {{ dir_cdn_indexer_scripts }} && {{ dir_cdn_indexer_scripts }}.venv/bin/python {{ dir_cdn_indexer_scripts }}search_indexer.py  > {{ dir_cdn_indexer_scripts }}`date +\\%Y\\%m\\%d\\%H\\%M\\%S`-cron.log 2>&1"
+    name: Indexation des images du CDN
+    job: >
+      cd {{ dir_cdn_indexer_scripts }} &&
+      {{ dir_cdn_indexer_scripts }}.venv/bin/python {{ dir_cdn_indexer_scripts }}search_indexer.py >
+      {{ dir_cdn_indexer_scripts }}$(date +\%Y\%m\%d\%H\%M\%S)-cron.log 2>&1
     special_time: hourly
+    user: geotribu
   become_user: geotribu
   become: true