From 5347be5fc133660053a0dd57c8aaa9a2aa45a1ff Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sun, 10 Jan 2016 22:30:37 +0100 Subject: [PATCH] Add glenuxnet apt.conf (set to basesystem target). --- handlers/main.yml | 3 +++ tasks/main.yml | 35 ++++++++++++++++++++++++++++ templates/apt_conf_glenuxnet_base.j2 | 13 +++++++++++ 3 files changed, 51 insertions(+) create mode 100644 templates/apt_conf_glenuxnet_base.j2 diff --git a/handlers/main.yml b/handlers/main.yml index aba17ba..30e842b 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,5 @@ --- # handlers file for glenux.basesystem +- name: Update APT cache + apt: update_cache=yes + diff --git a/tasks/main.yml b/tasks/main.yml index 3804f89..ebcfbb5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,38 @@ --- + +- template: + src=apt_conf_glenuxnet_base.j2 + dest=/etc/apt/apt.conf.d/00glenuxnet_base + owner=root + group=root + mode=0644 + +# Debian normal +- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ stable main contrib non-free' state=present + notify: ['Update APT cache'] +- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ stable main contrib non-free' state=present + notify: ['Update APT cache'] + +- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ testing main contrib non-free' state=present + notify: ['Update APT cache'] +- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ testing main contrib non-free' state=present + notify: ['Update APT cache'] + +- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ unstable main contrib non-free' state=present + notify: ['Update APT cache'] +- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ unstable main contrib non-free' state=present + notify: ['Update APT cache'] + +# Debian security +- apt_repository: repo='deb http://security.debian.org/ stable/updates main contrib non-free' state=present + notify: ['Update APT cache'] +- apt_repository: repo='deb-src http://security.debian.org/ stable/updates main contrib non-free' state=present + notify: ['Update APT cache'] + +# Debian stable-update (ex-volatile) +- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ stable-updates main contrib non-free' state=present +- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ stable-updates main contrib non-free' state=present + - include: system.yml - include: desktop.yml - include: shopping.yml @@ -8,3 +42,4 @@ - include: office.yml - include: security.yml - include: shell.yml + diff --git a/templates/apt_conf_glenuxnet_base.j2 b/templates/apt_conf_glenuxnet_base.j2 new file mode 100644 index 0000000..e419598 --- /dev/null +++ b/templates/apt_conf_glenuxnet_base.j2 @@ -0,0 +1,13 @@ +Apt::Default-Release "{{ basesystem_release }}"; + +APT +{ + Architecture "{{ basesystem_arch }}"; + + Get + { + Assume-Yes "false"; + Fix-Broken "true"; + AllowUnauthenticated "false"; + }; +};