replace "with_items" in apt modules

This commit is contained in:
Jérémy Lecour 2019-12-31 15:25:10 +01:00 committed by Jérémy Lecour
parent 79bb6103b8
commit e04d881988
47 changed files with 343 additions and 424 deletions

View File

@ -1,11 +1,10 @@
---
- name: install Amavis
apt:
name: "{{ item }}"
state: present
with_items:
name:
- postgrey
- amavisd-new
state: present
tags:
- amavis

View File

@ -2,14 +2,13 @@
- name: packages are installed (Debian 9 or later)
apt:
name: '{{ item }}'
state: present
with_items:
name:
- apache2
- libapache2-mpm-itk
- libapache2-mod-evasive
- apachetop
- libwww-perl
state: present
tags:
- apache
- packages
@ -17,13 +16,12 @@
- name: packages are installed (jessie)
apt:
name: '{{ item }}'
state: present
with_items:
name:
- apache2-mpm-itk
- libapache2-mod-evasive
- apachetop
- libwww-perl
state: present
tags:
- apache
- packages

View File

@ -2,11 +2,10 @@
- name: "Install munin-node and core plugins packages"
apt:
name: "{{ item }}"
state: present
with_items:
name:
- munin-node
- munin-plugins-core
state: present
tags:
- apache
- munin
@ -27,11 +26,10 @@
- name: "Install fcgi packages for Munin graphs"
apt:
name: "{{ item }}"
state: present
with_items:
name:
- libapache2-mod-fcgid
- libcgi-fast-perl
state: present
notify: reload apache
tags:
- apache

View File

@ -1,10 +1,9 @@
- name: package are installed
apt:
name: '{{ item }}'
state: present
with_items:
name:
- bind9
- dnstop
state: present
- name: Set bind configuration for recursive server
template:

View File

@ -74,9 +74,7 @@
- name: install ClamAV
apt:
name: "{{ item }}"
state: present
with_items:
name:
- clamav-daemon
- clamav
- clamdscan
@ -90,6 +88,7 @@
- rpm
- lzop
- razor
state: present
tags:
- clamav

View File

@ -2,22 +2,20 @@
---
- name: Remove older docker packages
apt:
name: '{{ item }}'
state: absent
with_items:
name:
- docker
- docker-engine
- docker.io
state: absent
- name: Install source requirements
apt:
name: '{{ item }}'
state: present
update_cache: yes
with_items:
name:
- apt-transport-https
- ca-certificates
- gnupg2
state: present
update_cache: yes
- name: Add Docker repository
apt_repository:
@ -36,11 +34,10 @@
- name: Install docker and python-docker
apt:
name: "{{ item }}"
update_cache: yes
with_items:
name:
- docker-ce
- python-docker
update_cache: yes
- name: Copy Docker daemon configuration file
template:

View File

@ -1,13 +1,12 @@
- name: ensure packages are installed
apt:
name: '{{ item }}'
state: present
with_items:
name:
- dovecot-ldap
- dovecot-imapd
- dovecot-pop3d
- dovecot-sieve
- dovecot-managesieved
state: present
tags:
- dovecot

View File

@ -1,7 +1,6 @@
- name: Install dependency
apt:
name: "{{ item }}"
with_items:
name:
- drbd-utils
- lvm2
tags:

View File

@ -46,11 +46,10 @@
- name: Install packages for HP hardware
apt:
name: "{{ item }}"
state: present
with_items:
name:
- cciss-vol-status
- ssacli
state: present
- name: Configure packages for HP hardware
template:
@ -79,11 +78,10 @@
- name: Install packages for DELL/LSI hardware
apt:
name: "{{ item }}"
allow_unauthenticated: yes
with_items:
name:
- megacli
- megaclisas-status
allow_unauthenticated: yes
- name: Configure packages for DELL/LSI hardware
template:

View File

