From 6655c01c18f59766502bb86523c4d5a4418c3e4b Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <christian.elberfeld@adesso.de>
Date: Sun, 2 Dec 2018 20:46:38 +0100
Subject: [PATCH] apt-task syntax updated
---
all/common/tasks/main.yml | 20 +++++++++++---------
common/borgbackup/tasks/main.yml | 13 +++++++------
common/borgserver/tasks/main.yml | 7 ++++---
common/docker/tasks/main.yml | 20 +++++++++++---------
common/telegraf/tasks/main.yml | 18 ++++++++++--------
vorstand/git/tasks/main.yml | 7 ++++---
vorstand/jameica/tasks/main.yml | 13 +++++++------
vorstand/x2goserver/tasks/main.yml | 10 ++++++----
warphab/homegear/tasks/main.yml | 13 +++++++------
warphab/openhab/tasks/main.yml | 9 +++++----
warpsrvint/nginx/tasks/main.yml | 11 ++++++-----
webserver/nginx/tasks/main.yml | 23 ++++++++++++-----------
webserver/openvpn/tasks/main.yml | 7 ++++---
13 files changed, 94 insertions(+), 77 deletions(-)
diff --git a/all/common/tasks/main.yml b/all/common/tasks/main.yml
index 2b462f99..24d3070f 100644
--- a/all/common/tasks/main.yml
+++ b/all/common/tasks/main.yml
@@ -6,11 +6,12 @@
- name: install apt-transport-https packages before adding sources
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - apt-transport-https
+ vars:
+ packages:
+ - apt-transport-https
- name: add debian repo keys (id)
apt_key:
@@ -31,14 +32,15 @@
- name: install common packages
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - vim
- - wget
- - psmisc
- - tree
+ vars:
+ packages:
+ - vim
+ - wget
+ - psmisc
+ - tree
- name: deploy sshd config
template: src=sshd_config.j2 dest=/etc/ssh/sshd_config
diff --git a/common/borgbackup/tasks/main.yml b/common/borgbackup/tasks/main.yml
index 48cbf113..fa986d95 100644
--- a/common/borgbackup/tasks/main.yml
+++ b/common/borgbackup/tasks/main.yml
@@ -2,14 +2,15 @@
# Pakete installieren
- name: pakete installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - borgbackup
- - logrotate
- - moreutils
- - openssl
+ vars:
+ packages:
+ - borgbackup
+ - logrotate
+ - moreutils
+ - openssl
- name: create directory
file:
diff --git a/common/borgserver/tasks/main.yml b/common/borgserver/tasks/main.yml
index be7ada43..274f1916 100644
--- a/common/borgserver/tasks/main.yml
+++ b/common/borgserver/tasks/main.yml
@@ -2,11 +2,12 @@
# Pakete installieren
- name: pakete installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - borgbackup
+ vars:
+ packages:
+ - borgbackup
# User for private backups
- name: create backup user account
diff --git a/common/docker/tasks/main.yml b/common/docker/tasks/main.yml
index 797d8e3d..8dd5fe0b 100644
--- a/common/docker/tasks/main.yml
+++ b/common/docker/tasks/main.yml
@@ -2,13 +2,14 @@
- name: install deb packages
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - docker-ce
- - python
- - python-pip
+ vars:
+ packages:
+ - docker-ce
+ - python
+ - python-pip
- name: uninstall pip packages
pip:
@@ -17,9 +18,10 @@
- name: install pip packages
pip:
- name: "{{ item }}"
+ name: "{{ packages }}"
state: present
- with_items:
- - docker
- - docker-compose
+ vars:
+ packages:
+ - docker
+ - docker-compose
diff --git a/common/telegraf/tasks/main.yml b/common/telegraf/tasks/main.yml
index a20dbc13..d0f5c52d 100644
--- a/common/telegraf/tasks/main.yml
+++ b/common/telegraf/tasks/main.yml
@@ -2,21 +2,23 @@
# Pakete installieren
- name: pakete installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - telegraf
+ vars:
+ packages:
+ - telegraf
- name: pakete installieren (host_type = physical)
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - hddtemp
- - lm-sensors
- - smartmontools
+ vars:
+ packages:
+ - hddtemp
+ - lm-sensors
+ - smartmontools
when: host_type == 'physical'
diff --git a/vorstand/git/tasks/main.yml b/vorstand/git/tasks/main.yml
index 74b1d5a6..588f0f3d 100644
--- a/vorstand/git/tasks/main.yml
+++ b/vorstand/git/tasks/main.yml
@@ -3,11 +3,12 @@
# Pakete installieren
- name: git installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - git
+ vars:
+ packages:
+ - git
# Git Repo für Verwaltungsdaaten
diff --git a/vorstand/jameica/tasks/main.yml b/vorstand/jameica/tasks/main.yml
index 0f9f69e9..14b139f1 100644
--- a/vorstand/jameica/tasks/main.yml
+++ b/vorstand/jameica/tasks/main.yml
@@ -2,13 +2,14 @@
# Pakete installieren
- name: notwendige pakete installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
- state: installed
- with_items:
- - python
- - python-mysqldb
- - openjdk-8-jre
+ state: present
+ vars:
+ packages:
+ - python
+ - python-mysqldb
+ - openjdk-8-jre
# Get secrets
- include: ../functions/get_secret.yml
diff --git a/vorstand/x2goserver/tasks/main.yml b/vorstand/x2goserver/tasks/main.yml
index a8eeb4a1..4ec234c4 100644
--- a/vorstand/x2goserver/tasks/main.yml
+++ b/vorstand/x2goserver/tasks/main.yml
@@ -1,8 +1,10 @@
- name: install X2go Server
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
- state: installed
- with_items:
- - x2goserver
+ state: present
+ vars:
+ packages:
+ - x2goserver
+
diff --git a/warphab/homegear/tasks/main.yml b/warphab/homegear/tasks/main.yml
index 06f52192..300a8765 100644
--- a/warphab/homegear/tasks/main.yml
+++ b/warphab/homegear/tasks/main.yml
@@ -3,15 +3,16 @@
# Pakete für homegear und Nodejs installieren
- name: install packages
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - homegear
- - homegear-max
- - nodejs
- - npm
notify: restart homegear
+ vars:
+ packages:
+ - homegear
+ - homegear-max
+ - nodejs
+ - npm
# Homematic Manager über npm Installieren
# Der Homematic Manager ist nicht als Systemdienst installiert
diff --git a/warphab/openhab/tasks/main.yml b/warphab/openhab/tasks/main.yml
index dc7e0ad6..2319e24d 100644
--- a/warphab/openhab/tasks/main.yml
+++ b/warphab/openhab/tasks/main.yml
@@ -2,13 +2,14 @@
- name: install packages
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - oracle-java8-jdk
- - openhab2-offline
notify: restart openhab
+ vars:
+ packages:
+ - oracle-java8-jdk
+ - openhab2-offline
- name: enable service
service:
diff --git a/warpsrvint/nginx/tasks/main.yml b/warpsrvint/nginx/tasks/main.yml
index 33e39386..a7371889 100644
--- a/warpsrvint/nginx/tasks/main.yml
+++ b/warpsrvint/nginx/tasks/main.yml
@@ -1,13 +1,14 @@
# Pakete installieren
- name: nginx installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - nginx
- - git
- - openssl
+ vars:
+ packages:
+ - nginx
+ - git
+ - openssl
- name: nginx default Konfig entfernen
file:
diff --git a/webserver/nginx/tasks/main.yml b/webserver/nginx/tasks/main.yml
index 35a2d6b2..2e9f0588 100644
--- a/webserver/nginx/tasks/main.yml
+++ b/webserver/nginx/tasks/main.yml
@@ -1,19 +1,20 @@
# Pakete installieren
- name: nginx installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - nginx
- - git
- - ca-certificates
- - gcc
- - libssl-dev
- - libffi-dev
- - python
- - python-dev
- - virtualenv
+ vars:
+ packages:
+ - nginx
+ - git
+ - ca-certificates
+ - gcc
+ - libssl-dev
+ - libffi-dev
+ - python
+ - python-dev
+ - virtualenv
- name: nginx default Konfig entfernen
file:
diff --git a/webserver/openvpn/tasks/main.yml b/webserver/openvpn/tasks/main.yml
index 153f2794..9e78e87c 100644
--- a/webserver/openvpn/tasks/main.yml
+++ b/webserver/openvpn/tasks/main.yml
@@ -1,11 +1,12 @@
# Pakete installieren
- name: openvpn installieren
apt:
- pkg: "{{ item }}"
+ name: "{{ packages }}"
update_cache: yes
state: present
- with_items:
- - openvpn
+ vars:
+ packages:
+ - openvpn
# Log-Verzeichnis erstellen
--
GitLab