salted-rails 0.0.4 → 0.0.5

data/salt/salt/minion/init.sls

@@ -17,7 +17,7 @@ restart_minion:
     - order: last
     - watch:
       - pkg: salt-minion
-      - file: /etc/salt/minion
+      #- file: /etc/salt/minion
       - file: /etc/salt/minion.d
     - require:
       - pkg: at
@@ -30,20 +30,21 @@ salt-minion:
     - names:
       - salt-minion
       - at
-  file.managed:
-    - name: /etc/salt/minion
-    - owner: root
-    - group: root
-    - mode: 0644
-    - source: salt://salt/minion/config.template
-    - template: jinja
-    - context:
-      master: salt
-      file_roots:
-        base:
-          - /srv/salt/private
-          - /srv/salt/base
-      pillar_roots:
-        base:
-          - /srv/salt/private/pillar
-          - /srv/salt/base/pillar
+#  Don't want to override minion copied in by vagrant!
+#  file.managed:
+#    - name: /etc/salt/minion
+#    - owner: root
+#    - group: root
+#    - mode: 0644
+#    - source: salt://salt/minion/config.template
+#    - template: jinja
+#    - context:
+#      master: salt
+#      file_roots:
+#        base:
+#          - /srv/salt/private
+#          - /srv/salt/base
+#      pillar_roots:
+#        base:
+#          - /srv/salt/private/pillar
+#          - /srv/salt/base/pillar

data/salt/vagrant/minion

@@ -5,10 +5,14 @@ state_auto_order: True
 
 file_roots:
   base:
-    - /srv/salt/vagrant
-    - /srv/salt
+    - /srv/salt/config/vagrant
+    - /srv/salt/salted-rails/vagrant
+    - /srv/salt/salted-rails
+    - /srv/salt/generated
 
 pillar_roots:
   base:
-    - /srv/pillar/vagrant
-    - /srv/pillar
+    - /srv/pillar/config/vagrant
+    - /srv/pillar/salted-rails/vagrant
+    - /srv/pillar/salted-rails
+    - /srv/pillar/generated

data/salt/vagrant/minion.sls

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

data/salt/vagrant/top.sls

@@ -1,8 +1,34 @@
 base:
   '*':
-    - common
-    - vagrant
-
-# if GUI:
-# www.chromium
-
+    - apt.partner-sources
+    - vagrant.minion
+    - apt.unwanted
+    - www.users
+    - sysutils
+    - capistrano/deploy_requirements
+    - editors.vim
+    - sysutils.tmux
+{%- if 'app' in pillar['roles'] %}
+    - databases.client
+    - lang.ruby
+    - railsapp
+{%- endif %}
+{%- if 'web' in pillar['roles'] %}
+    - www.nginx
+{%- endif %}
+{%- if 'db' in pillar['roles'] %}
+    - databases
+{%- endif %}
+{%- if 'gui' in pillar['roles'] %}
+    - gui.lxde
+    - gui.x2go
+    - editors.gvim
+    - editors.rubymine
+    - www.chromium
+{%- endif %}
+{%- if 'teamcity' in pillar['roles'] %}
+    - ci.teamcity
+{%- endif %}
+{%- if 'cruisecontrolrb' in pillar['roles'] %}
+    - ci.cruisecontrolrb
+{%- endif %}

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