@ -2,8 +2,7 @@
- name: Install/Update system tools
apt:
name: "{{ item }}"
with_items:
name:
- locales
- sudo
- ntpdate
@ -21,8 +20,7 @@
- name: Install/Update diagnostic tools
apt:
name: "{{ item }}"
with_items:
name:
- strace
- htop
- iftop
@ -39,8 +37,7 @@
- name: Install/Update hardware tools
apt:
name: "{{ item }}"
with_items:
name:
- hdparm
- smartmontools
- lm-sensors
@ -48,8 +45,7 @@
- name: Install/Update common tools
apt:
name: "{{ item }}"
with_items:
name:
- vim
- screen
- tmux
@ -72,12 +68,11 @@
- name: Be sure locate/mlocate is absent/purged
apt:
name: "{{ item }}"
state: absent
purge: yes
with_items:
name:
- locate
- mlocate
state: absent
purge: yes
when: evolinux_packages_purge_locate
- name: Install/Update serveur-base meta-package
@ -88,17 +83,14 @@
- name: Install/Update packages for Stretch and later
apt:
name: "{{ item }}"
with_items:
- net-tools
name: net-tools
when:
- evolinux_packages_stretch
- ansible_distribution_major_version is version_compare('9', '>=')
- name: Install/Update packages for Buster and later
apt:
name: "{{ item }}"
with_items:
name:
- spectre-meltdown-checker
- binutils
when:
@ -114,11 +106,10 @@
- name: Deleting rpcbind and nfs-common
apt:
name: "{{ item }}"
state: absent
with_items:
name:
- rpcbind
- nfs-common
state: absent
when: evolinux_packages_delete_nfs

View File

@ -2,11 +2,10 @@
- name: Postfix packages are installed
apt:
name: "{{ item }}"
state: present
with_items:
name:
- postfix
- mailgraph
state: present
when: evolinux_postfix_packages
tags:
- packages
@ -83,14 +82,13 @@
- name: exim4 is absent
apt:
name: "{{ item }}"
purge: yes
state: absent
with_items:
name:
- exim4
- exim4-base
- exim4-config
- exim4-daemon-light
purge: yes
state: absent
when: evolinux_postfix_purge_exim
tags:
- packages

View File

@ -2,12 +2,11 @@
- name: Dependencies are installed
apt:
name: "{{ item }}"
state: present
with_items:
name:
- postgresql-client
- sudo
- curl
state: present
tags:
- evomaintenance

View File

@ -2,11 +2,10 @@
- name: Dependencies are installed
openbsd_pkg:
name: "{{ item }}"
state: present
with_items:
name:
- postgresql-client
- curl
state: present
tags:
- evomaintenance

View File

@ -1,11 +1,10 @@
---
- name: Install Munin plugin and dependencies
apt:
name: "{{ item }}"
state: present
with_items:
name:
- munin-plugins-extra
- liblwp-useragent-determined-perl
state: present
tags:
- haproxy

View File

@ -1,11 +1,10 @@
---
- name: Install dependencies for build java package
apt:
name: "{{ item }}"
state: present
with_items:
name:
- java-package
- build-essential
state: present
tags:
- java

View File

@ -1,8 +1,7 @@
---
- name: Install packages for kvm/libvirt
apt:
name: "{{ item }}"
with_items:
name:
- qemu-kvm
- netcat-openbsd
- bridge-utils

View File

@ -1,12 +1,11 @@
- name: LDAP packages are installed
apt:
name: '{{ item }}'
state: present
with_items:
name:
- slapd
- ldap-utils
- ldapvi
- shelldap
state: present
- name: change sldap listen ip:port
lineinfile:

View File

@ -2,7 +2,7 @@
- name: Choose packages (Oracle)
set_fact:
multi: "multi_"
when: memcached_instance_name != False
when: memcached_instance_name
- name: is Munin present ?
stat:
@ -16,11 +16,10 @@
- block:
- name: Install munin-plugins-extra and libcache-memcached-perl for Munin
apt:
name: "{{ item }}"
state: present
with_items:
name:
- 'munin-plugins-extra'
- 'libcache-memcached-perl'
state: present
- name: Enable core Munin plugins
file:

View File

@ -2,10 +2,8 @@
- name: dependencies are satisfied
apt:
name: '{{ item }}'
name: iptables
state: present
with_items:
- iptables
- name: init script is copied
template:

View File

@ -2,11 +2,10 @@
- name: Install packages
apt:
name: "{{ item }}"
state: present
with_items:
name:
- mongodb
- mongo-tools
state: present
- name: install dependency for monitoring
apt:

View File

