From 632ccfc8ca8cf7b9612d8311ea105477312c72cc Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Fri, 30 Jun 2017 11:59:14 +0200 Subject: [PATCH] Require debian stretch, drop backports, cleanup --- README.md | 2 +- roles/batman/tasks/main.yml | 8 +------- roles/certmgr/tasks/main.yml | 9 ++------- roles/common/tasks/main.yml | 3 ++- roles/confluence/tasks/main.yml | 2 +- roles/dhcpd/tasks/main.yml | 2 +- roles/dns/tasks/main.yml | 5 +---- roles/exit-ipv4/tasks/main.yml | 2 +- roles/fastd/tasks/main.yml | 5 +---- roles/mesh-interfaces/tasks/main.yml | 5 +---- roles/nginx/tasks/main.yml | 5 +---- roles/ntp/tasks/main.yml | 2 +- roles/yanic/tasks/main.yml | 2 +- 13 files changed, 15 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 4cfad53..5eaf95e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The python package netaddr is required on the host running ansible. The vault password must be stored in `.vault_pass`. -The *only* supported distribution to deploy roles on is debian jessie. +The *only* supported distribution to deploy roles on is debian stretch. ## Running Ansible diff --git a/roles/batman/tasks/main.yml b/roles/batman/tasks/main.yml index bc8c807..af86b3d 100644 --- a/roles/batman/tasks/main.yml +++ b/roles/batman/tasks/main.yml @@ -1,13 +1,7 @@ --- -- name: Enable backports - apt_repository: repo='deb http://httpredir.debian.org/debian jessie-backports main' state=present - -- name: Install linux-image - apt: name=linux-image-amd64 default_release=jessie-backports state=latest - - name: Install batctl - apt: name=batctl default_release=jessie-backports state=latest + apt: name=batctl state=latest - name: Enable batman during boot lineinfile: dest=/etc/modules line=batman-adv diff --git a/roles/certmgr/tasks/main.yml b/roles/certmgr/tasks/main.yml index a362160..1ee3dfd 100644 --- a/roles/certmgr/tasks/main.yml +++ b/roles/certmgr/tasks/main.yml @@ -1,18 +1,13 @@ --- -- name: Enable backports - apt_repository: repo='deb http://httpredir.debian.org/debian jessie-backports main' state=present - - name: Install dependencies - apt: name={{ item }} state=present + apt: name={{ item }} with_items: - git - python-dateutil + - python-openssl - python-yaml -- name: Install python-openssl - apt: name=python-openssl default_release=jessie-backports state=latest - - name: Install acertmgr git: repo=https://github.com/moepman/acertmgr.git dest=/opt/acertmgr depth=1 version=480337648699cfbe321774dee1d8aa82eb27b626 diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 1bc5e83..fa4b69f 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,10 +1,11 @@ --- - name: Install misc software - apt: name={{ item }} state=present + apt: name={{ item }} with_items: - dnsutils - htop + - less - openssl - pydf - rsync diff --git a/roles/confluence/tasks/main.yml b/roles/confluence/tasks/main.yml index b21aac4..8c4021b 100644 --- a/roles/confluence/tasks/main.yml +++ b/roles/confluence/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install packages - apt: name={{ item }} state=present + apt: name={{ item }} with_items: - postgresql - python-psycopg2 diff --git a/roles/dhcpd/tasks/main.yml b/roles/dhcpd/tasks/main.yml index 507658b..d7fe13a 100644 --- a/roles/dhcpd/tasks/main.yml +++ b/roles/dhcpd/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install dhcp server - apt: name=isc-dhcp-server state=latest + apt: name=isc-dhcp-server - name: Configure dhcp server template: src=dhcpd.conf.j2 dest=/etc/dhcp/dhcpd.conf diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml index 5c18373..4f28942 100644 --- a/roles/dns/tasks/main.yml +++ b/roles/dns/tasks/main.yml @@ -1,10 +1,7 @@ --- -- name: Enable backports - apt_repository: repo='deb http://httpredir.debian.org/debian jessie-backports main' state=present - - name: Install powerdns - apt: name={{ item }} default_release=jessie-backports state=latest + apt: name={{ item }} with_items: # - pdns-server - pdns-recursor diff --git a/roles/exit-ipv4/tasks/main.yml b/roles/exit-ipv4/tasks/main.yml index 4846b66..3401764 100644 --- a/roles/exit-ipv4/tasks/main.yml +++ b/roles/exit-ipv4/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install iptables-persistent - apt: name=iptables-persistent state=present + apt: name=iptables-persistent - name: Enable IPv4 routing sysctl: name=net.ipv4.ip_forward value=1 state=present diff --git a/roles/fastd/tasks/main.yml b/roles/fastd/tasks/main.yml index 13e67ab..1f498d7 100644 --- a/roles/fastd/tasks/main.yml +++ b/roles/fastd/tasks/main.yml @@ -1,10 +1,7 @@ --- -- name: Enable backports - apt_repository: repo='deb http://httpredir.debian.org/debian jessie-backports main' state=present - - name: Install fastd - apt: name=fastd default_release=jessie-backports state=latest + apt: name=fastd state=latest - name: Install haveged (to create entropy) apt: name=haveged diff --git a/roles/mesh-interfaces/tasks/main.yml b/roles/mesh-interfaces/tasks/main.yml index 3447a42..6b99f1b 100644 --- a/roles/mesh-interfaces/tasks/main.yml +++ b/roles/mesh-interfaces/tasks/main.yml @@ -1,13 +1,10 @@ --- -- name: Enable backports - apt_repository: repo='deb http://httpredir.debian.org/debian jessie-backports main' state=present - - name: Install dependencies apt: name=python-pkg-resources - name: Install ifupdown2 - apt: name=ifupdown2 default_release=jessie-backports state=latest + apt: name=ifupdown2 state=latest - name: Uninstall ifupdown apt: name=ifupdown state=absent diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 7862ad3..fa95368 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -1,10 +1,7 @@ --- -- name: Enable backports - apt_repository: repo='deb http://httpredir.debian.org/debian jessie-backports main' state=present - - name: Install nginx - apt: name=nginx-light default_release=jessie-backports state=latest + apt: name=nginx-light state=latest - name: Create certificate directory file: path=/etc/nginx/ssl state=directory mode=0750 diff --git a/roles/ntp/tasks/main.yml b/roles/ntp/tasks/main.yml index b113021..6913b3d 100644 --- a/roles/ntp/tasks/main.yml +++ b/roles/ntp/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install ntp - apt: name=ntp state=present + apt: name=ntp - name: Configure ntp template: src=ntp.conf.j2 dest=/etc/ntp.conf diff --git a/roles/yanic/tasks/main.yml b/roles/yanic/tasks/main.yml index 9de42bf..c55d3be 100644 --- a/roles/yanic/tasks/main.yml +++ b/roles/yanic/tasks/main.yml @@ -29,7 +29,7 @@ service: name=yanic enabled=yes - name: Install system publish unit - template: src={{item}} dest=/lib/systemd/system/{{item}} + template: src={{ item }} dest=/lib/systemd/system/{{ item }} when: yanic_publisher with_items: - yanic-publish.service