salted-rails 0.0.4 → 0.0.5

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

@@ -0,0 +1,17 @@
+#!/bin/sh
+# /etc/init.d/teamcity -  startup script for teamcity
+export TEAMCITY_DATA_PATH="/var/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
+;;
+
+stop)
+  start-stop-daemon --start -c www-data  --exec  /var/TeamCity/bin/runAll.sh stop
+;;
+
+esac
+
+exit 0

data/salt/ci/teamcity/init.sls

@@ -0,0 +1,58 @@
+include:
+  - lang.java
+  - www.users
+
+teamcity-download:
+  file.directory:
+    - name: /tmp/TeamCity
+    - makedirs: True
+    - user: www-data
+    - group: www-data
+    - require:
+      - sls: www.users
+  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
+    - 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
+    - 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
+    - require:
+      - cmd: teamcity-extract
+
+teamcity-setup-service:
+  file.managed:
+    - name: {{ pillar['etc_dir'] }}/init.d/teamcity
+    - source: salt://ci/teamcity/etc/init.d/teamcity
+    - user: root
+    - group: root
+    - mode: 755
+    - require:
+      - cmd: teamcity-install
+
+teamcity:
+  service:
+    - running
+    - enable: True
+    - reload: True
+    - watch:
+      - file: {{ pillar['etc_dir'] }}/init.d/teamcity
+  require:
+    - file: teamcity-setup-service
+

data/salt/databases/client.sls

