salted-rails 0.0.6 → 0.0.7

data/salt/net/ntp.sls

@@ -0,0 +1,6 @@
+
+ntp:
+  pkg.installed:
+    - pkgs:
+      - ntp
+      - ntpdate

data/salt/net/ufw.sls

@@ -0,0 +1,8 @@
+
+ufw:
+  pkg.installed:
+    - pkgs:
+      - ufw
+{%- if 'gui' in pillar['roles'] %}
+      - gufw
+{%- endif %}

data/salt/railsapp/gems.sls

@@ -1,5 +1,5 @@
 include:
-  - lang.ruby
+  - lang.rbenv
 
 tmp_railsapp_gems:
   file.directory:
@@ -9,6 +9,8 @@ tmp_railsapp_gems:
     - group: {{ pillar['username'] }}
     - makedirs: True
     - clean: True
+    - require:
+      - sls: lang.rbenv
 
 railsapp_gems:
   file.recurse:
@@ -17,15 +19,15 @@ railsapp_gems:
     - file_mode: 644
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
+    - exclude_pat: '.*swp'
     - require:
       - file.directory: tmp_railsapp_gems
   cmd.run:
     # Run twice if first fails (weirdness with installing ruby-debug)
-    - name: {{ pillar['homedir'] }}/.rbenv/shims/bundle install || {{ pillar['homedir'] }}/.rbenv/shims/bundle install
+    - name: bundle install || bundle install
     - cwd: /tmp/railsapp_gems
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
     - require:
       - file: railsapp_gems
-      - gem.installed: base_gems
 

data/salt/railsapp/init.sls

@@ -1,7 +1,11 @@
 include:
-  - databases
+  - databases.packages
   - railsapp.packages
+{%- if ('app' in pillar['roles']) %}
+{%- if 'ruby' in pillar['versions'] %}
   - railsapp.gems
-{%- if ('mysql' in pillar['gems']) or ('mysql2' in pillar['gems']) %}
+{%- endif %}
+{%- endif %}
+{%- if ('mysql' in pillar['roles']) %}
   - railsapp.mysql_database
 {%- endif %}

data/salt/scm/bazaar.sls

@@ -0,0 +1,10 @@
+
+bazaar:
+  pkg.installed:
+    - pkgs:
+      - bzr
+      - bzrtools
+{%- if 'gui' in pillar['roles'] %}
+      - qbzr
+      - bzr-explorer
+{%- endif %}

data/salt/scm/git/gitconfig

@@ -0,0 +1,42 @@
+[core]
+  autocrlf=input
+  safecrlf=true
+# Thanks to http://git.or.cz/gitwiki/Aliases
+[alias]
+  ci = commit
+  co = checkout
+  st = status
+  br = branch
+  me = merge
+  # usage: git chmod +x file,...
+  chmod=update-index --chmod
+  staged = diff --cached
+  unstaged = diff
+  both = diff HEAD
+  oneline = log --oneline
+  abbrev = rev-parse --short
+  nmm = branch -a --no-merged master
+  nmr = branch -a --no-merged release_candidate
+  nme = branch -a --no-merged edge
+  merge-no-ff = merge --no-ff
+  edit-unmerged = "!fgit() { git ls-files --unmerged | cut -f2 | sort -u ; }; gvim `fgit`"
+  add-unmerged = "!fgit() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `fgit`"
+[color]
+  branch = auto
+  diff = auto
+  interactive = auto
+  status = auto
+[log]
+  decorate = short
+[gui]
+  spellingdictionary = en_GB
+[push]
+  # later versions have simple - push only the current branch to the one that git pull would pull from (use --all for all branches when pulling or pushing)
+  # git on LTS ubuntu doesn't have it
+  default = matching
+[merge]
+  # Show what we are changing from as well as the two options
+  conflictstyle = diff3
+[diff]
+  # match on unique lines first so we are less likely to get weird diffs matching lines with just braces etc
+  algorithm = patience

data/salt/scm/git/init.sls

@@ -0,0 +1,21 @@
+git:
+  pkg.installed:
+    - pkgs:
+      - git
+{%- if 'gui' in pillar['roles'] %}
+      - git-gui
+      - gitk
+      - qgit
+{%- endif %}
+  file.managed:
+    - source: salt://scm/git/gitconfig
+    - name: {{ pillar['homedir'] }}/.gitconfig
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - template: jinja
+    - replace: false
+    - mode: 644
+    - require:
+      - pkg: git
+
+# consider git-web, but may need to force www.nginx to make sure apache doesnt get loaded

