diff options
author | Aaron LI <aly@aaronly.me> | 2019-09-19 10:09:19 +0800 |
---|---|---|
committer | Aaron LI <aly@aaronly.me> | 2019-09-19 10:09:19 +0800 |
commit | 428df584a5de76dde72e4cd44d51b565a986378e (patch) | |
tree | 50787b0ae51395b7abea7caec54050e6e652d49f | |
parent | a217f32c28999f6798442bc2b721900859dca766 (diff) | |
download | ansible-dfly-vps-428df584a5de76dde72e4cd44d51b565a986378e.tar.bz2 |
Update pkgng usage and fix package names
Fix package names:
* vim-lite => vim-console
* uwsgi-py36 => uwsgi
-rw-r--r-- | roles/basic/tasks/main.yml | 13 | ||||
-rw-r--r-- | roles/dns/tasks/main.yml | 7 | ||||
-rw-r--r-- | roles/git/tasks/main.yml | 13 | ||||
-rw-r--r-- | roles/mail/tasks/main.yml | 11 | ||||
-rw-r--r-- | roles/radicale/tasks/main.yml | 7 | ||||
-rw-r--r-- | 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 |