Explorar o código

Fixes #10: Better organize os-specific tasks.

Jeff Geerling %!s(int64=10) %!d(string=hai) anos
pai
achega
66922e9951
Modificáronse 4 ficheiros con 19 adicións e 15 borrados
  1. 1 1
      handlers/main.yml
  2. 4 14
      tasks/main.yml
  3. 3 0
      tasks/setup-Debian.yml
  4. 11 0
      tasks/setup-RedHat.yml

+ 1 - 1
handlers/main.yml

@@ -1,3 +1,3 @@
 ---
 - name: restart nginx
-  command: service nginx restart
+  service: name=nginx state=restarted

+ 4 - 14
tasks/main.yml

@@ -8,24 +8,14 @@
     nginx_user: "{{ __nginx_user }}"
   when: nginx_user is not defined
 
-# Nginx setup.
-- name: Enable nginx repo (RedHat).
-  template:
-    src: nginx.repo.j2
-    dest: /etc/yum.repos.d/nginx.repo
-    owner: root
-    group: root
-    mode: 0644
-  when: ansible_os_family == 'RedHat'
-
-- name: Ensure nginx is installed (RedHat).
-  yum: pkg=nginx state=installed enablerepo=nginx
+# Setup/install tasks.
+- include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- name: Ensure nginx is installed (Debian).
-  apt: pkg=nginx state=installed
+- include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
+# Nginx setup.
 - name: Copy nginx configuration in place.
   template:
     src: nginx.conf.j2

+ 3 - 0
tasks/setup-Debian.yml

@@ -0,0 +1,3 @@
+---
+- name: Ensure nginx is installed.
+  apt: pkg=nginx state=installed

+ 11 - 0
tasks/setup-RedHat.yml

@@ -0,0 +1,11 @@
+---
+- name: Enable nginx repo.
+  template:
+    src: nginx.repo.j2
+    dest: /etc/yum.repos.d/nginx.repo
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Ensure nginx is installed.
+  yum: pkg=nginx state=installed enablerepo=nginx