Made quite a bit of progress on application specific playbooks as well as flow and structure.

2013-04-15 17:00:01 -07:00 · 2013-04-15 17:00:01 -07:00 · 6617e8c3ad
commit 6617e8c3ad
parent 4adb679c0a
23 changed files with 111 additions and 42 deletions
--- a/appcleaner/appcleaner.yaml
+++ b/appcleaner/appcleaner.yaml
@ -0,0 +1,15 @@
+---
+- hosts: $hosts
+  user: $user
+  sudo: yes
+  vars:
+    app_name: AppCleaner
+    app_name_pretty: AppCleaner
+    app_url: http://www.freemacsoft.net/downloads/AppCleaner_2.1.zip
+    installer_type: app
+    install_method: zip
+  vars_files:
+    - ../setup-vars.yaml
+  tasks:
+    - include: ../setup.yaml
+    - include: ../install/$install_method.yaml
--- a/applications.yaml
+++ b/applications.yaml
@ -1,4 +1,8 @@
 ---
 - include: vlc/vlc.yaml
 - include: transmission/transmission.yaml
- include: iterm/iterm.yaml
+- include: appcleaner/appcleaner.yaml
+- include: keka/keka.yaml
+- include: limechat/limechat.yaml
+- include: firefox/firefox.yaml
+- include: opera/opera.yaml
--- a/firefox/firefox.yaml
+++ b/firefox/firefox.yaml
@ -0,0 +1,16 @@
+---
+- hosts: $hosts
+  user: $user
+  sudo: yes
+  vars:
+    app_name: Firefox
+    app_name_pretty: Firefox
+    app_url: https://download.mozilla.org/?product=firefox-20.0&os=osx&lang=en-US
+    installer_type: app
+    install_method: dmg
+    mount_path: /Volumes/Firefox/
+  vars_files:
+    - ../setup-vars.yaml
+  tasks:
+   - include: ../setup.yaml
+   - include: ../install/$install_method.yaml
--- a/install-type/app.yaml
+++ b/install-type/app.yaml
--- a/install-type/dmg.yaml
+++ b/install-type/dmg.yaml
@ -5,9 +5,9 @@
  command: hdiutil mount $app_name.dmg chdir=$downloads
 - name: Copy $app_name_pretty app to Applications directory
  command: cp -R ${mount_path}$app_name.app /Applications
-  when_string: $install_type == 'app'
+  when_string: $installer_type == 'app'
 - name: Install $app_name pkg
  command: sudo installer -package ${mount_path}$app_name.pkg -target $install_target
-  when_string: $install_type == 'pkg'
+  when_string: $installer_type == 'pkg'
 - name: Unmount $app_name_pretty image
  command: hdiutil unmount $mount_path
--- a/install-type/homebrew.yaml
+++ b/install-type/homebrew.yaml
@ -1,3 +1,3 @@
 ---
- name: Installing $app_name_pretty
+- name: Install $app_name_pretty via Homebrew
  homebrew: name=$app_name state=installed update_homebrew=yes
--- a/install-type/lzma.yaml
+++ b/install-type/lzma.yaml
--- a/install-type/pkg.yaml
+++ b/install-type/pkg.yaml
--- a/install-type/tar.yaml
+++ b/install-type/tar.yaml
@ -7,9 +7,9 @@
  command: tar xf $app_name.tar -C $app_name/ chdir=$downloads
 - name: Copy $app_name_pretty app to Applications directory
  command: cp -R $app_name/$app_name.app /Applications chdir=$downloads
-  when_string: $install_type == 'app'
+  when_string: $installer_type == 'app'
 - name: Install $app_name pkg
  command: sudo installer -package $app_name/$app_name.pkg -target $install_target chdir=$downloads
-  when_string: $install_type == 'pkg'
+  when_string: $installer_type == 'pkg'
 - name: Remove extraction directory
  file: path=${downloads}${app_name}/ state=absent
--- a/install-type/zip.yaml
+++ b/install-type/zip.yaml
@ -7,9 +7,9 @@
  command: unzip $app_name.zip -d $app_name/ chdir=$downloads
 - name: Copy $app_name_pretty app to Applications directory
  command: cp -R $app_name/$app_name.app /Applications chdir=$downloads
-  when_string: $install_type == 'app'
+  when_string: $installer_type == 'app'
 - name: Install $app_name pkg
  command: sudo installer -package $app_name/$app_name.pkg -target $install_target chdir=$downloads
-  when_string: $install_type == 'pkg'
+  when_string: $installer_type == 'pkg'
 - name: Remove extraction directory
  file: path=${downloads}${app_name}/ state=absent
--- a/iterm/iterm.yaml
+++ b/iterm/iterm.yaml
@ -4,11 +4,12 @@
 - hosts: $hosts
  user: $user
  vars:
-    install_type: app
    app_name: iTerm
    app_name_pretty: iTerm
    app_url: https://copy.com/HTIIPAwoiKVY
+    installer_type: app
+    install_method: zip
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/zip.yaml
+    - include: ../install/$install_method.yaml
--- a/keka/keka.yaml
+++ b/keka/keka.yaml
@ -0,0 +1,16 @@
+---
+- hosts: $hosts
+  user: $user
+  sudo: yes
+  vars:
+    app_name: Keka
+    app_name_pretty: Keka
+    app_url: http://download.kekaosx.com/
+    installer_type: app
+    install_method: dmg
+    mount_path: /Volumes/Keka/
+  vars_files:
+    - ../setup-vars.yaml
+  tasks:
+    - include: ../setup.yaml
+    - include: ../install/$install_method.yaml
--- a/limechat/limechat.yaml
+++ b/limechat/limechat.yaml
@ -1,15 +1,15 @@
 ---
- include: ../setup.yaml
-
 - hosts: $hosts
  user: $user
-  gather_facts: false
+  sudo: yes
  vars:
-    install_type: app
    app_name: LimeChat
    app_name_pretty: LimeChat
    app_url: https://downloads.sourceforge.net/project/limechat/limechat/LimeChat_2.34.tbz?use_mirror=master
+    installer_type: app
+    install_method: tar
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/tar.yaml
+    - include: ../setup.yaml
+    - include: ../install/$install_method.yaml
--- a/opera/opera.yaml
+++ b/opera/opera.yaml
@ -0,0 +1,16 @@
+---
+- hosts: $hosts
+  user: $user
+  sudo: yes
+  vars:
+    app_name: Opera
+    app_name_pretty: Opera
+    app_url: http://www.opera.com/download/get/?partner=www&opsys=MacOS
+    installer_type: app
+    install_method: dmg
+    mount_path: /Volumes/Opera/
+  vars_files:
+    - ../setup-vars.yaml
+  tasks:
+    - include: ../setup.yaml
+    - include: ../install/$install_method.yaml
--- a/setup.yaml
+++ b/setup.yaml
@ -1,9 +1,3 @@
 ---
- hosts: $hosts
-  user: $user
-  sudo: yes
-  vars_files:
-    - setup-vars.yaml
-  tasks:
-    - name: Create Ansible downloads directory
-      file: path=$downloads state=directory
+- name: Create Ansible downloads directory
+  file: path=$downloads state=directory
--- a/sourcetree/sourcetree.yaml
+++ b/sourcetree/sourcetree.yaml
@ -5,12 +5,13 @@
  user: $user
  gather_facts: false
  vars:
-    install_type: app
    app_name: SourceTree
    app_name_pretty: SourceTree
    app_url: https://copy.com/RDxUBW9uhWiQ/SourceTree-1.5.8.dmg?download=1
+    installer_type: app
+    install_method: dmg
    mount_path: /Volumes/SourceTree/
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/dmg.yaml
+    - include: ../install/$install_method.yaml
--- a/sublime-text/sublime-text.yaml
+++ b/sublime-text/sublime-text.yaml
@ -4,15 +4,16 @@
 - hosts: $hosts
  user: $user
  vars:
-    install_type: app
    app_name: Sublime\ Text
    app_name_pretty: Sublime\ Text
    app_url: http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20Build%203021.dmg
+    installer_type: app
+    install_method: dmg
    mount_path: /Volumes/Sublime\ Text/
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/dmg.yaml
+    - include: ../install/$install_method.yaml
    - name: Create symlink subl for Sublime Text's subl command
      file: src=/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl dest=/usr/bin/subl state=link
    - name: Create symlink sublime for Sublime Text's subl command
--- a/transmission/transmission.yaml
+++ b/transmission/transmission.yaml
@ -1,15 +1,16 @@
 ---
- include: ../setup.yaml
-
 - hosts: $hosts
  user: $user
+  sudo: yes
  vars:
-    install_type: app
    app_name: Transmission
    app_name_pretty: Transmission
    app_url: https://copy.com/jTqaA0JWmTmn/Transmission-2.77.dmg?download=1
+    installer_type: app
+    install_method: dmg
    mount_path: /Volumes/Transmission/
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/dmg.yaml
+    - include: ../setup.yaml
+    - include: ../install/$install_method.yaml
--- a/tree/tree.yaml
+++ b/tree/tree.yaml
@ -6,7 +6,8 @@
  vars:
    app_name: tree
    app_name_pretty: tree
+    install_method: homebrew
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/homebrew.yaml
+    - include: ../install/$install_method.yaml
--- a/trim-enabler/trim-enabler.yaml
+++ b/trim-enabler/trim-enabler.yaml
--- a/vagrant/vagrant.yaml
+++ b/vagrant/vagrant.yaml
@ -4,13 +4,14 @@
 - hosts: $hosts
  user: $user
  vars:
-    install_type: pkg
-    install_target: /Volumes/OSX
    app_name: Vagrant
    app_name_pretty: Vagrant
    app_url: http://files.vagrantup.com/packages/64e360814c3ad960d810456add977fd4c7d47ce6/Vagrant.dmg
+    installer_type: pkg
+    install_method: dmg
+    install_target: /Volumes/OSX
    mount_path: /Volumes/Vagrant/
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/dmg.pkg
+    - include: ../install/$install_method.pkg
--- a/virtualbox/virtualbox.yaml
+++ b/virtualbox/virtualbox.yaml
@ -4,13 +4,14 @@
 - hosts: $hosts
  user: $user
  vars:
-    install_type: pkg
-    install_target: /Volumes/OSX
    app_name: VirtualBox
    app_name_pretty: VirtualBox
    app_url: http://download.virtualbox.org/virtualbox/4.2.12/VirtualBox-4.2.12-84980-OSX.dmg
    mount_path: /Volumes/VirtualBox/
+    installer_type: pkg
+    install_method: dmg
+    install_target: /Volumes/OSX
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/dmg.yaml
+    - include: ../install/$install_method.yaml
--- a/vlc/vlc.yaml
+++ b/vlc/vlc.yaml
@ -1,15 +1,16 @@
 ---
- include: ../setup.yaml
-
 - hosts: $hosts
  user: $user
+  sudo: yes
  vars:
-    install_type: app
    app_name: VLC
    app_name_pretty: VLC
    app_url: https://copy.com/8WKZ3x1ZWOIC/VLC-2.0.6.dmg?download=1
+    installer_type: app
+    install_method: dmg
    mount_path: /Volumes/vlc-2.0.6/
  vars_files:
    - ../setup-vars.yaml
  tasks:
-    - include: ../install-type/dmg.yaml
+    - include: ../setup.yaml
+    - include: ../install/$install_method.yaml