Separate local, remote, and vagrant environments

...into different playbooks and scripts.

dot - sets up local environment
dot-remote - sets up remote environments
vdot - sets up vagrant test environment

README.md

@@ -34,6 +34,7 @@ $ git clone https://github.com/asmacdo/dotfiles.git ~/dotfiles
 $ cd ~/dotfiles
 ```
 
+
 Copy local variables file.
 
 ```bash
@@ -64,6 +65,15 @@ $ cd ~/dotfiles
 $ git pull
 ```
 
+commands
+--------
+
+There are three main commands in the `bin` directory for setting up and updating development environments:
+
+- `dot`: sets up local environment.
+- `dot-remote`: sets up remote environments.
+- `vdot`: sets up vagrant environments.
+
 special files
 -------------
 
@@ -75,6 +85,28 @@ All configuration is done in `~/dotfiles`. Each role may contain (in addition to
 notes
 -----
 
+**zsh on Mac OSX**
+
+In order for zsh to work on OSX, you may need to add `/usr/local/bin/zsh` to your `/etc/shells`
+
+
+`/etc/shells` should look something like this:
+
+```
+# List of acceptable shells for chpass(1).
+# Ftpd will not allow users to connect who are not using
+# one of these shells.
+
+/bin/bash
+/bin/csh
+/bin/ksh
+/bin/sh
+/bin/tcsh
+/bin/zsh
+# Add this
+/usr/local/bin/zsh
+```
+
 **fonts**
 
 To install fonts on OSX, simply drag the `.ttf` files in `misc/fonts` directory onto the Font Book application.
@@ -112,14 +144,14 @@ Update the following variables in `group_vars/remote`:
 - `git_email` : Your git email.
 
 
-Then run the `dot` command.
+Then run the `dot-remote` command.
 
 ```bash
-$ ./bin/dot
+$ ./bin/dot-remote
 ```
 
 todo
 ----
 
 - Full Debian and Red Hat support
-- Support for getting a minimal environment on remote servers
+- Add more options to `dot` script, e.g. for skipping tasks

bin/dot

@@ -1 +1,2 @@
-ansible-playbook -i ~/dotfiles/hosts ~/dotfiles/dot.yml --ask-sudo-pass
+echo "Setting up local dev enviroment"
+ansible-playbook -i ~/dotfiles/hosts ~/dotfiles/local_env.yml

bin/dot-remote

@@ -0,0 +1,2 @@
+echo "Setting up remote development enviroments"
+ansible-playbook -i ~/dotfiles/hosts ~/dotfiles/remote_env.yml

bin/vdot

@@ -1 +1,2 @@
-ansible-playbook dot.yml -i vagranthosts -u vagrant --ask-sudo-pass --private-key=~/.vagrant.d/insecure_private_key -l remote -U vagrant
+echo "Setting up vagrant test enviroment"
+ansible-playbook remote_env.yml -i vagranthosts -u vagrant --ask-sudo-pass --private-key=~/.vagrant.d/insecure_private_key -l remote -U vagrant

group_vars/vagrant

@@ -0,0 +1,7 @@
+# vi: set ft=yaml :
+
+dotfiles_user_home: /home/vagrant
+dotfiles_home: "{{dotfiles_user_home}}/dotfiles"
+
+git_user: vagrant
+git_email: [email protected]

hosts

@@ -5,4 +5,3 @@ localhost
 ansible_connection=local
 
 [remote]
-

local_env.yml

@@ -0,0 +1,19 @@
+- name: Collecting Facts
+  hosts: local
+  gather_facts: yes
+
+- name: Set up local development environment
+  hosts: local
+  roles:
+    - git
+    - package_manager
+    - zsh
+    - vim
+    - python
+    - hub
+    - autojump
+    - autoenv
+    - ag
+    - tmux
+    - {role: osx, when: ansible_os_family == "Darwin"}
+

dot.yml → remote_env.yml

@@ -1,22 +1,8 @@
+
 - name: Collecting Facts
-  hosts: all
+  hosts: remote
   gather_facts: yes
 
-- name: Set up local development environment
-  hosts: local
-  roles:
-    - git
-    - package_manager
-    - zsh
-    - vim
-    - python
-    - hub
-    - autojump
-    - autoenv
-    - ag
-    - tmux
-    - {role: osx, when: ansible_os_family == "Darwin"}
-
 - name: Set up remote dev environments (clone)
   hosts: remote
   tasks:

roles/vim/defaults/main.yml

@@ -4,3 +4,6 @@ vim_install_plugins: no
 
 # Only used on OSX machines. Ignored on other platforms
 vim_install_macvim: yes
+
+# Only install a minimal subset of the full vimrc (e.g. for remote servers)
+vim_minimal: no

roles/zsh/tasks/osx.yml

@@ -3,16 +3,5 @@
 - name: Make sure zsh is installed
   homebrew: name=zsh state=latest
 
-# http://zanshin.net/2013/09/03/how-to-use-homebrew-zsh-instead-of-max-os-x-default/
-- name: Add zsh to /etc/shells
-  lineinfile:
-    line: /usr/local/bin/zsh
-    dest: /etc/shells
-    state: present
-  register: zsh_shells
-  sudo: yes
-
 - name: Change default shell to zsh
   command: chsh -s /usr/local/bin/zsh
-  # Only run this if above task was changed
-  when: zsh_shells.changed

vagranthosts

@@ -1,9 +1,6 @@
 # Test ubuntu and fedora boxes
-[remote]
+[vagrant]
 192.168.111.227
 
-[remote:vars]
-dotfiles_user_home=/home/vagrant
-dotfiles_home="{{dotfiles_user_home}}/dotfiles"
-git_user=vagrant
-[email protected]
+[remote:children]
+vagrant