@ -2,13 +2,12 @@
- name: Ensure that Munin is installed
apt:
name: '{{ item }}'
state: present
with_items:
name:
- munin
- munin-node
- munin-plugins-core
- munin-plugins-extra
state: present
tags:
- munin
- packages

View File

@ -12,11 +12,10 @@
- block:
- name: Install perl libraries for Munin
apt:
name: "{{ item }}"
state: present
with_items:
name:
- libdbd-mysql-perl
- libcache-cache-perl
state: present
- name: Enable core Munin plugins
file:

View File

@ -70,23 +70,20 @@
- name: Install MySQL packages
apt:
name: '{{ item }}'
update_cache: yes
state: present
with_items:
name:
- mysql-server
- mysql-client
update_cache: yes
state: present
tags:
- mysql
- packages
- name: Install MySQL dev packages
apt:
name: '{{ item }}'
name: libmysqlclient20
update_cache: yes
state: present
with_items:
- libmysqlclient20
tags:
- mysql
- packages

View File

@ -26,15 +26,12 @@
# - name: "mysql-utilities are installed (Debian 9 or later)"
# apt:
# name: "{{ item }}"
# with_items:
# - mysql-utilities
# name: mysql-utilities
# when: ansible_distribution_major_version is version_compare('9', '>=')
- name: "mytop dependencies are installed (stretch)"
apt:
name: "{{ item }}"
with_items:
name:
- libconfig-inifiles-perl
- libdbd-mysql-perl
- libdbi-perl
@ -48,8 +45,7 @@
- name: "Install dependencies for mytop (Debian 10 or later)"
apt:
name: "{{ item }}"
with_items:
name:
- mariadb-client-10.3
- libconfig-inifiles-perl
- libterm-readkey-perl

View File

@ -12,11 +12,10 @@
- block:
- name: Install perl libraries for Munin
apt:
name: "{{ item }}"
state: present
with_items:
name:
- libdbd-mysql-perl
- libcache-cache-perl
state: present
- name: Enable core Munin plugins
file:

View File

@ -18,21 +18,18 @@
- name: Install MySQL packages
apt:
name: '{{ item }}'
name: "{{ mysql_packages }}"
update_cache: yes
state: present
with_items: "{{ mysql_packages }}"
tags:
- mysql
- packages
- name: Install MySQL dev packages
apt:
name: '{{ item }}'
name: libmysqlclient-dev
update_cache: yes
state: present
with_items:
- libmysqlclient-dev
tags:
- mysql
- packages

View File

@ -2,23 +2,20 @@
- name: Install MySQL packages
apt:
name: '{{ item }}'
update_cache: yes
state: present
with_items:
name:
- mariadb-server
- mariadb-client
update_cache: yes
state: present
tags:
- mysql
- packages
- name: Install MySQL dev packages
apt:
name: '{{ item }}'
name: default-libmysqlclient-dev
update_cache: yes
state: present
with_items:
- default-libmysqlclient-dev
tags:
- mysql
- packages

View File

@ -26,8 +26,7 @@
- name: "Install dependencies for mytop (stretch)"
apt:
name: "{{ item }}"
with_items:
name:
- mariadb-client-10.1
- libconfig-inifiles-perl
- libterm-readkey-perl
@ -35,8 +34,7 @@
- name: "Install dependencies for mytop (Debian 10 or later)"
apt:
name: "{{ item }}"
with_items:
name:
- mariadb-client-10.3
- libconfig-inifiles-perl
- libterm-readkey-perl

View File

@ -1,15 +1,14 @@
---
- name: packages are installed
apt:
name: "{{ item }}"
state: present
with_items:
name:
- nagios-nrpe-server
- monitoring-plugins
- monitoring-plugins-basic
- monitoring-plugins-common
- monitoring-plugins-standard
- nagios-plugins-contrib
state: present
tags:
- nagios-nrpe

View File

@ -1,11 +1,10 @@
---
- name: Ensure Nginx is installed
apt:
name: "{{ item }}"
state: present
with_items:
name:
- nginx-light
- ssl-cert
state: present
notify: reload nginx
tags:
- nginx

View File

@ -8,12 +8,11 @@
- name: Ensure packages for Munin CGI are installed
apt:
name: '{{ item }}'
state: present
with_items:
name:
- liblwp-useragent-determined-perl
- libcgi-fast-perl
- spawn-fcgi
state: present
- name: Adjust owner for munin-cgi
shell: "chown --verbose www-data:munin /var/log/munin/munin-cgi-*"

View File

@ -1,13 +1,12 @@
---
- name: install OpenDKIM
apt:
name: "{{ item }}"
state: present
with_items:
name:
- opendkim
- opendkim-tools
- ssl-cert
- dns-root-data
state: present
tags:
- opendkim

View File

@ -18,12 +18,11 @@
- name: Additional packages are installed
apt:
name: '{{ item }}'
state: present
with_items:
name:
- libapache2-mod-security2
- modsecurity-crs
- apg
state: present
- name: Additional modules are enabled
apache2_module:

View File

@ -37,26 +37,23 @@
- name: "Install PHP packages (Debian 9 or later)"
apt:
name: '{{ item }}'
name: '{{ php_stretch_packages }}'
state: present
with_items: "{{ php_stretch_packages }}"
- name: "Install mod_php packages (Debian 9 or later)"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- libapache2-mod-php
- php
state: present
when: php_apache_enable
- name: "Install PHP FPM packages (Debian 9 or later)"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- php-fpm
- php
state: present
when: php_fpm_enable
# Configuration
@ -77,6 +74,7 @@
- include: config_fpm.yml
when: php_fpm_enable
- name: Enforce permissions on PHP fpm directory
file:
dest: /etc/php/7.3/fpm
@ -85,6 +83,7 @@
- include: config_apache.yml
when: php_apache_enable
- name: Enforce permissions on PHP apache2 directory
file:
dest: /etc/php/7.3/apache2

View File

@ -16,9 +16,7 @@
- name: "Install PHP packages (jessie)"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- php5-cli
- php5-gd
- php5-imap
@ -31,23 +29,22 @@
- php5-curl
- php5-ssh2
- libphp-phpmailer
state: present
- name: "Install mod_php packages (jessie)"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- libapache2-mod-php5
- php5
state: present
when: php_apache_enable
- name: "Install PHP FPM packages (jessie)"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- php5-fpm
- php5
state: present
when: php_fpm_enable
# Configuration
@ -58,6 +55,7 @@
mode: "0755"
- include: config_cli.yml
- name: Enforce permissions on PHP cli directory
file:
dest: /etc/php5/cli
@ -65,6 +63,7 @@
- include: config_fpm.yml
when: php_fpm_enable
- name: Enforce permissions on PHP fpm directory
file:
dest: /etc/php5/fpm
@ -73,6 +72,7 @@
- include: config_apache.yml
when: php_apache_enable
- name: Enforce permissions on PHP apache2 directory
file:
dest: /etc/php5/apache2

View File

@ -37,26 +37,23 @@
- name: "Install PHP packages (Debian 9 or later)"
apt:
name: '{{ item }}'
name: '{{ php_stretch_packages }}'
state: present
with_items: "{{ php_stretch_packages }}"
- name: "Install mod_php packages (Debian 9 or later)"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- libapache2-mod-php
- php
state: present
when: php_apache_enable
- name: "Install PHP FPM packages (Debian 9 or later)"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- php-fpm
- php
state: present
when: php_fpm_enable
# Configuration
@ -70,6 +67,7 @@
- /etc/php/7.0
- include: config_cli.yml
- name: Enforce permissions on PHP cli directory
file:
dest: /etc/php/7.0/cli
@ -77,6 +75,7 @@
- include: config_fpm.yml
when: php_fpm_enable
- name: Enforce permissions on PHP fpm directory
file:
dest: /etc/php/7.0/fpm
@ -85,6 +84,7 @@
- include: config_apache.yml
when: php_apache_enable
- name: Enforce permissions on PHP apache2 directory
file:
dest: /etc/php/7.0/apache2

View File

@ -1,10 +1,8 @@
---
- name: ensure packages are installed
apt:
name: '{{ item }}'
name: postfix
state: present
with_items:
- postfix
tags:
- postfix
@ -17,8 +15,6 @@
mode: "0644"
force: yes
notify: restart postfix
when: postfix_force_main_cf == True or
postfix_maincf_md5_jessie in default_main_cf.stdout or
postfix_maincf_md5_stretch in default_main_cf.stdout
when: postfix_force_main_cf or postfix_maincf_md5_jessie in default_main_cf.stdout or postfix_maincf_md5_stretch in default_main_cf.stdout
tags:
- postfix

