diff options
author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-07-16 20:13:04 +0200 |
---|---|---|
committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-07-16 20:13:04 +0200 |
commit | 94d0e6299ae5d931dc1f91e6f0cb1fe901faa394 (patch) | |
tree | 6da0a056822d04a6904a7707c9963c89cfd80bbf | |
parent | 737c4abdd1c844efa747edf9cac6602b3776c68e (diff) | |
parent | be4ef34e78687bea5079b061b544e51a83493c22 (diff) | |
download | playbooks-ansible-94d0e6299ae5d931dc1f91e6f0cb1fe901faa394.tar.gz playbooks-ansible-94d0e6299ae5d931dc1f91e6f0cb1fe901faa394.tar.xz playbooks-ansible-94d0e6299ae5d931dc1f91e6f0cb1fe901faa394.zip |
Replace deprecated include statement
-rw-r--r-- | roles/clients/handlers/main.yml | 2 | ||||
-rw-r--r-- | roles/clients/tasks/main.yml | 20 | ||||
-rw-r--r-- | roles/common/handlers/main.yml | 8 | ||||
-rw-r--r-- | roles/common/tasks/main.yml | 40 | ||||
-rw-r--r-- | roles/dnsserver/tasks/main.yml | 10 | ||||
-rw-r--r-- | roles/mtaserver/handlers/main.yml | 4 | ||||
-rw-r--r-- | roles/mtaserver/tasks/main.yml | 8 | ||||
-rw-r--r-- | roles/ntpserver/handlers/main.yml | 4 | ||||
-rw-r--r-- | roles/ntpserver/tasks/main.yml | 6 | ||||
-rw-r--r-- | roles/torrelay/tasks/main.yml | 10 |
10 files changed, 56 insertions, 56 deletions
diff --git a/roles/clients/handlers/main.yml b/roles/clients/handlers/main.yml index c2a64ec..8db0dde 100644 --- a/roles/clients/handlers/main.yml +++ b/roles/clients/handlers/main.yml @@ -1 +1 @@ -- include: systemd.yml +- import_tasks: systemd.yml diff --git a/roles/clients/tasks/main.yml b/roles/clients/tasks/main.yml index af38732..7ed21b5 100644 --- a/roles/clients/tasks/main.yml +++ b/roles/clients/tasks/main.yml @@ -1,29 +1,29 @@ - name: Ajout des dépôts de base - include: repos.yml + import_tasks: repos.yml - name: Fermeture des ports - include: firewall.yml + import_tasks: firewall.yml - name: Utilisation de la swap sysctl - include: sysctl.yml + import_tasks: sysctl.yml - name: Installation de KDE - include: kde.yml + import_tasks: kde.yml - name: Installation de XFCE - include: xfce.yml + import_tasks: xfce.yml - name: Configuration sudo - include: sudo.yml + import_tasks: sudo.yml - name: Configuration mock - include: mock.yml + import_tasks: mock.yml - name: Configuration rkhunter pour mock - include: rkhunter.yml + import_tasks: rkhunter.yml - name: Ajout points de montage - include: mnt.yml + import_tasks: mnt.yml - name: Installations des paquets - include: pkgs.yml + import_tasks: pkgs.yml diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index 655a79c..65700e8 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -1,4 +1,4 @@ -- include: ssh.yml -- include: aide.yml -- include: rkhunter.yml -- include: systemd.yml +- import_tasks: ssh.yml +- import_tasks: aide.yml +- import_tasks: rkhunter.yml +- import_tasks: systemd.yml diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 68b34f7..57f902b 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,62 +1,62 @@ - name: Install playbook dependancies - include: deps.yml + import_tasks: deps.yml - name: Configuration démon SSH - include: ssh.yml + import_tasks: ssh.yml - name: Écran rabattu systemd - include: systemd.yml + import_tasks: systemd.yml - name: Installation des fichiers RC - include: rc.yml + import_tasks: rc.yml - name: Installation des scripts de base - include: binutils.yml + import_tasks: binutils.yml - name: Installation des points de montage standard - include: mnt.yml + import_tasks: mnt.yml ## ipv6 default address unavailable ##- name: Configuration du fichier hôte -## include: host.yml +## import_tasks: host.yml - name: Configuration démon Cron - include: cron.yml + import_tasks: cron.yml - name: Configurations variables fichier setvars - include: setvars.yml + import_tasks: setvars.yml - name: Gestion des Autorités de Certification - include: ca.yml + import_tasks: ca.yml - name: Configuration Yum - include: yum.yml + import_tasks: yum.yml - name: Configuration DNF - include: dnf.yml + import_tasks: dnf.yml - name: Installation linux_logo Fedora - include: logo.yml + import_tasks: logo.yml when: ansible_distribution_version|int >= logo_release|int and ansible_architecture == "x86_64" - name: Modification des dépôts de mise à jour - include: repos.yml + import_tasks: repos.yml - name: Installation des logiciels de base - include: pkgs.yml + import_tasks: pkgs.yml - name: État des services - include: services.yml + import_tasks: services.yml - name: Installation du HIDS AIDE - include: aide.yml + import_tasks: aide.yml - name: Installation de rkhunter - include: rkhunter.yml + import_tasks: rkhunter.yml when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" - name: Changement de shell pour root - include: zsh.yml + import_tasks: zsh.yml - name: Crontasks pour SELinux - include: selinux.yml + import_tasks: selinux.yml diff --git a/roles/dnsserver/tasks/main.yml b/roles/dnsserver/tasks/main.yml index 859bb75..0951a8e 100644 --- a/roles/dnsserver/tasks/main.yml +++ b/roles/dnsserver/tasks/main.yml @@ -1,14 +1,14 @@ - name: Installation des paquets - include: pkgs.yml + import_tasks: pkgs.yml - name: Configuration de l'arborescence - include: dirs.yml + import_tasks: dirs.yml - name: Configuration du service - include: config.yml + import_tasks: config.yml - name: Gestion du service - include: services.yml + import_tasks: services.yml - name: Tâches de base - include: common.yml + import_tasks: common.yml diff --git a/roles/mtaserver/handlers/main.yml b/roles/mtaserver/handlers/main.yml index 44df575..0b600d1 100644 --- a/roles/mtaserver/handlers/main.yml +++ b/roles/mtaserver/handlers/main.yml @@ -1,2 +1,2 @@ -- include: postfix.yml -- include: systemd.yml +- import_tasks: postfix.yml +- import_tasks: systemd.yml diff --git a/roles/mtaserver/tasks/main.yml b/roles/mtaserver/tasks/main.yml index 3cbb25f..977ec12 100644 --- a/roles/mtaserver/tasks/main.yml +++ b/roles/mtaserver/tasks/main.yml @@ -1,11 +1,11 @@ - name: Installation des paquets - include: pkgs.yml + import_tasks: pkgs.yml - name: Configuration du service - include: config.yml + import_tasks: config.yml - name: Gestion du service - include: services.yml + import_tasks: services.yml - name: Configuration de systemd - include: systemd.yml + import_tasks: systemd.yml diff --git a/roles/ntpserver/handlers/main.yml b/roles/ntpserver/handlers/main.yml index 0427057..f64b4db 100644 --- a/roles/ntpserver/handlers/main.yml +++ b/roles/ntpserver/handlers/main.yml @@ -1,2 +1,2 @@ -- include: ntp.yml -- include: chrony.yml +- import_tasks: ntp.yml +- import_tasks: chrony.yml diff --git a/roles/ntpserver/tasks/main.yml b/roles/ntpserver/tasks/main.yml index a3b1db2..d7c85a7 100644 --- a/roles/ntpserver/tasks/main.yml +++ b/roles/ntpserver/tasks/main.yml @@ -1,8 +1,8 @@ - name: Installation des paquets - include: pkgs.yml + import_tasks: pkgs.yml - name: Configuration des services - include: config.yml + import_tasks: config.yml - name: État des services - include: services.yml + import_tasks: services.yml diff --git a/roles/torrelay/tasks/main.yml b/roles/torrelay/tasks/main.yml index 1081c8b..a1cde63 100644 --- a/roles/torrelay/tasks/main.yml +++ b/roles/torrelay/tasks/main.yml @@ -1,14 +1,14 @@ - name: Installation des paquets - include: pkgs.yml + import_tasks: pkgs.yml - name: Configuration des services - include: config.yml + import_tasks: config.yml - name: Configuration du parefeu - include: fw.yml + import_tasks: fw.yml - name: Modules et booleens SELinux - include: selinux.yml + import_tasks: selinux.yml - name: Gestion du service - include: services.yml + import_tasks: services.yml |