salted-rails 0.0.6 → 0.0.7

data/salt/editors/vim/vimrc

@@ -1,4 +1,11 @@
-" source $VIMRUNTIME/mswin.vim
+execute pathogen#infect()
+
+map <C-n> :NERDTreeToggle<CR>
+" open a NERDTree automatically when vim starts up if no files were specified
+" autocmd vimenter * if !argc() | NERDTree | endif
+"
+source $VIMRUNTIME/mswin.vim
+
 if has("gui_running")
 colorscheme murphy
 else

data/salt/gui/desktop.sls

@@ -0,0 +1,9 @@
+include:
+  - gui.lxde
+
+desktop:
+  cmd.run:
+    - name: 'true'
+    - require:
+      - sls: gui.lxde
+

data/salt/gui/x2go.sls

@@ -1,3 +1,6 @@
+include:
+  - gui.desktop
+
 x2go:
   pkgrepo.managed:
     - humanname: X2Go PPA repository
@@ -8,6 +11,8 @@ x2go:
       - x2goserver-xsession
     - require:
       - pkgrepo: x2go
+      - sls: gui.desktop
+
   file.sed:
     - name: /etc/ssh/sshd_config
     - before: ^HostKey /etc/ssh/ssh_host_ecdsa_key

data/salt/lang/jenv.sls

@@ -0,0 +1,64 @@
+include:
+  - scm
+
+jenv_deps:
+  pkg.installed:
+    - names:
+      - build-essential
+      - openssl
+      - curl
+      - zlib1g
+      - zlib1g-dev
+      - libssl-dev
+      - libyaml-dev
+      - libsqlite3-0
+      - libsqlite3-dev
+      - sqlite3
+      - libxml2-dev
+      - libxslt1-dev
+      - autoconf
+      - libc6-dev
+      - libncurses5-dev
+      - automake
+      - libtool
+      - bison
+
+# 
+# jenv and java-build installation
+# 
+
+#{{ pillar['homedir'] }}/.jenv:
+#  file.directory:
+#    - user: {{ pillar['username'] }}
+#    - group: {{ pillar['username'] }}
+#    - makedirs: True
+
+jenv:
+  git.latest:
+    - name: git://github.com/gcuisinier/jenv
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.jenv
+    - force: True
+    - require:
+      - pkg: jenv_deps
+  file.append:
+    - name: {{ pillar['homedir'] }}/.profile
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - text:
+      - export PATH="$HOME/.jenv/bin:$PATH"
+      - eval "$(jenv init -)"
+    - require:
+      - git: jenv
+
+jenv-rehash:
+  cmd.run:
+    - name: {{ pillar['homedir'] }}/.jenv/bin/jenv rehash
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - require:
+      - file: jenv
+
+# Install java manually at this point!

data/salt/lang/php/etc/php5/fpm/pool.d/www.conf

@@ -30,8 +30,8 @@ group = www-data
 ;                            specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-; listen = /var/run/php5-fpm.sock
-listen = 127.0.0.1:9000
+listen = /var/run/php5-fpm.sock
+; listen = 127.0.0.1:9000
 
 ; Set listen(2) backlog.
 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)

data/salt/lang/phpenv.sls