@@ -0,0 +1,18 @@
+
+include:
+  # MySQL
+{%- if ('mysql' in pillar['gems']) or ('mysql2' in pillar['gems']) %}
+  - databases.mysql.client
+{%- 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

data/salt/{common.sls → databases/init.sls}

@@ -1,9 +1,5 @@
+
 include:
-  - apt.partner-sources
-  - apt.unwanted
-  - lang.ruby
-  - www.users
-  - www.nginx
   # MySQL
 {%- if ('mysql' in pillar['gems']) or ('mysql2' in pillar['gems']) %}
   - databases.mysql
@@ -21,14 +17,3 @@ include:
   # ElasticSearch - TODO search and analytics engine
   # Kestrel - TODO light-weight persistent message queue
   # SQLite3 - Included by default
-  - sysutils
-  - develop
-  - editors.vim
-  - sysutils.tmux
-  - railsapp
-
-  #- echo_pillar
-
-# if GUI:
-# www.chromium
-

data/salt/databases/phpmyadmin/etc/nginx/{sites-available → admin.d}/phpmyadmin.conf

@@ -1,4 +1,4 @@
-server {
+yerver {
 	listen 80;
 	server_name phpmyadmin;
 	client_max_body_size 20M;

data/salt/databases/phpmyadmin/init.sls

@@ -9,19 +9,10 @@ phpmyadmin:
 
 phpmyadmin_nginx:
   file.managed:
-    - source: salt://databases/phpmyadmin/etc/nginx/sites-available/phpmyadmin.conf
-    - name: {{ pillar['etc_dir'] }}nginx/sites-available/phpmyadmin.conf
+    - source: salt://databases/phpmyadmin/etc/nginx/admin.d/phpmyadmin.conf
+    - name: {{ pillar['etc_dir'] }}nginx/admin.d/phpmyadmin.conf
     - user: root
     - group: root
     - template: jinja
     - mode: 644
-  host.present:
-    - name: phpmyadmin
-    - ip: 127.0.0.1
 
-phpmyadmin_nginx-enable:
-  file.symlink:
-    - name: {{ pillar['etc_dir'] }}nginx/sites-enabled/phpmyadmin.conf
-    - target: {{ pillar['etc_dir'] }}nginx/sites-available/phpmyadmin.conf
-    - require:
-      - file: phpmyadmin_nginx

data/salt/databases/server.sls

@@ -0,0 +1,19 @@
+
+include:
+  # MySQL
+{%- if ('mysql' in pillar['gems']) or ('mysql2' in pillar['gems']) %}
+  - databases.mysql.server
+  - 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

data/salt/editors/gvim.sls

@@ -0,0 +1,5 @@
+
+gvim:
+  pkg.installed:
+    - name: vim-gtk
+

data/salt/editors/rubymine.sls

@@ -0,0 +1,51 @@
+include:
+  - lang.java
+
+{{ pillar['homedir'] }}/local/tmp:
+  file.directory:
+    - 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
+    - cwd: {{ pillar['homedir'] }}/local
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - unless: [ -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['rubymine-version'] }} ]
+    - require:
+      - file.directory: {{ pillar['homedir'] }}/local/tmp
+
+rubymine-extract:
+  cmd.run:
+    - name: tar xfz ../RubyMine-{{ pillar['rubymine-version'] }}.tar.gz
+    - cwd: {{ pillar['homedir'] }}/local/tmp
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - unless: [ -d ../RubyMine-{{ pillar['rubymine-version'] }} ] 
+    - require:
+      - cmd: rubymine-download
+
+# The tar file contains extra version numbers in its top directory
+rubymine-rename:
+  cmd.run:
+    - name: mv RubyMine-* ../RubyMine-{{ pillar['rubymine-version'] }}
+    - cwd: {{ pillar['homedir'] }}/local/tmp
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - unless: [ -d ../RubyMine-{{ pillar['rubymine-version'] }} ] 
+    - require:
+      - cmd: rubymine-extract
+
+rubymine-adjust_profile:
+  file.append:
+    - name: {{ pillar['homedir'] }}/.profile
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - text:
+      - export PATH="{{ pillar['homedir'] }}/RubyMine-{{ pillar['rubymine-version'] }}/bin:$PATH"
+    - require:
+      - cmd: rubymine-rename
+

data/salt/gui/init.sls

@@ -0,0 +1,3 @@
+include:
+  - gui.lxde
+  - gui.x2go

data/salt/gui/lxde.sls

@@ -0,0 +1,5 @@
+deploy:
+  pkg.installed:
+    - pkgs:
+      - lxde
+

data/salt/gui/x2go.sls

@@ -0,0 +1,23 @@
+x2go:
+  pkgrepo.managed:
+    - humanname: X2Go PPA repository
+    - ppa: x2go/stable
+  pkg.installed:
+    - pkgs:
+      - x2goserver 
+      - x2goserver-xsession
+    - require:
+      - pkgrepo: x2go
+  file.sed:
+    - name: /etc/ssh/sshd_config
+    - before: ^HostKey /etc/ssh/ssh_host_ecdsa_key
+    - after: "#HostKey /etc/ssh/ssh_host_ecdsa_key # not compatible with x2go"
+    - limit: ^HostKey
+    - require:
+      - pkg: x2go
+
+ssh:
+  service.running:
+    - watch:
+      - file.sed: x2go
+

data/salt/lang/java/etc/profile.d/java.sh

@@ -0,0 +1,2 @@
+export JDK_HOME=/usr/lib/jvm/java-7-oracle
+export JAVA_HOME=/usr/lib/jvm/java-7-oracle

data/salt/lang/java/init.sls

@@ -0,0 +1,48 @@
+#
+# How to install automatically Oracle Java 7 under Salt Stack
+# 
+# Thanks Oracle for complicating things :(
+#
+# 1. Create a java/ folder in your salt master
+# 2. Paste this file in init.sls
+# 3. salt '*' state.sls java
+#
+# Source:
+#  * https://github.com/log0ymxm/salt-jvm/blob/master/init.sls
+#  * http://architects.dzone.com/articles/puppet-installing-oracle-java
+#
+oracle-ppa:
+  pkgrepo.managed:
+    - humanname: WebUpd8 Oracle Java PPA repository
+    - ppa: webupd8team/java
+
+oracle-license-select:
+  cmd.run:
+    - unless: which java
+    - name: '/bin/echo /usr/bin/debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections'
+    - require_in:
+      - pkg: oracle-java7-installer
+      - cmd: oracle-license-seen-lie
+
+oracle-license-seen-lie:
+  cmd.run:
+    - name: '/bin/echo /usr/bin/debconf shared/accepted-oracle-license-v1-1 seen true  | /usr/bin/debconf-set-selections'
+    - require_in:
+      - pkg: oracle-java7-installer
+
+oracle-java7-installer:
+  pkg:
+    - installed
+    - require:
+      - pkgrepo: oracle-ppa
+
+adjust_profile:
+  file.managed:
+    - name: /etc/profile.d/java.sh
+    - source: salt://lang/java/etc/profile.d/java.sh
+    - user: root
+    - group: root
+    - mode: 755
+    - require:
+      - pkg: oracle-java7-installer
+

data/salt/lang/php/composer.sls

@@ -1,9 +1,6 @@
 include:
   - lang.php
 
-
-
-
 php-composer:
   cmd.run:
     - name: curl -s https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer

data/salt/lang/ruby.sls

@@ -34,13 +34,13 @@ rbenv-deps:
 
 ruby:
   rbenv.installed:
-    - name: {{ pillar['ruby-version'] }}
+    - name: {{ pillar['ruby_version'] }}
     - default: True
     - runas: {{ pillar['username'] }}
     - require:
       - pkg: rbenv-deps
 
-adjust_profile:
+rbenv-adjust_profile:
   file.append:
     - name: {{ pillar['homedir'] }}/.profile
     - user: {{ pillar['username'] }}
@@ -57,4 +57,4 @@ base_gems:
     - names:
       - bundler
     - require:
-      - file: adjust_profile
+      - file: rbenv-adjust_profile

data/salt/lang/ruby.sls.bak

@@ -73,7 +73,7 @@ adjust_profile:
 #
 
 # this is currently not working
-# ruby-{{ pillar['ruby-version'] }}:
+# ruby-{{ pillar['ruby_version'] }}:
 #   rbenv.installed:
 #     - default: True
 #     - require:
@@ -81,7 +81,7 @@ adjust_profile:
 
 install_ruby:
   cmd.run:
-    - name: {{ pillar['homedir'] }}/.rbenv/bin/rbenv install {{ pillar['ruby-version'] }}
+    - name: {{ pillar['homedir'] }}/.rbenv/bin/rbenv install {{ pillar['ruby_version'] }}
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
     - require:
@@ -97,7 +97,7 @@ rehash:
 
 set-global:
   cmd.run:
-    - name: {{ pillar['homedir'] }}/.rbenv/bin/rbenv global {{ pillar['ruby-version'] }}
+    - name: {{ pillar['homedir'] }}/.rbenv/bin/rbenv global {{ pillar['ruby_version'] }}
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
     - require:

data/salt/railsapp/gems.sls

@@ -1,17 +1,30 @@
 include:
   - lang.ruby
 
+tmp_railsapp_gems:
+  file.directory:
+    - name: /tmp/railsapp_gems
+    - file_mode: 755
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - makedirs: True
+    - clean: True
+
 railsapp_gems:
   file.recurse:
-    - source: salt://railsapp/files
-    - name: /tmp
+    - source: salt://files/
+    - name: /tmp/railsapp_gems
     - file_mode: 644
     - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - 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
-    - cwd: /tmp
+    - cwd: /tmp/railsapp_gems
     - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
     - require:
       - file: railsapp_gems
       - gem.installed: base_gems

data/salt/railsapp/init.sls

@@ -1,4 +1,5 @@
 include:
+  - databases
   - railsapp.packages
   - railsapp.gems
 {%- if ('mysql' in pillar['gems']) or ('mysql2' in pillar['gems']) %}

data/salt/railsapp/mysql_database.sls

@@ -1,25 +1,30 @@
 include:
   - databases.mysql.server
 
+{%- if ('development' in pillar['databases']) %}
+
 database:
   mysql_database.present:
     - names:
-      - {{ pillar['database']['development']['database'] }}
-      - {{ pillar['database']['test']['database'] }}
+      - {{ pillar['databases']['development']['database'] }}
+{%- if ('test' in pillar['databases']) %}
+      - {{ pillar['databases']['test']['database'] }}
+{%- endif %}
     - require:
       - service.running: mysql-server
       - pkg: mysql-server
   mysql_user:
     - present
-    - name: {{ pillar['database']['development']['username'] }}
-    - password: {{ pillar['database']['development']['password'] }}
+    - name: {{ pillar['databases']['development']['username'] }}
+    - password: {{ pillar['databases']['development']['password'] }}
     - require:
       - mysql_database.present: database
   mysql_grants.present:
-    - database: {{ pillar['database']['development']['username'] }}_%.*
+    - database: {{ pillar['databases']['development']['username'] }}_%.*
     - grant: ALL PRIVILEGES
-    - user: {{ pillar['database']['development']['username'] }}
+    - user: {{ pillar['databases']['development']['username'] }}
     - host: localhost
     - require:
       - mysql_user.present: database
 
+{%- endif %}