From 2e9f8bb7f74a89babb1f59a1c303b07bd11e70f7 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Sun, 28 Apr 2019 17:30:59 +0200
Subject: [PATCH] Replace ansible_distribution_release by debian_version
---
apt/tasks/repositories.yml | 10 +++++-----
ssh-server/tasks/main.yml | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/apt/tasks/repositories.yml b/apt/tasks/repositories.yml
index f65bf98..367fe64 100644
--- a/apt/tasks/repositories.yml
+++ b/apt/tasks/repositories.yml
@@ -5,7 +5,7 @@
- name: enable debian repositories
apt_repository:
state: present
- repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- "{{ apt_sets|union([''])|unique }}"
@@ -18,7 +18,7 @@
- name: disable debian repositories unused sets
apt_repository:
state: absent
- repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- "{{ ['', '-updates', '-backports', '-proposed-updates']|difference(apt_sets|union([''])) }}"
@@ -31,7 +31,7 @@
- name: disable debian repositories unused repos
apt_repository:
state: absent
- repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
- ['', '-updates', '-backports', '-proposed-updates']
@@ -44,7 +44,7 @@
- name: enable debian security repositories
apt_repository:
state: present
- repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- ['/updates']
@@ -58,7 +58,7 @@
- name: disable debian security repositories unused repos
apt_repository:
state: absent
- repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
- ['/updates']
diff --git a/ssh-server/tasks/main.yml b/ssh-server/tasks/main.yml
index 8350111..cd13d30 100644
--- a/ssh-server/tasks/main.yml
+++ b/ssh-server/tasks/main.yml
@@ -17,7 +17,7 @@
mode: '0644'
backup: true
validate: '/usr/sbin/sshd -t -f %s'
- when: ansible_distribution_release != "stretch"
+ when: debian_version == "jessie"
notify:
- restart sshd
tags:
@@ -32,7 +32,7 @@
mode: '0644'
backup: true
validate: '/usr/sbin/sshd -t -f %s'
- when: ansible_distribution_release == "stretch"
+ when: debian_version != "jessie"
notify:
- restart sshd
tags:
--
GitLab