View File

@ -1,13 +1,12 @@
---
- name: ensure packages are installed
apt:
name: '{{ item }}'
state: present
with_items:
name:
- postfix
- postfix-ldap
- postfix-policyd-spf-python
- mailgraph
state: present
tags:
- postfix
@ -20,9 +19,7 @@
mode: "0644"
force: yes
notify: restart postfix
when: postfix_force_main_cf == True or
postfix_maincf_md5_jessie in default_main_cf.stdout or
postfix_maincf_md5_stretch in default_main_cf.stdout
when: postfix_force_main_cf or postfix_maincf_md5_jessie in default_main_cf.stdout or postfix_maincf_md5_stretch in default_main_cf.stdout
tags:
- postfix

View File

@ -1,9 +1,7 @@
- name: Install packages
apt:
name: "{{ item }}"
name: rabbitmq-server
state: present
with_items:
- rabbitmq-server
- name: Create rabbitmq-env.conf
copy:

View File

@ -2,9 +2,7 @@
- name: "Rbenv dependencies are installed"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- build-essential
- git
- libcurl4-openssl-dev
@ -15,6 +13,7 @@
- libxslt1-dev
- zlib1g-dev
- pkg-config
state: present
tags:
- rbenv
- packages

View File

@ -5,11 +5,10 @@
- name: Redis is installed.
apt:
name: "{{ item }}"
state: present
with_items:
name:
- redis-server
- redis-tools
state: present
tags:
- redis
- packages
@ -86,8 +85,7 @@
- nrpe
- include: nrpe.yml
when:
- nrpe_evolix_config.stat.exists == true
when: nrpe_evolix_config.stat.exists
tags:
- redis
- nrpe

View File

@ -1,9 +1,7 @@
---
- name: Install dependancy
apt:
name: "{{ item }}"
state: present
with_items:
name:
- libpam-systemd
- imagemagick
- git-core
@ -17,5 +15,6 @@
- libmagickcore-dev
- libmariadbclient-dev
- python-mysqldb
state: present
tags:
- redmine

View File

@ -1,11 +1,10 @@
---
- name: install SpamAssasin
apt:
name: "{{ item }}"
state: present
with_items:
name:
- spamassassin
- evomaintenance
state: present
tags:
- spamassassin

View File

@ -17,11 +17,10 @@
- name: "Install Squid packages"
apt:
name: '{{ item }}'
state: present
with_items:
name:
- "{{ squid_daemon_name }}"
- squidclient
state: present
- name: "Set alternative config file (Debian 9 or later)"
copy:

View File

@ -1,12 +1,11 @@
---
- name: Install packages
apt:
name: "{{ item }}"
state: present
with_items:
name:
- "tomcat{{ tomcat_version }}"
- "tomcat{{ tomcat_version }}-user"
- "libpam-systemd"
state: present
- name: Create tomcat root dir
file:

View File

@ -6,10 +6,8 @@
- name: Install PHP packages (Debian 10 and later)
apt:
name: '{{ item }}'
name: php-pear
state: present
with_items:
- php-pear
when: ansible_distribution_major_version is version_compare('10', '>=')
# /!\ Warning, this is a temporary hack
@ -27,18 +25,15 @@
- name: Install PHP packages (stretch)
apt:
name: '{{ item }}'
state: present
with_items:
name:
- php-pear
- php-log
state: present
when: ansible_distribution_release == "stretch"
- name: Install PHP5 packages (jessie)
apt:
name: '{{ item }}'
name: php5-pam
state: present
allow_unauthenticated: True
with_items:
- php5-pam
when: ansible_distribution_release == "jessie"

View File

@ -13,15 +13,14 @@
- name: install Roundcube
apt:
name: "{{ item }}"
state: present
with_items:
name:
- imapproxy
- roundcube
- roundcube-sqlite3
- roundcube-plugins
- php-net-sieve
- php-zip
state: present
tags:
- roundcube