From 428df584a5de76dde72e4cd44d51b565a986378e Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Thu, 19 Sep 2019 10:09:19 +0800
Subject: Update pkgng usage and fix package names

Fix package names:
* vim-lite => vim-console
* uwsgi-py36 => uwsgi
---
 roles/basic/tasks/main.yml    | 13 ++++++-------
 roles/dns/tasks/main.yml      |  7 +++----
 roles/git/tasks/main.yml      | 13 ++++++-------
 roles/mail/tasks/main.yml     | 11 +++++------
 roles/radicale/tasks/main.yml |  7 +++----
 roles/web/tasks/main.yml      |  7 +++----
 6 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/roles/basic/tasks/main.yml b/roles/basic/tasks/main.yml
index f707e42..ca46831 100644
--- a/roles/basic/tasks/main.yml
+++ b/roles/basic/tasks/main.yml
@@ -84,14 +84,13 @@
 
 - name: pkg - install packages
   pkgng:
-    name: "{{ item }}"
+    name:
+      - tmux
+      - vim-console
+      - mosh
+      - rsync
+      - htop
     state: present
-  with_items:
-    - tmux
-    - vim-lite
-    - mosh
-    - rsync
-    - htop
 
 - name: vim - add basic configurations
   blockinfile:
diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml
index 44b3d74..e384929 100644
--- a/roles/dns/tasks/main.yml
+++ b/roles/dns/tasks/main.yml
@@ -1,11 +1,10 @@
 ---
 - name: install unbound and nsd
   pkgng:
-    name: "{{ item }}"
+    name:
+      - unbound
+      - nsd
     state: present
-  with_items:
-    - unbound
-    - nsd
 
 # "root-hints" is the file which contains the listing of primary root
 # DNS servers.  Unbound does have a listing of root DNS servers in its
diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml
index 4589ac6..13c35f2 100644
--- a/roles/git/tasks/main.yml
+++ b/roles/git/tasks/main.yml
@@ -1,14 +1,13 @@
 ---
 - name: install packages
   pkgng:
-    name: "{{ item }}"
+    name:
+      - git
+      - cgit
+      - uwsgi
+      - highlight
+      - gitolite
     state: present
-  with_items:
-    - git
-    - cgit
-    - uwsgi-py36
-    - highlight
-    - gitolite
 
 - name: check user group existence
   command: pw groupshow {{ git.user.name }}
diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 652bb72..3379151 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -1,13 +1,12 @@
 ---
 - name: install packages
   pkgng:
-    name: "{{ item }}"
+    name:
+      - opendkim
+      - postfix
+      - dovecot
+      - dovecot-pigeonhole
     state: present
-  with_items:
-    - opendkim
-    - postfix
-    - dovecot
-    - dovecot-pigeonhole
 
 - name: group - check vmail group
   command: pw groupshow {{ mail.vuser.name }}
diff --git a/roles/radicale/tasks/main.yml b/roles/radicale/tasks/main.yml
index 8c796f0..c70658d 100644
--- a/roles/radicale/tasks/main.yml
+++ b/roles/radicale/tasks/main.yml
@@ -3,11 +3,10 @@
 
 - name: install packages
   pkgng:
-    name: "{{ item }}"
+    name:
+      - py36-radicale2
+      - uwsgi
     state: present
-  with_items:
-    # - py36-radicale2
-    - uwsgi-py36
 
 - name: create data directory
   file:
diff --git a/roles/web/tasks/main.yml b/roles/web/tasks/main.yml
index e2e402b..4665ef5 100644
--- a/roles/web/tasks/main.yml
+++ b/roles/web/tasks/main.yml
@@ -1,11 +1,10 @@
 ---
 - name: install package
   pkgng:
-    name: "{{ item }}"
+    name:
+      - nginx
+      - acme-client
     state: present
-  with_items:
-    - nginx
-    - acme-client
 
 - name: (local) ssl/tls - check dhparam existence
   become: false
-- 
cgit v1.2.2