Merge branch 'contrib' into 'newinfra'

[server] Add contrib to debian components

See merge request nounous/ansible!147

group_vars/crans_server/vars.yml

@@ -7,7 +7,7 @@ ldap:
 # Parameters for debian and ubuntu mirror
 debian_mirror: http://mirror.adm.crans.org/debian
 ubuntu_mirror: http://mirror.adm.crans.org/ubuntu
-debian_components: main non-free
+debian_components: main contrib non-free
 ubuntu_components: main restricted universe multiverse
 
 glob_borg:
@@ -23,4 +23,4 @@ glob_borg:
   consistency_check:
     - disabled
   extra_init:
-    - make-parent-dirs
+    - make-parent-dirs