@@ -0,0 +1,82 @@
+include:
+  - scm
+
+phpenv_deps:
+  pkg.installed:
+    - names:
+      - build-essential
+      - openssl
+      - curl
+      - zlib1g
+      - zlib1g-dev
+      - libssl-dev
+      - libyaml-dev
+      - libsqlite3-0
+      - libsqlite3-dev
+      - sqlite3
+      - libxml2-dev
+      - libxslt1-dev
+      - autoconf
+      - libc6-dev
+      - libncurses5-dev
+      - automake
+      - libtool
+      - bison
+
+# 
+# phpenv and php-build installation
+# 
+
+#{{ pillar['homedir'] }}/.phpenv:
+#  file.directory:
+#    - user: {{ pillar['username'] }}
+#    - group: {{ pillar['username'] }}
+#    - makedirs: True
+
+phpenv:
+  git.latest:
+    - name: git://github.com/phpenv/phpenv.git
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.phpenv
+    - force: True
+    - require:
+      - pkg: phpenv_deps
+  file.append:
+    - name: {{ pillar['homedir'] }}/.profile
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - text:
+      - export PATH="$HOME/.phpenv/bin:$PATH"
+      - eval "$(phpenv init -)"
+    - require:
+      - git: phpenv
+
+phpenv-rehash:
+  cmd.run:
+    - name: {{ pillar['homedir'] }}/.phpenv/bin/phpenv rehash
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - require:
+      - file: phpenv
+{%- if 'php' in pillar['versions'] %}
+      - cmd: phpenv-install-php
+
+phpenv-install-php:
+  cmd.run:
+    - name: {{ pillar['homedir'] }}/.phpenv/bin/phpenv install {{ pillar['versions']['php'] }}
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - require:
+      - git: phpenv
+
+phpenv-global:
+  cmd.run:
+    - name: {{ pillar['homedir'] }}/.phpenv/bin/phpenv global {{ pillar['versions']['php'] }}
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - require:
+      - cmd: phpenv-rehash
+
+{%- endif %}

data/salt/lang/rbenv.sls

@@ -0,0 +1,115 @@
+include:
+  - lang.ruby
+
+{%- if ('ruby' in pillar['versions']) %}
+
+rbenv:
+  rbenv.installed:
+    - name: {{ pillar['versions']['ruby'] }}
+    - default: True
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - require:
+      - pkg: ruby-deps
+      
+  file.append:
+    - name: {{ pillar['homedir'] }}/.profile
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - text:
+      - export PATH="$HOME/.rbenv/bin:$PATH"
+      - eval "$(rbenv init -)"
+    - require:
+      - rbenv.installed: rbenv
+  gem.installed:
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - names:
+      - bundler
+    - require:
+      - file: rbenv
+  cmd.run:
+    - name: {{ pillar['homedir'] }}/.rbenv/bin/rbenv rehash
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - require:
+      - gem: rbenv
+
+rbenv-gem-rehash:
+  git.latest:
+    - name: git://github.com/sstephenson/rbenv-gem-rehash
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.rbenv/plugins/rbenv-gem-rehash
+    - force: True
+    - require:
+      - rbenv: rbenv
+
+rbenv-update:
+  git.latest:
+    - name: git://github.com/rkh/rbenv-update
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.rbenv/plugins/rbenv-update
+    - force: True
+    - require:
+      - rbenv: rbenv
+
+rbenv-which-ext:
+  git.latest:
+    - name: git://github.com/yyuu/rbenv-which-ext
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.rbenv/plugins/rbenv-which-ext
+    - force: True
+    - require:
+      - rbenv: rbenv
+
+rbenv-binstubs:
+  git.latest:
+    - name: git://github.com/ianheggie/rbenv-binstubs
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.rbenv/plugins/rbenv-binstubs
+    - force: True
+    - require:
+      - rbenv: rbenv
+
+rbenv-env:
+  git.latest:
+    - name: git://github.com/ianheggie/rbenv-env
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.rbenv/plugins/rbenv-env
+    - force: True
+    - require:
+      - rbenv: rbenv
+
+rbenv-whatis:
+  git.latest:
+    - name: git://github.com/rkh/rbenv-whatis
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.rbenv/plugins/rbenv-whatis
+    - force: True
+    - require:
+      - rbenv: rbenv
+
+rbenv-use:
+  git.latest:
+    - name: git://github.com/rkh/rbenv-use
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.rbenv/plugins/rbenv-use
+    - force: True
+    - require:
+      - rbenv: rbenv
+
+{%- endif %}

data/salt/lang/ruby.sls

@@ -1,60 +1,47 @@
-# 
-# ruby deps
-# 
+include:
+  - scm
+  - databases.packages
 
-rbenv-deps:
+ruby-deps:
   pkg.installed:
     - pkgs:
