Update to handle new roles, random other bits.

ansible.cfg

@@ -169,7 +169,7 @@ nocows = 1
 # By default, this option is disabled to preserve compatibility with
 # sudoers configurations that have requiretty (the default on many distros).
 # 
-#pipelining = False
+pipelining = True
 
 # if True, make ansible use scp if the connection type is ssh 
 # (default is sftp)

data/keys/chris/root/tablet

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKSt966ea9f8ujb1hUbLN/Navb/RAyp5HA3fw/ni97VW7qiq3Ojx2e2XVXN3BppqTpaoPLgYK5QELOZ0xSM2cTBQny4RjD3NgN9gtgHPt0BJOXrrjqeQu15Wujkea6J83wvGKhV8RtDU5wAac13/dcOXGx4OcLva+4CLxutwsMLcKQrbHvvM7RZCEJROGtm5fqtEDWZN9JzTbKuqSRiNNhaSTZeLts2ETergyithr7qFXb/Nr61OPs24bxmOng5EPxa3QqtCbojnxAu1rC20D7622/OuetL01lMq7KiPAVVKr2cqQ4nFh/ekgIFe8GSFkZHRWc/Sg8ElFkvDo7ikAT JuiceSSH

hosts

@@ -20,11 +20,13 @@ niobe.dmdirc.com
 [chris-owned]
 grok.dmdirc.com
 do1.chameth.com
+do2.chameth.com ansible_ssh_host=178.62.0.84
 quark.tenten.chameth.com
 
 [digitalocean]
 grok.dmdirc.com
 do1.chameth.com
+do2.chameth.com
 
 [chris-access:children]
 dmdirc

playbooks/bower.yml

@@ -0,0 +1,11 @@
+---
+# Installs bower (http://bower.io/)
+
+- hosts: all
+  user: root
+  tasks:
+
+    - include: includes/install-nodejs
+
+    - name: install bower
+      npm: global=yes name=bower

playbooks/do1.yml

@@ -0,0 +1,7 @@
+---
+- hosts: do1.chameth.com
+  user: root
+  roles:
+   - { role: sshd, ssh_root_key_glob: '/etc/ansible/data/keys/chris/root/*', ssh_revoked_root_key_glob: '/etc/ansible/data/keys/chris/revoked/*' }
+   - common
+   - java8

playbooks/do2.yml

@@ -0,0 +1,16 @@
+---
+- hosts: do2.chameth.com
+  user: root
+  vars:
+   - teamcity_server_url: 'http://teamcity.dmdirc.com/'
+  roles:
+   - { role: sshd, ssh_root_key_glob: '/etc/ansible/data/keys/chris/root/*', ssh_revoked_root_key_glob: '/etc/ansible/data/keys/chris/revoked/*' }
+   - common
+   - nginx
+   - java8
+   - tapchat
+   - teamcity-agent
+   - dfbnc
+   - mysql
+   - python-dev
+   - uwsgi

playbooks/includes/install-nodejs

@@ -0,0 +1,11 @@
+---
+# Adds a node JS release PPA and installs node.
+
+- include: install-from-ppa
+  vars:
+    ppa: 'ppa:chris-lea/node.js'
+    ppa_mint: 'deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu raring main'
+    package: 'nodejs'
+
+- name: install npm
+  apt: pkg=npm force=yes

roles

@@ -1 +1 @@
-Subproject commit f1e7a1d3205eb329287e267748fcc98bd8ddd648
+Subproject commit 764e771ee618abd621e35292f1bdd52b6f58b687