Skip to content

Commit 2cd7626

Browse files
committed
Merge branch 'gaelL-master'
2 parents 86dac7a + 0c9670e commit 2cd7626

File tree

5 files changed

+54
-0
lines changed

5 files changed

+54
-0
lines changed

roles/common/tasks/main.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
- name: ensure .ssh directory exists for root user
23
file: dest=/root/.ssh owner=root group=root mode=0755 state=directory
34
- name: add zigzag repo
@@ -28,3 +29,12 @@
2829
- zigzag-base-config
2930
- name: be sure ntpd is running and enabled
3031
service: name=ntp state=running enabled=yes
32+
=======
33+
---
34+
# Common task for all nodes
35+
36+
- include: ssh_keys.yml
37+
- include: repo.yml
38+
- include: packages.yml
39+
- include: ntp.yml
40+
>>>>>>> 76c471a92a3265533ea35ebe00cd10f847179e71

roles/common/tasks/ntp.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
#
3+
4+
- name: be sure ntpd is running and enabled
5+
service: name=ntp state=running enabled=yes

roles/common/tasks/packages.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
# Setup common packages for all nodes
3+
- name: refresh apt cache
4+
apt: update_cache=yes
5+
6+
- name: install base packages
7+
apt: pkg={{item}} state=present
8+
with_items:
9+
- git
10+
- git-core
11+
- curl
12+
- strace
13+
- htop
14+
- tcpdump
15+
- netcat
16+
- screen
17+
- htop
18+
- lsof
19+
- vim
20+
- ncdu
21+
- rsync
22+
- ntp
23+
- zigzag-base-config

roles/common/tasks/repo.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
# Setup common apt repositories for all nodes
3+
4+
- name: add zigzag repo
5+
# useless password
6+
apt_repository: repo='deb http://zigzag:VpR+d52}qv@repo.zigzag.sx wheezy main' mode=644 state=present
7+
8+
- name: add gpg public key for zigzag repo
9+
# useless password
10+
apt_repository: repo='deb http://zigzag:VpR+d52}qv@repo.zigzag.sx wheezy main' mode=644 state=present
11+
apt_key: url=http://zigzag:VpR+d52}qv@repo.zigzag.sx/key/zigzag.pub state=present

roles/common/tasks/ssh_keys.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
#
3+
4+
- name: ensure .ssh directory exists for root user
5+
file: dest=/root/.ssh owner=root group=root mode=0755 state=directory

0 commit comments

Comments
 (0)