diff --git a/roles/system/handlers/main.yml b/roles/system/handlers/main.yml index 1fae608..dacba56 100644 --- a/roles/system/handlers/main.yml +++ b/roles/system/handlers/main.yml @@ -1,6 +1,6 @@ --- -- name: restart sshd - service: +- name: Restart sshd + ansible.builtin.service: name: sshd state: restarted diff --git a/roles/system/tasks/apt-transport-https.yml b/roles/system/tasks/apt-transport-https.yml index 6a0a411..19b6042 100644 --- a/roles/system/tasks/apt-transport-https.yml +++ b/roles/system/tasks/apt-transport-https.yml @@ -1,6 +1,6 @@ --- -- name: install https transport for apt - package: +- name: Install https transport for apt + ansible.builtin.package: name: apt-transport-https state: present diff --git a/roles/system/tasks/aptitude.yml b/roles/system/tasks/aptitude.yml index 5c2a18f..80a24a4 100644 --- a/roles/system/tasks/aptitude.yml +++ b/roles/system/tasks/aptitude.yml @@ -1,7 +1,7 @@ --- -- name: install aptitude - package: +- name: Install aptitude + ansible.builtin.package: name: aptitude state: present when: ansible_facts['os_family'] == 'Debian' diff --git a/roles/system/tasks/bashrc.yml b/roles/system/tasks/bashrc.yml index b918680..c6b3edc 100644 --- a/roles/system/tasks/bashrc.yml +++ b/roles/system/tasks/bashrc.yml @@ -1,8 +1,9 @@ --- -- name: copy basic bashrc files - copy: +- name: Copy basic bashrc files + ansible.builtin.copy: src: files/dotbashrc dest: /root/.bashrc + mode: 0644 owner: root group: root diff --git a/roles/system/tasks/cron-apt.yml b/roles/system/tasks/cron-apt.yml index 4eb13fd..21781a2 100644 --- a/roles/system/tasks/cron-apt.yml +++ b/roles/system/tasks/cron-apt.yml @@ -1,11 +1,12 @@ --- -- name: install cron-apt - package: +- name: Install cron-apt + ansible.builtin.package: name: cron-apt state: present -- name: default configuration file - copy: +- name: Default configuration file + ansible.builtin.copy: src: files/5-install dest: /etc/cron-apt/action.d/5-install + mode: 0644 diff --git a/roles/system/tasks/cron.yml b/roles/system/tasks/cron.yml index 0b64586..ec1613e 100644 --- a/roles/system/tasks/cron.yml +++ b/roles/system/tasks/cron.yml @@ -1,6 +1,6 @@ --- -- name: install cron - package: +- name: Install cron + ansible.builtin.package: name: cron state: present diff --git a/roles/system/tasks/curl.yml b/roles/system/tasks/curl.yml index 163806a..c27f95a 100644 --- a/roles/system/tasks/curl.yml +++ b/roles/system/tasks/curl.yml @@ -1,6 +1,6 @@ --- -- name: install curl - package: +- name: Install curl + ansible.builtin.package: name: curl state: present diff --git a/roles/system/tasks/gpg.yml b/roles/system/tasks/gpg.yml index 4b53830..2f74e31 100644 --- a/roles/system/tasks/gpg.yml +++ b/roles/system/tasks/gpg.yml @@ -1,6 +1,6 @@ --- -- name: install gpg package - package: +- name: Install gpg package + ansible.builtin.package: name: gpg state: present diff --git a/roles/system/tasks/htop.yml b/roles/system/tasks/htop.yml index 473ccbd..5704e56 100644 --- a/roles/system/tasks/htop.yml +++ b/roles/system/tasks/htop.yml @@ -1,6 +1,6 @@ --- -- name: install htop - package: +- name: Install htop + ansible.builtin.package: name: htop state: present diff --git a/roles/system/tasks/locales.yml b/roles/system/tasks/locales.yml index 250144c..0ba06f4 100644 --- a/roles/system/tasks/locales.yml +++ b/roles/system/tasks/locales.yml @@ -1,24 +1,27 @@ --- - name: Set default locale to fr_FR.UTF-8 - debconf: + ansible.builtin.debconf: name: locales question: locales/default_environment_locale value: fr_FR.UTF-8 vtype: select -- name: set to generate locales fr_FR/en_US - debconf: +- name: Set to generate locales fr_FR/en_US + ansible.builtin.debconf: name: locales question: locales/locales_to_be_generated value: en_US.UTF-8 UTF-8, fr_FR.UTF-8 UTF-8 vtype: multiselect -- name: delete original locale.gen - file: + +- name: Delete original locale.gen + ansible.builtin.file: path: /etc/locale.gen state: absent when: ansible_facts['env']['LANG'] != 'fr_FR.UTF-8' -- name: update original locale.gen - command: dpkg-reconfigure -f noninteractive locales +- name: Update original locale.gen + ansible.builtin.command: + cmd: dpkg-reconfigure -f noninteractive locales + changed_when: true when: ansible_facts['env']['LANG'] != 'fr_FR.UTF-8' diff --git a/roles/system/tasks/localtime.yml b/roles/system/tasks/localtime.yml index 3a4171b..fc60d5a 100644 --- a/roles/system/tasks/localtime.yml +++ b/roles/system/tasks/localtime.yml @@ -1,6 +1,7 @@ --- -- file: +- name: Set localtime + ansible.builtin.file: src: /usr/share/zoneinfo/Europe/Paris dest: /etc/localtime state: link diff --git a/roles/system/tasks/lshw.yml b/roles/system/tasks/lshw.yml index 73463d0..04b8628 100644 --- a/roles/system/tasks/lshw.yml +++ b/roles/system/tasks/lshw.yml @@ -1,6 +1,6 @@ --- -- name: install lshw - package: +- name: Install lshw + ansible.builtin.package: state: present name: lshw diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml index 912a227..95766da 100644 --- a/roles/system/tasks/main.yml +++ b/roles/system/tasks/main.yml @@ -1,23 +1,42 @@ --- -- include_tasks: aptitude.yml -- include_tasks: localtime.yml -- include_tasks: locales.yml -- include_tasks: ping.yml -- include_tasks: sudo.yml -- include_tasks: telnet.yml -- include_tasks: tmux.yml -- include_tasks: bashrc.yml -- include_tasks: vimrc.yml -- include_tasks: sshd.yml -- include_tasks: curl.yml -- include_tasks: wget.yml -- include_tasks: cron.yml -- include_tasks: htop.yml -- include_tasks: apt-transport-https.yml -- include_tasks: gpg.yml -- include_tasks: cron-apt.yml -- include_tasks: lshw.yml +- name: Include aptitude + ansible.builtin.include_tasks: aptitude.yml +- name: Include localtime + ansible.builtin.include_tasks: localtime.yml +- name: Include locales + ansible.builtin.include_tasks: locales.yml +- name: Include ping + ansible.builtin.include_tasks: ping.yml +- name: Include sudo + ansible.builtin.include_tasks: sudo.yml +- name: Include telnet + ansible.builtin.include_tasks: telnet.yml +- name: Include tmux + ansible.builtin.include_tasks: tmux.yml +- name: Include bashrc + ansible.builtin.include_tasks: bashrc.yml +- name: Include vim + ansible.builtin.include_tasks: vimrc.yml +- name: Include sshd + ansible.builtin.include_tasks: sshd.yml +- name: Include curl + ansible.builtin.include_tasks: curl.yml +- name: Include wget + ansible.builtin.include_tasks: wget.yml +- name: Include cron + ansible.builtin.include_tasks: cron.yml +- name: Include htop + ansible.builtin.include_tasks: htop.yml +- name: Include apt-transport-https + ansible.builtin.include_tasks: apt-transport-https.yml +- name: Include gpg + ansible.builtin.include_tasks: gpg.yml +- name: Include cron-apt + ansible.builtin.include_tasks: cron-apt.yml +- name: Include lshw + ansible.builtin.include_tasks: lshw.yml when: "'hypervisors' in group_names" -- include_tasks: overlayfs.yml +- name: Include overlayfs + ansible.builtin.include_tasks: overlayfs.yml when: "'hypervisors' in group_names" diff --git a/roles/system/tasks/overlayfs.yml b/roles/system/tasks/overlayfs.yml index 1b98bf5..1b9da8f 100644 --- a/roles/system/tasks/overlayfs.yml +++ b/roles/system/tasks/overlayfs.yml @@ -1,6 +1,6 @@ --- -- name: install fuse-overlayfs - package: +- name: Install fuse-overlayfs + ansible.builtin.package: state: present name: fuse-overlayfs diff --git a/roles/system/tasks/ping.yml b/roles/system/tasks/ping.yml index 3c61502..e87bfd9 100644 --- a/roles/system/tasks/ping.yml +++ b/roles/system/tasks/ping.yml @@ -1,6 +1,6 @@ --- -- name: install ping utility - package: +- name: Install ping utility + ansible.builtin.package: name: iputils-ping state: present diff --git a/roles/system/tasks/sshd.yml b/roles/system/tasks/sshd.yml index 09dfc00..3cc6763 100644 --- a/roles/system/tasks/sshd.yml +++ b/roles/system/tasks/sshd.yml @@ -1,26 +1,27 @@ --- -- name: ssh configuration file - template: +- name: SSH configuration file + ansible.builtin.template: src: sshd_config.j2 dest: /etc/ssh/sshd_config + mode: 0644 notify: - - restart sshd + - Restart sshd -- name: ssh keys home - authorized_key: +- name: SSH keys home + ansible.posix.authorized_key: user: root state: present key: "{{ lookup('file', 'ssh/home.id_rsa.pub') }}" -- name: ssh keys work - authorized_key: +- name: SSH keys work + ansible.posix.authorized_key: user: root state: present key: "{{ lookup('file', 'ssh/work.id_rsa.pub') }}" -- name: ssh keys stef - authorized_key: +- name: SSH keys stef + ansible.posix.authorized_key: user: root state: present key: "{{ lookup('file', 'ssh/stefofficiel.id_rsa.pub') }}" diff --git a/roles/system/tasks/sudo.yml b/roles/system/tasks/sudo.yml index 2016098..5b91ecd 100644 --- a/roles/system/tasks/sudo.yml +++ b/roles/system/tasks/sudo.yml @@ -1,6 +1,6 @@ --- -- name: install sudo utility - package: +- name: Install sudo utility + ansible.builtin.package: name: sudo state: present diff --git a/roles/system/tasks/telnet.yml b/roles/system/tasks/telnet.yml index 2e9ae80..d6dbe6d 100644 --- a/roles/system/tasks/telnet.yml +++ b/roles/system/tasks/telnet.yml @@ -1,6 +1,6 @@ --- -- name: install telnet - package: +- name: Install telnet + ansible.builtin.package: name: telnet state: present diff --git a/roles/system/tasks/tmux.yml b/roles/system/tasks/tmux.yml index 093494e..2d45a90 100644 --- a/roles/system/tasks/tmux.yml +++ b/roles/system/tasks/tmux.yml @@ -1,6 +1,6 @@ --- -- name: install tmux - package: +- name: Install tmux + ansible.builtin.package: name: tmux state: present diff --git a/roles/system/tasks/vimrc.yml b/roles/system/tasks/vimrc.yml index fbc62ee..d48b8a1 100644 --- a/roles/system/tasks/vimrc.yml +++ b/roles/system/tasks/vimrc.yml @@ -1,13 +1,14 @@ --- -- name: install vim package - package: +- name: Install vim package + ansible.builtin.package: name: vim state: present -- name: copy vimrc config file - copy: +- name: Copy vimrc config file + ansible.builtin.copy: src: files/vim/ dest: /root/.vim + mode: 0755 owner: root group: root diff --git a/roles/system/tasks/wget.yml b/roles/system/tasks/wget.yml index 518ab19..eef825a 100644 --- a/roles/system/tasks/wget.yml +++ b/roles/system/tasks/wget.yml @@ -1,6 +1,6 @@ --- -- name: install wget package - package: +- name: Install wget package + ansible.builtin.package: name: wget state: present