summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-06-19 12:14:26 +0300
committerLars Wirzenius <liw@liw.fi>2016-06-19 12:14:26 +0300
commit70448024d4db336b10eb140e05f8e54813cfa661 (patch)
tree3e0b3f9fa03b040fb912bd16fc3ac1d1ab661db0
parent6faa7d2c32c6f800767ae845eed96e6334fd74a1 (diff)
downloadansibleness-70448024d4db336b10eb140e05f8e54813cfa661.tar.gz
Put colordiff into version-controller
-rw-r--r--ansible/bitcoin.yml1
-rw-r--r--ansible/debians.yml1
-rw-r--r--ansible/exolobe3.yml1
-rw-r--r--ansible/ick.yml1
-rw-r--r--ansible/leonard.yml1
-rw-r--r--ansible/obbench.yml1
-rw-r--r--ansible/roles/liw-usual/tasks/command-line-tools.yml3
-rw-r--r--ansible/roles/version-controller/tasks/main.yml3
-rw-r--r--ansible/servers.yml3
9 files changed, 12 insertions, 3 deletions
diff --git a/ansible/bitcoin.yml b/ansible/bitcoin.yml
index b9aa045..fa0368d 100644
--- a/ansible/bitcoin.yml
+++ b/ansible/bitcoin.yml
@@ -9,6 +9,7 @@
- apt-setup
- basic-setup
- liw-usual
+ - version-controller
- bitcoin-wallet
- apt-upgrade
- users
diff --git a/ansible/debians.yml b/ansible/debians.yml
index 673d174..5355fdc 100644
--- a/ansible/debians.yml
+++ b/ansible/debians.yml
@@ -9,6 +9,7 @@
- sane-debian-system
- code.liw.fi-using-apt
- liw-usual
+ - version-controller
- openstack-client
- ansible
- users
diff --git a/ansible/exolobe3.yml b/ansible/exolobe3.yml
index 0ada101..84f775e 100644
--- a/ansible/exolobe3.yml
+++ b/ansible/exolobe3.yml
@@ -20,6 +20,7 @@
- sane-debian-system
- basic-setup
- liw-usual
+ - version-controller
- local-only-sshd
- intel-wifi
- vmhost
diff --git a/ansible/ick.yml b/ansible/ick.yml
index 850ae49..4ade497 100644
--- a/ansible/ick.yml
+++ b/ansible/ick.yml
@@ -13,6 +13,7 @@
- basic-setup
- apt-upgrade
- liw-usual
+ - version-controller
- python-dev-env
- debian-dev-env
- obnam-dev-env
diff --git a/ansible/leonard.yml b/ansible/leonard.yml
index 6e3959b..4f0cc64 100644
--- a/ansible/leonard.yml
+++ b/ansible/leonard.yml
@@ -21,6 +21,7 @@
- sane-debian-system
- code.liw.fi-using-apt
- liw-usual
+ - version-controller
- liw-devel-system
- version-controller
- obnam-dev-env
diff --git a/ansible/obbench.yml b/ansible/obbench.yml
index e863003..48cddb5 100644
--- a/ansible/obbench.yml
+++ b/ansible/obbench.yml
@@ -13,6 +13,7 @@
- apt-setup
- basic-setup
- liw-usual
+ - version-controller
- python-dev-env
- debian-dev-env
- obnam-dev-env
diff --git a/ansible/roles/liw-usual/tasks/command-line-tools.yml b/ansible/roles/liw-usual/tasks/command-line-tools.yml
index 516a131..cfb13b1 100644
--- a/ansible/roles/liw-usual/tasks/command-line-tools.yml
+++ b/ansible/roles/liw-usual/tasks/command-line-tools.yml
@@ -63,9 +63,6 @@
- name: install yaml-mode
apt: name=yaml-mode
-- name: install colordiff
- apt: name=colordiff
-
- name: install ikiwiki
apt: name=ikiwiki
diff --git a/ansible/roles/version-controller/tasks/main.yml b/ansible/roles/version-controller/tasks/main.yml
index abbf5b1..609a64c 100644
--- a/ansible/roles/version-controller/tasks/main.yml
+++ b/ansible/roles/version-controller/tasks/main.yml
@@ -3,3 +3,6 @@
- name: install mr
apt: name=mr
+
+- name: install colordiff
+ apt: name=colordiff
diff --git a/ansible/servers.yml b/ansible/servers.yml
index 7f0fb7d..4dfa356 100644
--- a/ansible/servers.yml
+++ b/ansible/servers.yml
@@ -13,6 +13,7 @@
- apt-setup
- basic-setup
- liw-usual
+ - version-controller
- apt-upgrade
- users
- nfs-server
@@ -33,6 +34,7 @@
- basic-setup
- apt-setup
- liw-usual
+ - version-controller
- apt-upgrade
- users
- sshforwarder
@@ -52,6 +54,7 @@
- basic-setup
- apt-setup
- liw-usual
+ - version-controller
- apt-upgrade
- users
- sshforwarder