-      - autoconf 
+      - autoconf
       - automake
+      - bash
       - bison
       - build-essential
-      - curl 
-      - git
+      - curl
       - libc6-dev
       - libcurl4-openssl-dev
       - libfreeimage3
       - libfreeimage-dev
-      - libmysqlclient-dev 
       - libncurses5-dev
+      - libreadline6
+      - libreadline6-dev
       - libreadline-dev
-      - libsqlite3-0
-      - libsqlite3-dev
-      - sqlite3
-      - libssl-dev 
+      - libssl-dev
       - libtool
-      - libxml2-dev 
-      - libxslt1-dev 
+      - libxml2-dev
+      - libxslt1-dev
       - libyaml-dev
       - openssl
-      - python-software-properties 
-      - subversion
+      - python-software-properties
       - zlib1g
-      - zlib1g-dev 
-
-ruby:
-  rbenv.installed:
-    - name: {{ pillar['ruby_version'] }}
-    - default: True
-    - runas: {{ pillar['username'] }}
+      - zlib1g-dev
     - require:
-      - pkg: rbenv-deps
+      - pkg: databases-packages
 
-rbenv-adjust_profile:
-  file.append:
-    - name: {{ pillar['homedir'] }}/.profile
-    - user: {{ pillar['username'] }}
-    - group: {{ pillar['username'] }}
-    - text:
-      - export PATH="$HOME/.rbenv/bin:$PATH"
-      - eval "$(rbenv init -)"
+ruby:
+  pkg.installed:
+    - pkgs:
+      - ruby
+      - rubygems
     - require:
-      - rbenv.installed: ruby
-
-base_gems:
+      - pkg: ruby-deps
   gem.installed:
-    - runas: {{ pillar['username'] }}
     - names:
       - bundler
+      - rake
     - require:
-      - file: rbenv-adjust_profile
+      - pkg: ruby
+

data/salt/munin/nginx.sls

@@ -4,10 +4,12 @@ munin-nginx-plugins:
         - source: salt://munin/files/nginx/plugins
         - name: /etc/munin/plugins
         - mode: 755
+        - exclude_pat: '.*swp'
 
 munin-nginx-plugin-conf:
     file:
         - recurse
         - source: salt://munin/files/nginx/plugin-conf.d
         - name: /etc/munin/plugin-conf.d
-        - mode: 755
+        - mode: 755
+        - exclude_pat: '.*swp'

data/salt/munin/node.sls

@@ -24,6 +24,7 @@ munin-node-conf:
         - recurse
         - source: salt://munin/files/node
         - name: /etc/munin
+        - exclude_pat: '.*swp'
 
 # Check Permissions of Plugins to Ensure They Are Executible
 chmod -R 755 /etc/munin/plugins/:
@@ -31,4 +32,4 @@ chmod -R 755 /etc/munin/plugins/:
         - run
         - unless: bash /etc/munin/checkPermissions.sh
         - require:
-            - file: core-munin-conf
+            - file: core-munin-conf

data/salt/munin/php5-fpm.sls

@@ -4,10 +4,12 @@ munin-php5-fpm-plugins:
         - source: salt://munin/files/php5-fpm/plugins
         - name: /etc/munin/plugins
         - mode: 755
+        - exclude_pat: '.*swp'
 
 munin-php5-fpm-plugin-conf:
     file:
         - recurse
         - source: salt://munin/files/php5-fpm/plugin-conf.d
         - name: /etc/munin/plugin-conf.d
-        - mode: 755
+        - mode: 755
+        - exclude_pat: '.*swp'

data/salt/net/hosts.sls

@@ -0,0 +1,9 @@
+# Handle firefox changing localhost to localhost.com then www.localhost.com if it can't connect to a port
+# localhost.localdomain for those used to other systems
+
+/etc/hosts:
+  file.append:
+    - user: root
+    - group: root
+    - text:
+      - 127.0.0.1       localhost localhost.com www.localhost.com localhost.localdomain