Quelques modifications cosmétiques

zestedesavoir · Aug 5, 2020 · 68c9244 · 68c9244
1 parent 8a77926
commit 68c9244
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/roles/app/tasks/frontend.yml b/roles/app/tasks/frontend.yml
@@ -4,20 +4,21 @@
   tags:
     - bootstrap
 
-- name: installing frontend
-  npm: path="{{ appdir }}"
+- name: install frontend
   become: true
   become_user: "{{ appuser }}"
+  npm:
+    path: "{{ appdir }}"
   tags:
     - bootstrap
     - upgrade
 
-- name: building frontend
+- name: build frontend
+  become: true
+  become_user: "{{ appuser }}"
   command: npm run build
   args:
     chdir: "{{ appdir }}"
-  become: true
-  become_user: "{{ appuser }}"
   tags:
     - bootstrap
     - upgrade
diff --git a/roles/common/tasks/nodejs.yml b/roles/common/tasks/nodejs.yml
@@ -1,20 +1,21 @@
-- name: import the NodeSource GPG key into apt
+- name: add Node.js repository key
   apt_key:
     id: 9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280
     keyserver: "pool.sks-keyservers.net"
 
-- name: add NodeSource deb repository
+- name: add Node.js repository
   apt_repository:
+    filename: nodejs
     repo: "{{ item }} https://deb.nodesource.com/node_10.x {{ ansible_distribution_release }} main"
     state: present
   with_items:
     - deb
     - deb-src
 
-- name: add NodeSource repository preferences
+- name: add Node.js repository preferences
   template:
-    src: deb_nodesource_com_node.pref
-    dest: /etc/apt/preferences.d/deb_nodesource_com_node.pref
+    src: nodejs.pref
+    dest: /etc/apt/preferences.d/nodejs.pref
 
 - name: install Node.js
   apt:

diff --git a/...on/templates/deb_nodesource_com_node.pref → roles/common/templates/nodejs.pref b/...on/templates/deb_nodesource_com_node.pref → roles/common/templates/nodejs.pref
diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml
@@ -5,6 +5,7 @@
 
 - name: add elasticsearch repository
   apt_repository:
+    filename: elasticsearch
     repo: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
     state: present
 

diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml
@@ -5,6 +5,7 @@
 
 - name: add mariadb repository
   apt_repository:
+    filename: mariadb
     repo: "deb https://downloads.mariadb.com/MariaDB/mariadb-10.4/repo/debian {{ ansible_distribution_release }} main"
     state: present
   register: repo

diff --git a/roles/web/tasks/main.yml b/roles/web/tasks/main.yml
@@ -5,6 +5,7 @@
 
 - name: add nginx repository
   apt_repository:
+    filename: nginx
     repo: "{{ item }} https://nginx.org/packages/debian/ {{ ansible_distribution_release }} nginx"
     state: present
   with_items: