salted-rails 0.0.6 → 0.0.7

data/salt/ci/cruisecontrolrb.sls

@@ -9,18 +9,24 @@ include:
 
 cruisecontrolrb-install:
   git.latest:
-    - name: https://github.com/thoughtworks/cruisecontrol.rb
+    - name: git://github.com/thoughtworks/cruisecontrol.rb
     - target: {{ pillar['homedir'] }}/local/cruisecontrol.rb
     - runas: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
     - require:
       - file.directory: {{ pillar['homedir'] }}/local
+  file.managed:
+    - name: {{ pillar['homedir'] }}/local/cruisecontrol.rb/.ruby-version
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - contents: system
   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 --binstubs || bundle install
     - cwd: {{ pillar['homedir'] }}/local/cruisecontrol.rb
-    - user: {{ pillar['username'] }}
-    - group: {{ pillar['username'] }}
+    - require:
+      - sls: lang.ruby
+      - file: cruisecontrolrb-install:
     - watch:
       - git: cruisecontrolrb-install
 
@@ -48,13 +54,13 @@ cruisecontrolrb-fix-home:
     - watch:
       - cmd: cruisecontrolrb-create-service
     
-cruisecontrolrb-fix-shebang:
-  file.sed:
-    - name: /etc/init.d/cruise
-    - before: '#!/usr/bin/env.*'
-    - after: '#!{{ pillar['homedir'] }}/.rbenv/shims/ruby'
-    - watch:
-      - cmd: cruisecontrolrb-create-service
+#cruisecontrolrb-fix-shebang:
+#  file.sed:
+#    - name: /etc/init.d/cruise
+#    - before: '#!/usr/bin/env.*'
+#    - after: '#!{{ pillar['homedir'] }}/.rbenv/shims/ruby'
+#    - watch:
+#      - cmd: cruisecontrolrb-create-service
     
 cruisecontrolrb-register-service:
   cmd.run:

data/salt/ci/teamcity/etc/init.d/teamcity

@@ -1,15 +1,15 @@
 #!/bin/sh
 # /etc/init.d/teamcity -  startup script for teamcity
-export TEAMCITY_DATA_PATH="/var/TeamCity/.BuildServer"
-. /etc/profile.d/java.sh
+export TEAMCITY_DATA_PATH="{{ pillar['homedir'] }}/local/TeamCity-{{ pillar['versions']['teamcity'] }}/.BuildServer"
+ /etc/profile.d/java.sh
 
 case $1 in
 start)
-  start-stop-daemon --start  -c www-data --exec /var/TeamCity/bin/runAll.sh start
+  start-stop-daemon --start  -c {{ pillar['username'] }} --exec {{ pillar['homedir'] }}/local/TeamCity-{{ pillar['versions']['teamcity'] }}/bin/runAll.sh start
 ;;
 
 stop)
-  start-stop-daemon --start -c www-data  --exec  /var/TeamCity/bin/runAll.sh stop
+  start-stop-daemon --start -c {{ pillar['username'] }}  --exec  {{ pillar['homedir'] }}/local/TeamCity-{{ pillar['versions']['teamcity'] }}/bin/runAll.sh stop
 ;;
 
 esac

data/salt/ci/teamcity/init.sls

@@ -1,38 +1,37 @@
 include:
   - lang.java
-  - www.users
 
 teamcity-download:
   file.directory:
-    - name: /tmp/TeamCity
+    - name: {{ pillar['homedir'] }}/tmp/teamcity
     - makedirs: True
-    - user: www-data
-    - group: www-data
-    - require:
-      - sls: www.users
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
   cmd.run:
-    - name: wget -c http://download.jetbrains.com/teamcity/TeamCity-{{ pillar['teamcity-version'] }}.tar.gz
-    - unless: test -d /var/TeamCity/bin
-    - cwd: /tmp
-    - user: www-data
-    - group: www-data
+    - name: wget -nv -c http://download.jetbrains.com/teamcity/TeamCity-{{ pillar['versions']['teamcity'] }}.tar.gz
+    - unless: test -d {{ pillar['homedir'] }}/local/TeamCity-{{ pillar['versions']['teamcity'] }}/bin
+    - cwd: {{ pillar['homedir'] }}/tmp/teampcity
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - unless: test -d {{ pillar['homedir'] }}/local/TeamCity-{{ pillar['versions']['teamcity'] }}/bin
     - require:
       - file.directory: teamcity-download
 
 teamcity-extract:
   cmd.run:
-    - name: tar xfz /tmp/TeamCity-{{ pillar['teamcity-version'] }}.tar.gz 
-    - cwd: /tmp/TeamCity
-    - user: www-data
-    - group: www-data
+    - name: tar xfz /tmp/TeamCity-{{ pillar['versions']['teamcity'] }}.tar.gz 
+    - cwd: {{ pillar['homedir'] }}/tmp/teampcity
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - unless: test -d {{ pillar['homedir'] }}/local/TeamCity-{{ pillar['versions']['teamcity'] }}/bin
     - require:
       - cmd: teamcity-download
 
 teamcity-install:
   cmd.run:
-    - name: rm -rf /var/TeamCity && mv /tmp/TeamCity/* /var/TeamCity && rm -fr /tmp/TeamCity
-    - cwd: /tmp
-    - unless: test -d /var/TeamCity/bin
+    - name: mv TeamCity-* ../../TeamCity-{{ pillar['versions']['teamcity'] }}
+    - cwd: {{ pillar['homedir'] }}/tmp/teampcity
+    - unless: test -d {{ pillar['homedir'] }}/local/TeamCity-{{ pillar['versions']['teamcity'] }}/bin
     - require:
       - cmd: teamcity-extract
 
@@ -55,4 +54,5 @@ teamcity:
       - file: {{ pillar['etc_dir'] }}/init.d/teamcity
   require:
     - file: teamcity-setup-service
+    - sls:lang.java
 

data/salt/crons/init.sls

@@ -1,6 +1,6 @@
 # include
-include:
-  - users
+#include:
+#  - users
 
 # cron.present
 date > /tmp/croncheck:

data/salt/databases/init.sls

@@ -1,19 +1,50 @@
 
 include:
-  # MySQL
-{%- if ('mysql' in pillar['gems']) or ('mysql2' in pillar['gems']) %}
+{%- if ('mysql' in pillar['roles']) %}
   - databases.mysql
   - databases.phpmyadmin
 {%- endif %}
-  # PostgreSQL - TODO main alternative to mysql
-  # MongoDB - TODO Document database
-  # CouchDB - TODO json web distributed db
-  # Redis - TODO key value store
-  # Riak - TODO Distributed fault tolerant DB
-  # RabbitMQ - TODO message broker software
-  # Memcached - TODO Memory cache
-  # Cassandra - TODO distributed database management system
-  # Neo4J - TODO Graph database
-  # ElasticSearch - TODO search and analytics engine
-  # Kestrel - TODO light-weight persistent message queue
-  # SQLite3 - Included by default
+{%- if ('postgresql' in pillar['roles']) %}
+  - databases.postgresql
+{%- endif %}
+#{%- if ('sqllite3' in pillar['roles']) %}
+#  # SQLite3 - Included by default
+  - databases.sqlite3
+{%- if 'gui' in pillar['roles'] %}
+  - databases.sqlitebrowser
+{%- endif %}
+#{%- endif %}
+
+# TODO: when I need them:
+
+#{%- if ('memcached' in pillar['roles']) %}
+#  # Memcached - TODO Memory cache
+#{%- endif %}
+
+#{%- if ('mongodb' in pillar['roles']) %}
+#  # MongoDB - TODO Document database
+#{%- endif %}
+#{%- if ('couchdb' in pillar['roles']) %}
+#  # CouchDB - TODO json web distributed db
+#{%- endif %}
+#{%- if ('redis' in pillar['roles']) %}
+#  # Redis - TODO key value store
+#{%- endif %}
+#{%- if ('riak' in pillar['roles']) %}
+#  # Riak - TODO Distributed fault tolerant DB
+#{%- endif %}
+#{%- if ('rabbitmq' in pillar['roles']) %}
+#  # RabbitMQ - TODO message broker software
+#{%- endif %}
+#{%- if ('cassandra' in pillar['roles']) %}
+#  # Cassandra - TODO distributed database management system
+#{%- endif %}
+#{%- if ('neo4j' in pillar['roles']) %}
+#  # Neo4J - TODO Graph database
+#{%- endif %}
+#{%- if ('elasticsearch' in pillar['roles']) %}
+#  # ElasticSearch - TODO search and analytics engine
+#{%- endif %}
+#{%- if ('kestrel' in pillar['roles']) %}
+#  # Kestrel - TODO light-weight persistent message queue
+#{%- endif %}

data/salt/databases/mysql/client.sls

@@ -3,7 +3,7 @@ include :
 
 mysql-client:
   pkg.installed:
-    - name: {{ "mysql-client" if pillar["mysql-version"] is not defined else "mysql-client-%s" % pillar["mysql-version"] }}
+    - name: {{ "mysql-client" if pillar["versions"]["mysql"] is not defined else "mysql-client-%s" % pillar["versions"]["mysql"] }}
 
 /etc/mysql/conf.d/client-encoding-and-collation.cnf:
   file.managed:

data/salt/databases/mysql/common.sls

@@ -2,21 +2,21 @@ mysql-common:
   pkg.installed:
     - name: mysql-common
 
-/etc/mysql:
+/etc/mysql/conf.d:
   file.directory:
     - user: root
     - group: root
     - mode: 0755
     - clear: True
     - require:
-      - file: /etc/mysql/conf.d
       - pkg: mysql-common
 
-/etc/mysql/conf.d:
+/etc/mysql:
   file.directory:
     - user: root
     - group: root
     - mode: 0755
     - clear: True
     - require:
+      - file: /etc/mysql/conf.d
       - pkg: mysql-common

data/salt/databases/mysql/server.sls

@@ -51,7 +51,7 @@ include:
 
 mysql-server:
   pkg.installed:
-    - name: {{ "mysql-server" if pillar["mysql-version"] is not defined else "mysql-server-%s" % pillar["mysql-version"] }}
+    - name: {{ "mysql-server" if pillar["versions"]["mysql"] is not defined else "mysql-server-%s" % pillar["versions"]["mysql"] }}
   service.running:
     - name: mysql
     - require:

data/salt/databases/packages.sls

@@ -0,0 +1,47 @@
+
+databases-packages:
+  pkg.installed:
+    - pkgs:
+{%- if ('mysql' in pillar['roles']) %}
+      - libmysqlclient-dev
+{%- endif %}
+{%- if ('postgresql' in pillar['roles']) %}
+      - libpq-dev
+{%- endif %}
+
+# TODO: when I need them:
+
+#{%- if ('memcached' in pillar['roles']) %}
+#  # Memcached - TODO Memory cache
+#{%- endif %}
+
+#{%- if ('mongodb' in pillar['roles']) %}
+#  # MongoDB - TODO Document database
+#{%- endif %}
+#{%- if ('couchdb' in pillar['roles']) %}
+#  # CouchDB - TODO json web distributed db
+#{%- endif %}
+#{%- if ('redis' in pillar['roles']) %}
+#  # Redis - TODO key value store
+#{%- endif %}
+#{%- if ('riak' in pillar['roles']) %}
+#  # Riak - TODO Distributed fault tolerant DB
+#{%- endif %}
+#{%- if ('rabbitmq' in pillar['roles']) %}
+#  # RabbitMQ - TODO message broker software
+#{%- endif %}
+#{%- if ('cassandra' in pillar['roles']) %}
+#  # Cassandra - TODO distributed database management system
+#{%- endif %}
+#{%- if ('neo4j' in pillar['roles']) %}
+#  # Neo4J - TODO Graph database
+#{%- endif %}
+#{%- if ('elasticsearch' in pillar['roles']) %}
+#  # ElasticSearch - TODO search and analytics engine
+#{%- endif %}
+#{%- if ('kestrel' in pillar['roles']) %}
+#  # Kestrel - TODO light-weight persistent message queue
+#{%- endif %}
+#{%- if ('sqllite3' in pillar['roles']) %}
+#  # SQLite3 - Included by default
+#{%- endif %}

data/salt/databases/phpmyadmin/etc/nginx/admin.d/phpmyadmin.conf

@@ -1,7 +1,3 @@
-yerver {
-	listen 80;
-	server_name phpmyadmin;
-	client_max_body_size 20M;
 
 	location /phpmyadmin {
 		root /usr/share/;
@@ -10,10 +6,18 @@ yerver {
 		location ~ ^/phpmyadmin/(.+\.php)$ {
 			try_files $uri =404;
 			root /usr/share/;
-			fastcgi_pass 127.0.0.1:9000;
-			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 			include /etc/nginx/fastcgi_params;
+
+                        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+                        #   # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+                        #
+                        #   # With php5-cgi alone:
+                        #   fastcgi_pass 127.0.0.1:9000;
+                        #   # With php5-fpm:
+                        fastcgi_pass unix:/var/run/php5-fpm.sock;
+                        fastcgi_index index.php;
+                        #include fastcgi_params;
 		}
 
 		location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
@@ -21,4 +25,3 @@ yerver {
 		}
 	}
 
-}

data/salt/databases/postgresql/client.sls

@@ -0,0 +1,5 @@
+postgresql-client:
+  pkg.installed:
+    - pkgs:
+      - libpq-dev
+

data/salt/databases/postgresql/init.sls

@@ -0,0 +1,10 @@
+include:
+  - databases.postgresql.client
+
+postgresql:
+  pkg.installed:
+    - pkgs:
+      - postgresql 
+    - require:
+      - sls: databases.postgresql.client
+

data/salt/databases/sqlite3.sls

@@ -0,0 +1,6 @@
+sqlite3:
+  pkg.installed:
+    - pkgs:
+      - sqlite3
+      - libsqlite3-0
+      - libsqlite3-dev

data/salt/databases/sqlitebrowser.sls

@@ -0,0 +1,4 @@
+sqlitebrowser:
+  pkg.installed:
+    - pkgs:
+      - sqlitebrowser

data/salt/editors/gvim.sls

@@ -1,5 +1,9 @@
+include:
+  - gui.desktop
+  - editors.vim
 
 gvim:
   pkg.installed:
     - name: vim-gtk
-
+    - require:
+      - sls: gui.desktop

data/salt/editors/rubymine.sls

@@ -1,41 +1,41 @@
 include:
   - lang.java
 
-{{ pillar['homedir'] }}/local/tmp:
+
+rubymine-download:
   file.directory:
+    - name: {{ pillar['homedir'] }}/local/tmp/rubymine
     - makedirs: True
     - clean: True
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-
-rubymine-download:
   cmd.run:
-    - name: wget -c http://download.jetbrains.com/ruby/RubyMine-{{ pillar['rubymine-version'] }}.tar.gz
+    - name: wget -nv -c http://download.jetbrains.com/ruby/RubyMine-{{ pillar['versions']['rubymine'] }}.tar.gz
     - cwd: {{ pillar['homedir'] }}/local
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-    - unless: [ -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['rubymine-version'] }} ]
+    - unless: test -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['versions']['rubymine'] }}/bin
     - require:
-      - file.directory: {{ pillar['homedir'] }}/local/tmp
+      - file.directory: rubymine-download
 
 rubymine-extract:
   cmd.run:
-    - name: tar xfz ../RubyMine-{{ pillar['rubymine-version'] }}.tar.gz
-    - cwd: {{ pillar['homedir'] }}/local/tmp
+    - name: tar xfz ../RubyMine-{{ pillar['versions']['rubymine'] }}.tar.gz
+    - cwd: {{ pillar['homedir'] }}/local/tmp/rubymine
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-    - unless: [ -d ../RubyMine-{{ pillar['rubymine-version'] }} ] 
+    - unless: test -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['versions']['rubymine'] }}/bin
     - require:
       - cmd: rubymine-download
 
 # The tar file contains extra version numbers in its top directory
-rubymine-rename:
+rubymine-install:
   cmd.run:
-    - name: mv RubyMine-* ../RubyMine-{{ pillar['rubymine-version'] }}
-    - cwd: {{ pillar['homedir'] }}/local/tmp
+    - name: mv RubyMine-* ../../RubyMine-{{ pillar['versions']['rubymine'] }}
+    - cwd: {{ pillar['homedir'] }}/local/tmp/rubymine
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-    - unless: [ -d ../RubyMine-{{ pillar['rubymine-version'] }} ] 
+    - unless: test -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['versions']['rubymine'] }}/bin
     - require:
       - cmd: rubymine-extract
 
@@ -45,7 +45,7 @@ rubymine-adjust_profile:
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
     - text:
-      - export PATH="{{ pillar['homedir'] }}/RubyMine-{{ pillar['rubymine-version'] }}/bin:$PATH"
-    - require:
-      - cmd: rubymine-rename
+      - export PATH="{{ pillar['homedir'] }}/RubyMine-{{ pillar['versions']['rubymine'] }}/bin:$PATH"
+    #- require:
+    #  - cmd: rubymine-rename
 

data/salt/editors/vim/init.sls

@@ -1,8 +1,6 @@
 vim:
   pkg.installed:
     - name: vim
-
-vim_alternatives:
   cmd.wait:
     - names:
       - update-alternatives --set editor vim
@@ -10,3 +8,74 @@ vim_alternatives:
       - pkg: vim
     - watch:
       - pkg: vim
+  file.managed:
+    - source: salt://editors/vim/vimrc
+    - name: {{ pillar['homedir'] }}/.vimrc
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - template: jinja
+    - replace: false
+    - mode: 644
+    - require:
+      - pkg: vim
+
+vim-pathogen:
+  file.directory:
+    - name: {{ pillar['homedir'] }}/.vim/autoload
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - mode: 775
+    - makedirs: True
+    - require:
+      - pkg: vim
+  cmd.run:
+    - name: curl -Sso {{ pillar['homedir'] }}/.vim/autoload/pathogen.vim https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - require:
+      - file.directory: vim-pathogen
+
+vim-bundle:
+  file.directory:
+    - name: {{ pillar['homedir'] }}/.vim/bundle
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - mode: 775
+    - makedirs: True
+    - require:
+      - pkg: vim
+
+vim-rails:
+  git.latest:
+    - name: git://github.com/tpope/vim-rails.git
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.vim/bundle/vim-rails
+    - force: True
+    - require:
+      - file.directory: vim-bundle
+
+vim-bundler:
+  git.latest:
+    - name: git://github.com/tpope/vim-bundler.git
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.vim/bundle/vim-bundler
+    - force: True
+    - require:
+      - file.directory: vim-bundle
+
+vim-NERDtree:
+  git.latest:
+    - name: git://github.com/scrooloose/nerdtree.git
+    - runas: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - rev: master
+    - target: {{ pillar['homedir'] }}/.vim/bundle/nerdtree
+    - force: True
+    - require:
+      - file.directory: vim-bundle
+
+