aboutsummaryrefslogtreecommitdiffstats
path: root/roles/common
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2022-06-22 20:57:51 -0700
committerBryan Newbold <bnewbold@archive.org>2022-06-22 21:00:08 -0700
commit5d201f7d9b55ff50753da2456634a3e51462ba1f (patch)
tree073a983bb2162b71af6270bb9d454d0341bf7272 /roles/common
parentb64c159c3df815c361a19884d63ceba59b709990 (diff)
downloadinfra-5d201f7d9b55ff50753da2456634a3e51462ba1f.tar.gz
infra-5d201f7d9b55ff50753da2456634a3e51462ba1f.zip
refactor 'apt' tasks to newer syntax (not 'with_items')
Diffstat (limited to 'roles/common')
-rw-r--r--roles/common/tasks/extrapkg.yml24
-rw-r--r--roles/common/tasks/main.yml129
-rw-r--r--roles/common/tasks/ntp.yml2
-rw-r--r--roles/common/tasks/security.yml15
4 files changed, 86 insertions, 84 deletions
diff --git a/roles/common/tasks/extrapkg.yml b/roles/common/tasks/extrapkg.yml
index 0836912..79e08cb 100644
--- a/roles/common/tasks/extrapkg.yml
+++ b/roles/common/tasks/extrapkg.yml
@@ -1,17 +1,17 @@
---
- name: Install extras that Everybody wants
- apt: pkg={{ item }} state=installed
- with_items:
- - ack-grep
- - alpine
- - build-essential
- - cowsay
- - ctorrent
- - figlet
- - ipython
- - ipython3
- - lynx
- - manpages-dev
+ apt:
+ state: present
+ name:
+ - ack-grep
+ - alpine
+ - build-essential
+ - cowsay
+ - ctorrent
+ - figlet
+ - ipython3
+ - lynx
+ - manpages-dev
tags:
- dependencies
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index a1f4500..ec5ad7b 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -11,70 +11,71 @@
- dependencies
- name: Install necessities and nice-to-haves
- apt: pkg={{ item }} state=installed
- with_items:
- # fail2ban in security
- # rkhunter in security
- - apt-transport-https
- - apticron
- - aptitude
- - bash-completion
- - bzip2
- - ca-certificates
- - curl
- - debian-goodies
- - dialog
- - dnsutils
- - dstat
- - etckeeper
- - fd-find
- - file
- - git
- - htop
- - httpie
- - iftop
- - ifupdown
- - iotop
- - iproute
- - iputils-ping
- - isc-dhcp-client
- - jq
- - less
- - libui-dialog-perl
- - lnav
- - locales
- - locales-all
- - lsof
- - lvm2
- - man-db
- - manpages-dev
- - molly-guard
- - moreutils
- - mosh
- - mtr-tiny
- - net-tools
- - netbase
- - netcat
- - ngrep
- - openssh-server
- - openssl
- - parallel
- - pigz
- - pv
- - python
- - python-software-properties
- - ripgrep
- - screen
- - sqlite3
- - sudo
- - tcpdump
- - tree
- - unattended-upgrades
- - unzip
- - util-linux
- - vim-nox
- - wget
- - zip
+ apt:
+ state: present
+ name:
+ # fail2ban in security
+ # rkhunter in security
+ - apt-transport-https
+ - apticron
+ - aptitude
+ - bash-completion
+ - bzip2
+ - ca-certificates
+ - curl
+ - debian-goodies
+ - dialog
+ - dnsutils
+ - dstat
+ - etckeeper
+ - fd-find
+ - file
+ - git
+ - htop
+ - httpie
+ - iftop
+ - ifupdown
+ - iotop
+ - iproute
+ - iputils-ping
+ - isc-dhcp-client
+ - jq
+ - less
+ - libui-dialog-perl
+ - lnav
+ - locales
+ - locales-all
+ - lsof
+ - lvm2
+ - man-db
+ - manpages-dev
+ - molly-guard
+ - moreutils
+ - mosh
+ - mtr-tiny
+ - net-tools
+ - netbase
+ - netcat
+ - ngrep
+ - openssh-server
+ - openssl
+ - parallel
+ - pigz
+ - pv
+ - python3
+ - python3-software-properties
+ - ripgrep
+ - screen
+ - sqlite3
+ - sudo
+ - tcpdump
+ - tree
+ - unattended-upgrades
+ - unzip
+ - util-linux
+ - vim-nox
+ - wget
+ - zip
tags:
- dependencies
diff --git a/roles/common/tasks/ntp.yml b/roles/common/tasks/ntp.yml
index c1489fd..219cdb5 100644
--- a/roles/common/tasks/ntp.yml
+++ b/roles/common/tasks/ntp.yml
@@ -2,7 +2,7 @@
# Defines tasks applicable for NTP (Network Time Protocol)
- name: Install ntp
- apt: pkg=ntp state=installed
+ apt: name=ntp state=present
tags:
- dependencies
diff --git a/roles/common/tasks/security.yml b/roles/common/tasks/security.yml
index c00b941..df2f065 100644
--- a/roles/common/tasks/security.yml
+++ b/roles/common/tasks/security.yml
@@ -1,12 +1,13 @@
---
- name: Install security-related packages
- apt: pkg={{ item }} state=installed
- with_items:
- - fail2ban
- - whois
- - lynis
- - rkhunter
- - debsums
+ apt:
+ state: present
+ name:
+ - fail2ban
+ - whois
+ - lynis
+ - rkhunter
+ - debsums
tags:
- dependencies