merge with master

This commit is contained in:
vincent 2019-11-24 14:49:14 +01:00
commit 4bc20a3fd7
2 changed files with 21 additions and 18 deletions

View File

@ -42,6 +42,7 @@ system_base_softwares_arch:
- 'unrar'
- 'git-lfs'
<<<<<<< HEAD
system_base_softwares_debian:
- 'zsh'
- 'stow'
@ -73,3 +74,7 @@ system_base_softwares_debian:
- 'git-lfs'
=======
system_upgrade: false
>>>>>>> master

View File

@ -1,20 +1,3 @@
#- name: upgrade system
# pacman:
# state: latest # not required. choices: absent;latest;present. Desired state of the package.
# upgrade: true # not required. Whether or not to upgrade whole system.
# force: true # not required. When removing package - force remove package, without any checks. When update_cache - force redownload repo databases.
# update_cache: true
# become: yes
# register: upgrade
#
#- debug:
# var: upgrade
#
#- name: Reboot updates to apply
# reboot:
# reboot_timeout: 3600
# when: upgrade.changed and "linux" in upgrade.packages
# become: yes
- name: launch base install software
pacman:
@ -60,4 +43,19 @@
become: true
apt:
deb: "{{debian_url}}"
when: ansible_facts['os_family'] == "Debian"
when: ansible_facts['os_family'] == "Debian"
- name: upgrade system
pacman:
state: latest # not required. choices: absent;latest;present. Desired state of the package.
upgrade: true # not required. Whether or not to upgrade whole system.
force: true # not required. When removing package - force remove package, without any checks. When update_cache - force redownload repo databases.
update_cache: false
become: yes
when: system_upgrade
register: upgrade
- name: Reboot updates to apply
reboot:
reboot_timeout: 3600
when: upgrade.changed and "linux" in upgrade.packages and system_upgrade
become: yes