From a0184f7803d339dca9cc7e4354d140c258ca8810 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <elberfeld@web.de> Date: Tue, 11 Oct 2016 19:21:51 +0200 Subject: [PATCH] variablen umstrukturiert --- all/common/tasks/main.yml | 3 ++- group_vars/debianjessie | 9 ++------- host_vars/vorstandspi | 4 ++-- host_vars/webserver | 11 +++++++++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/all/common/tasks/main.yml b/all/common/tasks/main.yml index aa5bfdf7..e54621b2 100644 --- a/all/common/tasks/main.yml +++ b/all/common/tasks/main.yml @@ -17,7 +17,8 @@ url: "{{ item }}" state: present with_items: "{{ debian_keys }}" - + when: debian_keys + - name: set debian repos template: src=sources.list.j2 dest=/etc/apt/sources.list diff --git a/group_vars/debianjessie b/group_vars/debianjessie index 55785109..c1765670 100644 --- a/group_vars/debianjessie +++ b/group_vars/debianjessie @@ -1,10 +1,5 @@ # Gruppen-Spezifishe Variablen -debian_sources: - - "deb http://ftp.halifax.rwth-aachen.de/debian/ jessie main contrib non-free" - - "deb http://security.debian.org/ jessie/updates main contrib non-free" - - "deb http://ftp.de.debian.org/debian/ jessie-updates main" - - "deb http://ftp.halifax.rwth-aachen.de/debian/ jessie-updates main contrib non-free" - - "deb http://apt.dockerproject.org/repo debian-jessie main" - \ No newline at end of file + + diff --git a/host_vars/vorstandspi b/host_vars/vorstandspi index a6b97011..c29b658f 100644 --- a/host_vars/vorstandspi +++ b/host_vars/vorstandspi @@ -3,9 +3,9 @@ debian_sources: - "deb http://mirrordirector.raspbian.org/raspbian/ jessie main contrib non-free rpi" - + administratorenteam: - - "da1l6" + - "ole" - "larsm" - "missinformation" - "sandhome" diff --git a/host_vars/webserver b/host_vars/webserver index 213cacc8..8510edbd 100644 --- a/host_vars/webserver +++ b/host_vars/webserver @@ -1,6 +1,17 @@ # Host spezifische Variablen +debian_sources: + - "deb http://ftp.halifax.rwth-aachen.de/debian/ jessie main contrib non-free" + - "deb http://security.debian.org/ jessie/updates main contrib non-free" + - "deb http://ftp.de.debian.org/debian/ jessie-updates main" + - "deb http://ftp.halifax.rwth-aachen.de/debian/ jessie-updates main contrib non-free" + - "deb http://apt.dockerproject.org/repo debian-jessie main" + +debian_keys: + + administratorenteam: - "void" - "dray" + -- GitLab