Преглед на файлове

Bird is now installed from wheezy-backports when on wheezy, so we get a more recent version

Till Klocke преди 9 години
родител
ревизия
32327a5866
променени са 4 файла, в които са добавени 7 реда и са изтрити 4 реда
  1. 1 1
      roles/bird/tasks/debian.yml
  2. 2 1
      roles/bird/vars/Debian-jessie.yml
  3. 2 1
      roles/bird/vars/Debian-wheezy.yml
  4. 2 1
      roles/bird/vars/Ubuntu-trusty.yml

+ 1 - 1
roles/bird/tasks/debian.yml

@@ -1,2 +1,2 @@
 - name: Install bird routing daemon
-  apt: name=bird state=present
+  apt: name=bird state=present default_release={{bird_default_release}}

+ 2 - 1
roles/bird/vars/Debian-jessie.yml

@@ -1 +1,2 @@
-bird_config_dir: /etc/bird
+bird_config_dir: /etc/bird
+bird_default_release: ""

+ 2 - 1
roles/bird/vars/Debian-wheezy.yml

@@ -1 +1,2 @@
-bird_config_dir: /etc
+bird_config_dir: /etc/bird
+bird_default_release: wheezy-backports

+ 2 - 1
roles/bird/vars/Ubuntu-trusty.yml

@@ -1 +1,2 @@
-bird_config_dir: /etc/bird
+bird_config_dir: /etc/bird
+bird_default_release: ""