data/salt/scm/init.sls

@@ -0,0 +1,5 @@
+include:
+  - scm.bazaar
+  - scm.git
+  - scm.mercurial
+  - scm.subversion

data/salt/scm/mercurial.sls

@@ -0,0 +1,10 @@
+
+mercurial:
+  pkg.installed:
+    - pkgs:
+      - mercurial
+      - mercurial-git
+{%- if 'gui' in pillar['roles'] %}
+      - qct
+      - hgview
+{%- endif %}

data/salt/scm/subversion.sls

@@ -0,0 +1,6 @@
+
+subversion:
+  pkg.installed:
+    - pkgs:
+      - subversion
+      - subversion-tools

data/salt/{vagrant/top.sls → top.sls}

@@ -1,17 +1,29 @@
 base:
   '*':
     - apt.partner-sources
-    - vagrant.minion
     - apt.unwanted
+    - apt.load_packages
+    - vagrant.minion
     - www.users
-    - sysutils
-    - capistrano/deploy_requirements
+    - utils
+    - crons
+    - net.hosts
+    - net.ntp
+    - net.ufw
+    - scm
     - editors.vim
-    - sysutils.tmux
-{%- if 'app' in pillar['roles'] %}
-    - databases.client
     - lang.ruby
+{%- if ('ruby' in pillar['versions']) %}
+    - lang.rbenv
     - railsapp
+{%- endif %}
+    - lang.php
+{%- if ('php' in pillar['versions']) %}
+    - lang.phpenv
+{%- endif %}
+    #- lang.java # - require if we load jenv or java programs 
+{%- if ('java' in pillar['versions']) %}
+    - lang.jenv
 {%- endif %}
 {%- if 'web' in pillar['roles'] %}
     - www.nginx
@@ -20,13 +32,16 @@ base:
     - databases
 {%- endif %}
 {%- if 'gui' in pillar['roles'] %}
-    - gui.lxde
+    # lxde
+    - gui.desktop
     - gui.x2go
     - editors.gvim
-    - editors.rubymine
     - www.chromium
 {%- endif %}
-{%- if 'teamcity' in pillar['roles'] %}
+{%- if 'rubymine' in pillar['versions'] %}
+    - editors.rubymine
+{%- endif %}
+{%- if 'teamcity' in pillar['versions'] %}
     - ci.teamcity
 {%- endif %}
 {%- if 'cruisecontrolrb' in pillar['roles'] %}

data/salt/utils/file.sls

@@ -0,0 +1,19 @@
+# Optional packages
+file:
+  pkg.installed:
+    - pkgs:
+      - gzip 
+      - unzip 
+      - saidar 
+      - less
+      - meld
+      - p7zip
+      - p7zip-full
+{%- if 'gui' in pillar['roles'] %}
+      - pinta
+{%- endif %}
+      - unrar-free
+      # Available only in later ubuntu releases?
+      #- p7zip-rar
+      #- rar
+      #- unrar

data/salt/utils/html.sls

@@ -0,0 +1,5 @@
+# Optional packages
+html:
+  pkg.installed:
+    - pkgs:
+      - tidy

data/salt/utils/init.sls

@@ -0,0 +1,6 @@
+include:
+  - utils.file
+  - utils.html
+  - utils.net
+  - utils.status
+  - utils.tmux

data/salt/{sysutils → utils}/net.sls

@@ -7,3 +7,7 @@ net:
       - lynx-cur 
       - wget 
       - curl
+{%- if 'gui' in pillar['roles'] %}
+      - filezilla
+{%- endif %}
+

data/salt/utils/tmux/home/tmux-dev

@@ -0,0 +1,7 @@
+# Setup dev environment ...
+selectp -t 0 # select the first (0) pane
+splitw -h -p 50 # split it into two halves
+ 
+selectp -t 1 # select the new, second (1) pane
+splitw -v -p 50 # split it into two halves
+selectp -t 0 # go back to the first pane

data/salt/utils/tmux/home/tmux.conf

