Skip to content
Snippets Groups Projects
Commit dc9f2126 authored by Lars Beckers's avatar Lars Beckers
Browse files

remove debian_version variable

replaced with the corresponding ansible fact
parent b864efc8
No related branches found
No related tags found
No related merge requests found
---
# file: common/apt/defaults/main.yml
debian_version: stretch
apt_mirror: "http://ftp.halifax.rwth-aachen.de/debian/"
apt_mirror_security: "http://security.debian.org/"
apt_repos: ['main', 'contrib', 'non-free']
......
......@@ -4,7 +4,7 @@
- name: enable debian repositories
apt_repository:
state: present
repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- "{{ apt_sets|union([''])|unique }}"
......@@ -17,7 +17,7 @@
- name: disable debian repositories unused sets
apt_repository:
state: absent
repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- "{{ ['', '-updates', '-backports', '-proposed-updates']|difference(apt_sets|union([''])) }}"
......@@ -30,7 +30,7 @@
- name: disable debian repositories unused repos
apt_repository:
state: absent
repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
- ['', '-updates', '-backports', '-proposed-updates']
......@@ -43,7 +43,7 @@
- name: enable debian security repositories
apt_repository:
state: present
repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- ['/updates']
......@@ -57,7 +57,7 @@
- name: disable debian security repositories unused repos
apt_repository:
state: absent
repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
- ['/updates']
......
......@@ -18,7 +18,7 @@
mode: 0644
backup: yes
validate: '/usr/sbin/sshd -t -f %s'
when: debian_version != "stretch"
when: ansible_distribution_release != "stretch"
notify:
- restart sshd
tags:
......@@ -34,7 +34,7 @@
mode: 0644
backup: yes
validate: '/usr/sbin/sshd -t -f %s'
when: debian_version == "stretch"
when: ansible_distribution_release == "stretch"
notify:
- restart sshd
tags:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment