Browse Source

Small fixes in common roles

Markus Lindenberg 9 years ago
parent
commit
3422dfcc69

+ 3 - 1
roles/common-repos/tasks/main.yml

@@ -1,8 +1,10 @@
 ---
 
 - name: Ensure deb-src ist disabled in sources.list
-  replace: dest=/etc/apt/sources.list regexp='^(deb-src .*)$' replace='#\1' backup=yes
+  replace: dest=/etc/apt/sources.list regexp='^(deb-src .*)$' replace='#\1'
 
+- name: Ensure lsb-release is installed
+  apt: name=lsb-release
 - name: Ensure Debian backports repository is installed
   apt_repository: repo='deb http://ftp.de.debian.org/debian {{ ansible_lsb.codename|lower }}-backports main'
 

+ 1 - 1
roles/common-system/tasks/kernel.yml

@@ -1,4 +1,4 @@
 ---
 
 - name: Ensure latest backports kernel is installed
-  apt: name=linux-image-amd64 default_release={{ ansible_lsb.codename|lower }}-backports install_recommends=no
+  apt: name=linux-image-amd64 state=latest default_release={{ ansible_lsb.codename|lower }}-backports install_recommends=no

+ 4 - 3
roles/mesh-routing/tasks/bird.yml

@@ -12,17 +12,17 @@
   apt: name=bird install_recommends=no
 
 - name: Ensure bird include dirs exists
-  file: name={{bird_config_dir}}/{{item}} state=directory
+  file: name=/etc/bird/{{item}} state=directory
   with_items:
     - conf.d
     - conf6.d
 
 - name: Install bird.conf
-  template: src=bird.conf.j2 dest={{bird_config_dir}}/bird.conf
+  template: src=bird.conf.j2 dest=/etc/bird/bird.conf
   notify: Reload bird daemons
 
 - name: Install bird6.conf
-  template: src=bird6.conf.j2 dest={{bird_config_dir}}/bird6.conf
+  template: src=bird6.conf.j2 dest=/etc/bird/bird6.conf
   notify: Reload bird daemons
 
 - name: Enable and start bird and bird6
@@ -30,3 +30,4 @@
   with_items:
     - bird
     - bird6
+