@@ -0,0 +1,89 @@
+# Thanks http://lukaszwrobel.pl/blog/tmux-tutorial-split-terminal-windows-easily
+
+# ctrl-A for commads
+unbind C-b
+set -g prefix C-a
+
+# Alt-arrow for switching panes
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+# Highlight active windows
+setw -g monitor-activity on
+set -g visual-activity on
+
+# highlight current windows (with yello)
+set-window-option -g window-status-current-bg yellow
+
+# ctrl-b D - use dev layout
+bind D source-file ~/.tmux/dev
+
+# Thanks http://justinlilly.com/dotfiles/tmux.html
+set -g base-index 1
+
+set -g history-limit 100000
+
+unbind r
+bind-key r source-file ~/.tmux.conf
+unbind S
+bind-key S command-prompt -p ssh: "new-window -n %1 'ssh %1'"
+unbind |
+bind-key | split-window -h
+unbind _
+bind-key _ split-window -v
+
+setw -g aggressive-resize on
+
+set-option -g bell-action any
+set-option -g visual-bell off
+
+set-option -g set-titles on
+set-option -g set-titles-string '#H:#S.#I.#P #W #T' # window number,program name, active(or not)
+
+#setw -g mode-mouse on
+#set-option -g mouse-select-pane on
+
+# Thanks
+# http://tangledhelix.com/blog/2012/07/16/tmux-and-mouse-mode/
+
+set -g mode-mouse on 
+set -g mouse-resize-pane on 
+set -g mouse-select-pane on 
+set -g mouse-select-window on 
+
+# Toggle mouse on with ^B m
+bind m \
+  set -g mode-mouse on \;\
+  set -g mouse-resize-pane on \;\
+  set -g mouse-select-pane on \;\
+  set -g mouse-select-window on \;\
+  display 'Mouse: ON'
+
+# Toggle mouse off with ^B M
+bind M \
+  set -g mode-mouse off \;\
+  set -g mouse-resize-pane off \;\
+  set -g mouse-select-pane off \;\
+  set -g mouse-select-window off \;\
+  display 'Mouse: OFF'
+
+unbind +
+bind + \
+  new-window -d -n tmux-zoom 'clear && echo TMUX ZOOM && read' \;\
+  swap-pane -s tmux-zoom.0 \;\
+  select-window -t tmux-zoom
+
+unbind -
+bind - \
+  last-window \;\
+  swap-pane -s tmux-zoom.0 \;\
+  kill-window -t tmux-zoom 
+
+
+# Thanks http://jasonwryan.com/blog/2011/06/07/copy-and-paste-in-tmux/
+
+unbind p
+bind p paste-buffer
+

data/salt/utils/tmux/init.sls

@@ -0,0 +1,32 @@
+tmux:
+  pkg:
+    - installed
+  file.directory:
+    - name: {{ pillar['homedir'] }}/.tmux
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - mode: 755
+    - require_in:
+      - pkg: tmux
+
+tmux-conf:
+  file.managed:
+    - name: {{ pillar['homedir'] }}/.tmux.conf
+    - source: salt://utils/tmux/home/tmux.conf
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    #- template: jinja
+    - mode: 644
+    - require:
+      - pkg: tmux
+
+tmux-dev:
+  file.managed:
+    - name: {{ pillar['homedir'] }}/.tmux/dev
+    - source: salt://utils/tmux/home/tmux-dev
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    #- template: jinja
+    - mode: 644
+    - require:
+      - file.directory: tmux

data/salt/vagrant/minion.sls

@@ -1,5 +1,5 @@
 minion:
-  file.provision:
+  file.managed:
     - source: salt://vagrant/minion
     - name: /etc/salt/minion
     - mode: 644

data/salt/www/chromium.sls

@@ -1,6 +1,11 @@
+include:
+  - gui.desktop
+
 chromium-browser:
     pkg.installed:
       - names:
         - chromium-browser
         - chromium-codecs-ffmpeg
         - chromium-codecs-ffmpeg-extra
+  - require:
+    - sls: gui.desktop

data/salt/www/nginx/etc/nginx/admin.d/doc.conf

@@ -0,0 +1,7 @@
+
+        location /doc/ {
+                alias /usr/share/doc/;
+                autoindex on;
+                #allow 127.0.0.1;
+                #deny all;
+        }

data/salt/www/nginx/etc/nginx/admin.d/nginx_status.conf

@@ -0,0 +1,7 @@
+location /nginx_status {
+  # copied from http://blog.kovyrin.net/2006/04/29/monitoring-nginx-with-rrdtool/
+  stub_status on;
+  access_log   off;
+  #allow 127.0.0.0/8;
+  #deny all;
+}

data/salt/www/nginx/etc/nginx/sites-available/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!admin.conf