ansible/ansible_role_base
1
0
Fork 0
mirror of https://github.com/roles-ansible/ansible_role_base.git synced 2024-08-16 14:29:50 +02:00
Code Issues Releases Activity

improve bullseye integration

Browse source
This commit is contained in:
L3D 2021-09-01 02:50:17 +02:00
parent 0c9068b0a5
commit e1e343faed
Signed by: l3d
GPG key ID: CD08445BFF4313D1
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tasks/editor.yml
View file

@ -5,7 +5,7 @@
name: editor name: editor
path: /usr/bin/vim.basic path: /usr/bin/vim.basic
when: when:
- editor_is_vim | bool - base__install_vim | bool
- ansible_distribution != 'CentOS' - ansible_distribution != 'CentOS'
- ansible_distribution != 'RedHat' - ansible_distribution != 'RedHat'
- ansible_distribution != 'Archlinux' - ansible_distribution != 'Archlinux'
@ -17,7 +17,7 @@
name: editor name: editor
path: /usr/bin/vim path: /usr/bin/vim
when: when:
- editor_is_vim | bool - base__install_vim | bool
- ansible_distribution == 'CentOS' - ansible_distribution == 'CentOS'
- ansible_distribution == 'RedHat' - ansible_distribution == 'RedHat'
- ansible_distribution == 'Archlinux' - ansible_distribution == 'Archlinux'

2
tasks/sources.yml
View file

@ -25,7 +25,7 @@
group: root group: root
owner: root owner: root
notify: apt update notify: apt update
when: ansible_distribution_major_version < '11' when: ansible_distribution_major_version > '10'
- name: add eth zurich apt for Debian < 11 - name: add eth zurich apt for Debian < 11
become: true become: true

4
templates/apt.sources.list.j2
View file

@ -41,7 +41,7 @@ deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-secu
{%- endif -%} {%- endif -%}
{%- if base__pkg_updates -%} {%- if base__pkg_updates -%}
deb http://deb.debian.org/debian stable-updates main deb https://debian.ethz.ch/debian stable-updates main
{%- if base__pkg_contrib | bool -%} {%- if base__pkg_contrib | bool -%}
{{- ' contrib' -}} {{- ' contrib' -}}
{%- endif -%} {%- endif -%}
@ -49,7 +49,7 @@ deb http://deb.debian.org/debian stable-updates main
{{- ' non-free' -}} {{- ' non-free' -}}
{%- endif -%} {%- endif -%}
{{- '\n' -}} {{- '\n' -}}
deb-src http://deb.debian.org/debian {{ ansible_distribution_release }}-updates main deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main
{%- if base__pkg_contrib | bool -%} {%- if base__pkg_contrib | bool -%}
{{- ' contrib' -}} {{- ' contrib' -}}
{%- endif -%} {%- endif -%}

2
templates/apt.sources.list_legacy.j2
View file

@ -29,7 +29,7 @@ deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates
{{- ' non-free' -}} {{- ' non-free' -}}
{%- endif -%} {%- endif -%}
{{- '\n' -}} {{- '\n' -}}
deb http://security.debian.org/ {{ ansible_distribution_release }}/updates main deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main
{%- if base__pkg_contrib | bool -%} {%- if base__pkg_contrib | bool -%}
{{- ' contrib' -}} {{- ' contrib' -}}
{%- endif -%} {%- endif -%}