@@ -0,0 +1,53 @@
+user www-data www-data;
+worker_processes 4;
+pid /var/run/nginx.pid;
+
+events {
+  worker_connections 768;
+  # multi_accept on;
+}
+
+http {
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  types_hash_max_size 2048;
+  server_tokens off;
+
+  # Headers
+  add_header X-Server-ID $hostname;
+
+  # Size Limits & Buffer Overflows
+  # One of the most important things to tweak
+  client_body_buffer_size 128k;
+  client_header_buffer_size 1k;
+  client_max_body_size 20m;
+  large_client_header_buffers 4 16k;
+
+  # Timeouts
+  client_body_timeout   10;
+  client_header_timeout 20;
+  keepalive_timeout     15 15;
+  send_timeout          10;
+
+  # SSL settings
+  ssl_session_cache    shared:SSL:10m;
+  ssl_session_timeout  10m;
+
+  # server_names_hash_bucket_size 64;
+  # server_name_in_redirect off;
+
+  ##
+  # Gzip Settings
+  ##
+
+  gzip on;
+  gzip_disable "msie6";
+
+  include mime.types;
+  default_type application/octet-stream;
+
+  # include /etc/nginx/naxsi_core.rules;
+  include conf.d/*.autoload.conf;
+  include sites-enabled/*.conf;
+}

data/salt/www/admin/etc/nginx/sites-available/phpmyadmin.conf

@@ -0,0 +1,7 @@
+server {
+	listen 880;
+	server_name admin.artabase.test;
+	client_max_body_size 20M;
+
+        include /etc/nginx/admin.d/*.conf;
+}

data/salt/www/admin/init.sls

@@ -0,0 +1,31 @@
+nginx:
+  pkg.installed:
+    - name: nginx-full
+  service:
+    - running
+    - enable: True
+    - reload: True
+    - watch:
+      #- file: {{ pillar['etc_dir'] }}nginx/nginx.conf
+      #- file: {{ pillar['etc_dir'] }}nginx/sites-enabled/*
+      - file: {{ pillar['etc_dir'] }}nginx/*
+  require:
+    - file: {{ pillar['etc_dir'] }}nginx/nginx.conf
+
+admin-site:
+  file.managed:
+    - source: salt://www/nginx/etc/nginx/admin.d/phpmyadmin.conf
+    - name: {{ pillar['etc_dir'] }}nginx/admin.d/phpmyadmin.conf
+    - user: root
+    - group: root
+    - template: jinja
+    - mode: 644
+
+admin_conf:
+
+#{{ pillar['etc_dir'] }}nginx/nginx.conf:
+#  file.managed:
+#    - source: salt://www/nginx/etc/nginx/nginx.conf
+#    - user: root
+#    - group: root
+#    - mode: 644

data/salt/www/nginx/init.sls

@@ -5,12 +5,25 @@ nginx:
     - running
     - enable: True
     - reload: True
-    - watch:
+    #- watch:
       #- file: {{ pillar['etc_dir'] }}nginx/nginx.conf
       #- file: {{ pillar['etc_dir'] }}nginx/sites-enabled/*
-      - file: {{ pillar['etc_dir'] }}nginx/*
-  require:
-    - file: {{ pillar['etc_dir'] }}nginx/nginx.conf
+      #- file: {{ pillar['etc_dir'] }}nginx/admin.d/*
+    - require:
+      - file.directory: admin-d
+      - pkg: nginx
+
+admin-d:
+  file.directory:
+    - name: {{ pillar['etc_dir'] }}nginx/admin.d
+    - user: root
+    - group: root
+    - mode: 755
+    - require:
+      - pkg: nginx
+
+#  require:
+#    - file: {{ pillar['etc_dir'] }}nginx/nginx.conf
 
 #{{ pillar['etc_dir'] }}nginx/nginx.conf:
 #  file.managed:

data/salt/www/users.sls

@@ -6,7 +6,11 @@
     - makedirs: True
     - require:
       - group: www-data
+      - user: www-data
 
 www-data:
   group.present:
     - system: True
+  user.present:
+    - system: True
+

data/salted-rails.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'salted_rails/version'
+require 'salted-rails/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "salted-rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salted-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,10 +55,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- init.sh
 - lib/salted-rails.rb
-- lib/salted_rails/capistrano.rb
-- lib/salted_rails/vagrant_helper.rb
-- lib/salted_rails/version.rb
+- lib/salted-rails/capistrano_helper.rb
+- lib/salted-rails/cloud_vbguest_installer.rb
+- lib/salted-rails/config.rb
+- lib/salted-rails/helper_base.rb
+- lib/salted-rails/vagrant_helper.rb
+- lib/salted-rails/version.rb
 - lib/salted_rails_base.rb
 - pillar/capistrano.sls
 - pillar/capistrano/top.sls
@@ -68,12 +72,18 @@ files:
 - salt/apt/partner-sources.sls
 - salt/apt/unwanted.sls
 - salt/bin/change_mirror.sh
-- salt/capistrano.sls
+- salt/bin/fix_hostname.sh
+- salt/bin/provision
+- salt/capistrano/deploy_requirements.sls
 - salt/capistrano/minion
 - salt/capistrano/minion.sls
 - salt/capistrano/top.sls
-- salt/common.sls
+- salt/ci/cruisecontrolrb.sls
+- salt/ci/teamcity/etc/init.d/teamcity
+- salt/ci/teamcity/init.sls
 - salt/crons/init.sls
+- salt/databases/client.sls
+- salt/databases/init.sls
 - salt/databases/mysql/client-encoding-and-collation.cnf
 - salt/databases/mysql/client.sls
 - salt/databases/mysql/common.sls
@@ -84,13 +94,18 @@ files:
 - salt/databases/mysql/init.sls
 - salt/databases/mysql/server-encoding-and-collation.cnf
 - salt/databases/mysql/server.sls
-- salt/databases/phpmyadmin/etc/nginx/sites-available/.gitignore
-- salt/databases/phpmyadmin/etc/nginx/sites-available/phpmyadmin.conf
+- salt/databases/phpmyadmin/etc/nginx/admin.d/phpmyadmin.conf
 - salt/databases/phpmyadmin/init.sls
-- salt/develop/init.sls
-- salt/echo_pillar.sls
+- salt/databases/server.sls
+- salt/editors/gvim.sls
+- salt/editors/rubymine.sls
 - salt/editors/vim/init.sls
 - salt/editors/vim/vimrc
+- salt/gui/init.sls
+- salt/gui/lxde.sls
+- salt/gui/x2go.sls
+- salt/lang/java/etc/profile.d/java.sh
+- salt/lang/java/init.sls
 - salt/lang/php/composer.sls
 - salt/lang/php/etc/php5/fpm/php.fpm.ini
 - salt/lang/php/etc/php5/fpm/pool.d/www.conf
@@ -120,7 +135,6 @@ files:
 - salt/railsapp/init.sls
 - salt/railsapp/mysql_database.sls
 - salt/railsapp/packages.sls
-- salt/run-standalone
 - salt/salt/minion/config.template
 - salt/salt/minion/debconf.sls
 - salt/salt/minion/init.sls
@@ -135,10 +149,13 @@ files:
 - salt/sysutils/net.sls
 - salt/sysutils/status.sls
 - salt/sysutils/tmux.sls
-- salt/vagrant.sls
 - salt/vagrant/minion
 - salt/vagrant/minion.sls
 - salt/vagrant/top.sls
+- salt/www/admin/etc/nginx/nginx.conf
+- salt/www/admin/etc/nginx/sites-available/.gitignore
+- salt/www/admin/etc/nginx/sites-available/phpmyadmin.conf
+- salt/www/admin/init.sls
 - salt/www/chromium.sls
 - salt/www/nginx/etc/nginx/nginx.conf
 - salt/www/nginx/init.sls

data/lib/salted_rails/capistrano.rb

@@ -1,8 +0,0 @@
-require "salted_rails_base"
-
-class SaltedRails < SaltedRailsBase
-  class Capistrano
-
-  end
-end
-

data/lib/salted_rails/vagrant_helper.rb

@@ -1,169 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-
-require 'erb'
-require 'yaml'
-require 'fileutils'
-require "salted_rails_base"
-
-class SaltedRails < SaltedRailsBase
-  class VagrantHelper
-
-    def initialize(rails_root, debug = false)
-      @logger = if debug
-          self
-        end
-
-      @rails_root = rails_root
-      @rails_root += '/' unless @rails_root =~ /\/$/
-
-      @gem_root = File.dirname(__FILE__) + '/../../'
-
-      @logger.info "RAILS_ROOT = #{@rails_root}" if @logger
-
-    end
-
-    def configure_vagrant(config)
-      config.vm.box = 'UbuntuCloud_12.04_32bit'
-      config.vm.box_url = 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-i386-disk1.box'
-    end
-
-    def configure_ubuntu_mirror(config, mirror = 'mirror://mirrors.ubuntu.com/mirrors.txt')
-      config.vm.provision "shell" do |s|
-        s.path = @gem_root + 'salt/bin/change_mirror.sh'
-        s.args = "'#{mirror}'"
-      end
-    end
-
-    def configure_digital_ocean(config, private_key_path = '~/.ssh/id_rsa', disable_vagrant_sync = true)
-      @logger.info 'Configuring digital ocean provider'  if @logger
-      config.vm.provider :digital_ocean do |provider, override|
-        override.ssh.username = 'vagrant'
-        override.vm.box = 'digital_ocean'
-        override.vm.box_url = 'https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box'
-        provider.image = 'Ubuntu 12.04 x32'
-        provider.region = 'San Francisco 1'
-        provider.ca_path = '/etc/ssl/certs/ca-certificates.crt' if File.exist?('/etc/ssl/certs/ca-certificates.crt')
-        override.vm.synced_folder '.', '/vagrant', :disabled => true if disable_vagrant_sync
-        override.ssh.private_key_path = private_key_path
-        @private_key_name = 'Vagrant ' + private_key_path.sub(/~\//, '').sub(/\.ssh\//, '').sub(/^id_/, '').gsub(/\W+/, ' ')
-        provider.ssh_key_name = @private_key_name if @private_key_name
-        override.ssh.forward_agent = true
-      end
-    end
-
-    def configure_salt(config)
-      pillarize_application_configuration
-      config.vm.synced_folder salt_root + 'salt/', '/srv/salt/'
-      config.vm.synced_folder salt_root + 'pillar/', '/srv/pillar/'
-      # Bootstrap salt
-      ## config.vm.provision :shell, :inline => 'salt-call --version || wget -O - http://bootstrap.saltstack.org | sudo sh'
-      # Provisioning #2: masterless highstate call
-      config.vm.provision :salt do |salt|
-        @logger.info 'Configuring salt provisioner'  if @logger
-        salt.minion_config = salt_root + 'salt/vagrant/minion'
-        salt.run_highstate = true
-        salt.verbose = true
-      end
-    end
-
-    def configure_ports(vm_config)
-      vm_config.vm.network :forwarded_port, :guest => 3000, :host => 3000, auto_correct: true
-      [ 80, 443 ].each do |port|
-        vm_config.vm.network :forwarded_port, :guest => port, :host => 3000+port, auto_correct: true
-      end
-    end
-
-    def configure_gui(vm_config)
-      vm_config.vm.boot_mode == :gui 
-      vm_config.vm.provision :salt do |salt|
-        salt.minion_config = salt_root + 'salt/vagrant/gui_minion'
-      end
-    end
-
-    def info(msg)
-      puts msg
-    end
-
-    private
-
-    def salt_root
-      @salt_root ||= @rails_root + (File.directory?(@rails_root + 'salt/salt') ? 'salt/' : 'tmp/')
-    end
-
-    # Add ruby version and gemfiles
-    
-    def pillarize_application_configuration
-      salt_dir = @rails_root + 'salt/salt/'
-      pillar_dir = @rails_root + 'salt/pillar/'
-      copy_in_tmp = ! File.directory?(salt_dir)
-      if copy_in_tmp
-        salt_dir = @rails_root + 'tmp/salt/'
-        pillar_dir = @rails_root + 'tmp/pillar/'
-      end
-      copy_all = ! File.directory?(salt_dir)
-
-      pillar_app_file = pillar_dir + 'application.sls'
-      version_file = @rails_root + '.ruby-version'
-      database_file = @rails_root + 'config/database.yml'
-      gemfile = @rails_root + 'Gemfile'
-
-      rails_config_changed = ! (File.exist?(pillar_app_file) and File.directory?(salt_dir))
-      rails_config_changed ||= (File.mtime(__FILE__) > File.mtime(pillar_app_file))
-      files = [ version_file, database_file, gemfile ]
-      files <<= "#{gemfile}.lock" if File.exist? "#{gemfile}.lock"
-      files.each do |f|
-        rails_config_changed ||= (File.mtime(f) > File.mtime(pillar_app_file))
-      end
-      copy_all ||= rails_config_changed if copy_in_tmp
-
-      if copy_all
-        @logger.info "Copying default rules to tmp/salt and tmp/pillar" if @logger
-        FileUtils.rm_rf(pillar_dir)
-        FileUtils.rm_rf(salt_dir)
-        FileUtils.mkdir_p(pillar_dir)
-        FileUtils.mkdir_p(salt_dir)
-
-        FileUtils.cp_r(@gem_root + 'pillar/.', pillar_dir)
-        FileUtils.cp_r(@gem_root + 'salt/.', salt_dir)
-      else
-        @logger.info 'skipped creation of salt and pillar (up to date)' if @logger
-     end
-
-     if rails_config_changed
-        dest = salt_dir + "railsapp/files"
-        FileUtils.mkdir_p dest
-        files.each do |file|
-          @logger.info "Copying #{file} to #{dest}" if @logger
-          FileUtils.cp(file, dest)
-        end
-
-        File.open(pillar_app_file, 'w') do |f_out|
-          ENV['VAGRANT_MACHINE'] = 'true'
-          database_conf = YAML.load(ERB.new(IO.read(database_file)).result)
-          ruby_version = File.open(version_file, 'r') do |f_in|
-            f_in.gets.gsub(/\s/,'')
-          end
-          app_config = {
-            'database' => database_conf,
-            'ruby-version' => ruby_version,
-            'gems' => { }
-            }
-          database_conf.each do |key, details|
-            app_config['gems'][details['adapter']] = true
-          end
-          File.foreach(gemfile) do |line|
-            app_config['gems'][$1] = true if (line =~ /^\s*gem\s*['"]([^'"]+)/)
-          end
-          f_out.puts app_config.to_yaml
-        end
-      else
-        @logger.info 'skipped configuration of salt and pillar (up to date)' if @logger
-      end
-
-    end
-
-  end
-
-end