Compare commits

..

5 Commits

3 changed files with 20 additions and 6 deletions

View File

@ -1,8 +1,16 @@
## v1.1.2
### Fix
* Fix E405 Remote package tasks should have a retry.
* Use to_nice_json to manage packages list.
* Fix E203 Most files should not contain tabs.
* Fix E404 Doesn't need a relative path in role.
## v1.1.1 ## v1.1.1
### Fix ### Fix
* Set empty dependencies line to fix Galaxy warning. * Set empty dependencies line to fix Galaxy warning.
* Deprecation warning in favor of debops.netbase role. * Deprecation warning in favor of debops.netbase and debops.resources role.
## v1.1.0 ## v1.1.0

View File

@ -2,7 +2,9 @@
This content is mainly deprecated and i start using [Debops Netbase role][debops netbase role] This content is mainly deprecated and i start using [Debops Netbase role][debops netbase role]
which comes with most of this configuration (more and better). which comes with most of this configuration (more and better).
TODO: A specific role to manage `resolvconf` might be a good idea. The [Debops Ifupdown role][debops ifupdown role] can manage the DNS search and nameservers,
[see the documentation][debops ifupdown dns] for more informations and the
[Debops Resolvconf role][debops resolvconf role] can also give more possibilities.
1. [Overview](#overview) 1. [Overview](#overview)
2. [Role Variables](#role-variables) 2. [Role Variables](#role-variables)
@ -96,3 +98,5 @@ Jérémy Gardais
[ipr website]: https://ipr.univ-rennes1.fr/ [ipr website]: https://ipr.univ-rennes1.fr/
[wiki proxmox lxc]: https://pve.proxmox.com/wiki/Linux_Container#_guest_operating_system_configuration [wiki proxmox lxc]: https://pve.proxmox.com/wiki/Linux_Container#_guest_operating_system_configuration
[debops netbase role]: https://docs.debops.org/en/master/ansible/roles/debops.netbase/index.html [debops netbase role]: https://docs.debops.org/en/master/ansible/roles/debops.netbase/index.html
[debops ifupdown role]: https://docs.debops.org/en/master/ansible/roles/debops.ifupdown/index.html
[debops resolvconf role]: https://docs.debops.org/en/master/ansible/roles/debops.resolvconf/index.html

View File

@ -10,7 +10,7 @@
dest: /etc/hosts dest: /etc/hosts
state: present state: present
regexp: "^{{ ansible_lo.ipv4.address }}" regexp: "^{{ ansible_lo.ipv4.address }}"
line: "{{ ansible_lo.ipv4.address }} {{ basics__hosts_localhost_content }}" line: "{{ ansible_lo.ipv4.address }} {{ basics__hosts_localhost_content }}"
backup: yes backup: yes
when: (basics__hosts_localhost_manage and when: (basics__hosts_localhost_manage and
ansible_lo.ipv4.address is defined) ansible_lo.ipv4.address is defined)
@ -20,7 +20,7 @@
dest: /etc/hosts dest: /etc/hosts
state: present state: present
regexp: "^{{ ansible_default_ipv4.address }}" regexp: "^{{ ansible_default_ipv4.address }}"
line: "{{ ansible_default_ipv4.address }} {{ basics__hosts_ipv4_content }}" line: "{{ ansible_default_ipv4.address }} {{ basics__hosts_ipv4_content }}"
backup: yes backup: yes
when: (basics__hosts_ipv4_manage and when: (basics__hosts_ipv4_manage and
ansible_default_ipv4.address is defined) ansible_default_ipv4.address is defined)
@ -54,12 +54,14 @@
state: 'present' state: 'present'
install_recommends: False install_recommends: False
with_flattened: with_flattened:
- '{{ basics__resolvconf_packages }}' - '{{ basics__resolvconf_packages | to_nice_json }}'
register: resolv_pkg_result
until: resolv_pkg_result is success
when: basics__resolvconf_enabled|bool when: basics__resolvconf_enabled|bool
- name: Configure Resolvconf with domains - name: Configure Resolvconf with domains
template: template:
src: '../templates/etc/resolvconf/resolv.conf.d/base.j2' src: 'etc/resolvconf/resolv.conf.d/base.j2'
dest: '/etc/resolvconf/resolv.conf.d/base' dest: '/etc/resolvconf/resolv.conf.d/base'
owner: root owner: root
group: root group: root