From 0b318d457101a98a593e000cc0e628459a41c8f7 Mon Sep 17 00:00:00 2001 From: Jack Ivanov Date: Wed, 3 May 2017 22:03:10 +0200 Subject: [PATCH] Get strongswan from the Zesty repo on Xenial (#515) --- roles/vpn/tasks/ubuntu-hacks.yml | 14 ++++++++++++++ roles/vpn/tasks/ubuntu.yml | 3 +++ roles/vpn/templates/01_strongswan.pref.j2 | 3 +++ roles/vpn/templates/01_xenial_aptconf.j2 | 1 + 4 files changed, 21 insertions(+) create mode 100644 roles/vpn/tasks/ubuntu-hacks.yml create mode 100644 roles/vpn/templates/01_strongswan.pref.j2 create mode 100644 roles/vpn/templates/01_xenial_aptconf.j2 diff --git a/roles/vpn/tasks/ubuntu-hacks.yml b/roles/vpn/tasks/ubuntu-hacks.yml new file mode 100644 index 00000000..fbe2cbc7 --- /dev/null +++ b/roles/vpn/tasks/ubuntu-hacks.yml @@ -0,0 +1,14 @@ +--- + +- name: Configure apt to use the Xenial release by default + template: src=01_xenial_aptconf.j2 dest=/etc/apt/apt.conf.d/01xenial + +- name: Configure packages preferences + template: src=01_strongswan.pref.j2 dest=/etc/apt/preferences.d/01_strongswan.pref + +- name: Configure the Ubuntu Zesty repository + apt_repository: + repo: deb http://mirrors.kernel.org/ubuntu/ zesty main + state: present + filename: 'zesty' + update_cache: yes diff --git a/roles/vpn/tasks/ubuntu.yml b/roles/vpn/tasks/ubuntu.yml index 4856a97c..971d905e 100644 --- a/roles/vpn/tasks/ubuntu.yml +++ b/roles/vpn/tasks/ubuntu.yml @@ -3,6 +3,9 @@ - set_fact: strongswan_additional_plugins: [] +- include: ubuntu-hacks.yml + when: ansible_distribution_version == "16.04" + - name: Ubuntu | Install strongSwan apt: name=strongswan state=latest update_cache=yes install_recommends=yes diff --git a/roles/vpn/templates/01_strongswan.pref.j2 b/roles/vpn/templates/01_strongswan.pref.j2 new file mode 100644 index 00000000..3249758f --- /dev/null +++ b/roles/vpn/templates/01_strongswan.pref.j2 @@ -0,0 +1,3 @@ +Package: *strongswan* +Pin: release n=zesty +Pin-Priority: 9000 diff --git a/roles/vpn/templates/01_xenial_aptconf.j2 b/roles/vpn/templates/01_xenial_aptconf.j2 new file mode 100644 index 00000000..c589ffcd --- /dev/null +++ b/roles/vpn/templates/01_xenial_aptconf.j2 @@ -0,0 +1 @@ +APT::Default-Release "xenial";