rubber 2.1.2 → 2.2.0

data/templates/solr/config/rubber/rubber-solr.yml

@@ -0,0 +1,10 @@
+jdk: JDK_TAR_GZ_FILE_NAME
+jdk_path: JDK_TAR_GZ_FILE_NAME_INC_FILE_NAME
+solr_xml: SOLR_XML_FILE_NAME
+solr_xml_path: SOLR_XML_FILE_PATH_AND_NAME
+core_name: SOLR_CORE_NAME
+tarz_config_files: PATH_TO_SOLR_CIONFIG_TAR_GZ_FILE
+tomcat_dest_folder: TOMCAT7_DEST_FOLER
+solr_home_dest_foler: SOLR_BASE_FOLDER
+Xmx: HEAP_SPACE_FOR_JVM (e.g. 1024m or 2gb etc)
+

data/templates/solr/templates.yml

@@ -0,0 +1,3 @@
+description: The apache solr module
+dependent_templates:
+  - base

data/templates/sphinx/config/rubber/deploy-sphinx.rb

@@ -17,7 +17,7 @@ namespace :rubber do
 
     task :custom_install, :roles => :sphinx do
       # install sphinx from source
-      ver = "0.9.9"
+      ver = "2.0.6"
       rubber.sudo_script 'install_sphinx', <<-ENDSCRIPT
         # check if already installed
         if [ -x /usr/local/bin/searchd ]
@@ -32,10 +32,10 @@ namespace :rubber do
         TMPDIR=`mktemp -d` || exit 1
         cd $TMPDIR
         echo 'Downloading'
-        wget -qN http://www.sphinxsearch.com/files/sphinx-#{ver}.tar.gz
+        wget -qN http://sphinxsearch.com/files/sphinx-#{ver}-release.tar.gz
         echo 'Unpacking'
-        tar xf sphinx-#{ver}.tar.gz
-        cd sphinx-#{ver}
+        tar xf sphinx-#{ver}-release.tar.gz
+        cd sphinx-#{ver}-release
         ./configure
         make
         make install

data/templates/torquebox/config/rubber/deploy-torquebox.rb

@@ -17,6 +17,15 @@ namespace :rubber do
           rm -f #{rubber_env.torquebox_dir}
           ln -s #{rubber_env.torquebox_prefix}/torquebox-#{rubber_env.torquebox_version} #{rubber_env.torquebox_dir}
 
+          # Create the log dir.
+          mkdir -p #{rubber_env.torquebox_log_dir}
+          chown -R #{rubber_env.app_user} #{rubber_env.torquebox_log_dir}
+
+          # Set up libraries for graylog logger.
+          mkdir -p #{rubber_env.torquebox_dir}/jboss/modules/org/graylog2/logging/main
+          wget -qNO "#{rubber_env.torquebox_dir}/jboss/modules/org/graylog2/logging/main/gelfj-1.0.1.jar" https://github.com/downloads/t0xa/gelfj/gelfj-1.0.1.jar
+          wget -qNO "#{rubber_env.torquebox_dir}/jboss/modules/org/graylog2/logging/main/json-simple-1.1.1.jar" http://json-simple.googlecode.com/files/json-simple-1.1.1.jar
+
           # Cleanup after ourselves.
           rm torquebox-dist-#{rubber_env.torquebox_version}-bin.zip
         fi
@@ -46,11 +55,10 @@ namespace :rubber do
     on :load do
       rubber.serial_task self, :serial_reload, :roles => [:torquebox] do
         rsudo "touch #{jboss_home}/standalone/deployments/#{application}-knob.yml.dodeploy"
+        rsudo "if ! ps ax | grep -v grep | grep -c torque &> /dev/null; then service torquebox start; fi"
 
         # Wait for TorqueBox to startup before moving on so we don't remove all hosts from the cluster.
-        logger.info "Waiting for TorqueBox to startup"
-
-        #rsudo "while ! curl -s -f http://$HOSTNAME:#{rubber_env.torquebox_http_port} &> /dev/null; do echo .; sleep 1; done"
+        logger.info "Waiting for TorqueBox to deploy"
 
         # TorqueBox first "deploys" the app, then lets the web context startup.  While it's deploying,
         # the old context can still service requests.  So, we need to wait until the app is deployed before we can
@@ -80,6 +88,10 @@ namespace :rubber do
       rsudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{shared_path}/cache"
     end
 
+    before "deploy:stop", "rubber:torquebox:stop"
+    after "deploy:start", "rubber:torquebox:start"
+    after "deploy:restart", "rubber:torquebox:reload"
+
     task :restart, :roles => :torquebox do
       stop
       start
@@ -90,7 +102,7 @@ namespace :rubber do
     end
 
     task :start, :roles => :torquebox do
-      rsudo "service torquebox start || true"
+      rsudo "service torquebox start"
     end
 
     after "deploy:restart", "rubber:torquebox:reload"

data/templates/torquebox/config/rubber/role/app/torquebox-apache-vhost.conf

@@ -1,6 +1,11 @@
 <%
-  @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-passenger"
-  @post = "a2enmod rewrite && a2enmod ssl && a2enmod expires && a2enmod xsendfile && a2ensite #{rubber_env.app_name}"
+  @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-torquebox"
+  @post = "a2enmod rewrite && a2enmod ssl && a2enmod expires && a2enmod xsendfile && a2ensite #{rubber_env.app_name}-torquebox"
+
+  sidekiq_gem_path = if rubber_instances.for_role('sidekiq').any?
+      require 'sidekiq'
+      `find /mnt/#{rubber_env.app_name}-#{RUBBER_ENV}/shared/bundle -name sidekiq-#{Sidekiq::VERSION}`.strip
+    end
 %>
 
 NameVirtualHost *:<%= rubber_env.apache_listen_port %>
@@ -22,10 +27,12 @@ Listen <%= port %>
   # Don't show haproxy checks in access log (see also apache2.conf)
   SetEnvIf Request_URI "^/httpchk.txt$" dontlog
 
-  RailsEnv  <%= Rubber.env %>
-
   XSendFile on
 
+  <% if rubber_instances.for_role('sidekiq').any? %>
+  XSendFilePath <%= sidekiq_gem_path %>/web/assets
+  <% end %>
+
   RewriteEngine On
   RewriteCond %{HTTP_HOST} ^<%= rubber_env.domain %>$
   RewriteRule ^(.*)$ http://www.<%= rubber_env.domain %>$1 [R,L]
@@ -48,6 +55,9 @@ Listen <%= port %>
     # Cache the resource even if SSL is in use.
     Header merge Cache-Control public
 
+    # Remove any cookies set with the request so we avoid them being cached in a CDN.
+    Header unset Set-Cookie
+
     SetEnv no-gzip
   </LocationMatch>
 
@@ -70,7 +80,7 @@ Listen <%= port %>
   </FilesMatch>
   <% end %>
 
-  <% if port == rubber_env.passenger_listen_ssl_port %>
+  <% if port == rubber_env.apache_listen_ssl_port %>
   SSLEngine on
   SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
   SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem

data/templates/torquebox/config/rubber/role/torquebox/graylog-logging-module.xml

@@ -0,0 +1,9 @@
+<%
+  @path = "#{rubber_env.torquebox_dir}/jboss/modules/org/graylog2/logging/main/module.xml"
+%>
+<module xmlns="urn:jboss:module:1.0" name="org.graylog2.logging">
+<resources>
+  <resource-root path="gelfj-1.0.1.jar"/>
+  <resource-root path="json-simple-1.1.1.jar"/>
+</resources>
+</module>

data/templates/torquebox/config/rubber/role/torquebox/standalone-ha.xml

@@ -1,5 +1,6 @@
 <%
         @path = "#{rubber_env.torquebox_dir}/jboss/standalone/configuration/standalone-ha.xml"
+        graylog_server = rubber_instances.for_role("graylog_server").first
         %><?xml version='1.0' encoding='UTF-8'?>
 <server xmlns='urn:jboss:domain:1.3'>
 <extensions>
@@ -44,6 +45,7 @@
   <extension module='org.torquebox.jobs'/>
   <extension module='org.projectodd.polyglot.hasingleton'/>
   <extension module='org.projectodd.polyglot.cache'/>
+  <extension module="org.projectodd.polyglot.stomp"/>
 </extensions>
 <system-properties>
   <property name='org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR' value='false'/>
@@ -92,6 +94,18 @@
       <suffix value='.yyyy-MM-dd'/>
       <append value='true'/>
     </periodic-rotating-file-handler>
+    <% if graylog_server %>
+    <custom-handler name='GRAYLOG' class='org.graylog2.logging.GelfHandler' module='org.graylog2.logging'>
+      <level name='INFO'/>
+      <properties>
+        <property name='graylogHost' value='<%= graylog_server.full_name %>'/>
+        <property name='graylogPort' value='<%= rubber_env.graylog_server_port %>'/>
+        <property name='originHost' value='<%= rubber_env.host %>'/>
+        <property name='facility' value='torquebox'/>
+        <property name='extractStacktrace' value='true'/>
+      </properties>
+    </custom-handler>
+    <% end %>
     <logger category='com.arjuna'>
       <level name='WARN'/>
     </logger>
@@ -112,6 +126,9 @@
       <handlers>
         <handler name='CONSOLE'/>
         <handler name='FILE'/>
+        <% if graylog_server %>
+        <handler name='GRAYLOG'/>
+        <% end %>
       </handlers>
     </root-logger>
     <logger category='org.jboss.jca.adapters.jdbc.extensions.mysql'>
@@ -222,9 +239,9 @@
         <file-store/>
       </replicated-cache>
       <!--
-      ~  Clustered cache used internally by EJB subsytem for managing the client-mapping(s) of
-      ~                 the socketbinding referenced by the EJB remoting connector
-      -->
+        ~  Clustered cache used internally by EJB subsytem for managing the client-mapping(s) of
+        ~                 the socketbinding referenced by the EJB remoting connector
+        -->
       <replicated-cache name='remote-connector-client-mappings' mode='SYNC' batching='true'/>
       <distributed-cache name='dist' mode='ASYNC' batching='true' l1-lifespan='0'>
         <eviction strategy='LRU' max-entries='10000'/>
@@ -566,7 +583,7 @@
   <subsystem xmlns='urn:jboss:domain:torquebox-bootstrap:1.0'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-core:1.0'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0' socket-binding='stomp'/>
+  <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
@@ -574,6 +591,7 @@
   <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
   <subsystem xmlns='urn:jboss:domain:polyglot-hasingleton:1.0'/>
   <subsystem xmlns='urn:jboss:domain:polyglot-cache:1.0'/>
+  <subsystem xmlns="urn:jboss:domain:polyglot-stomp:1.0" socket-binding="stomp"/>
 </profile>
 <interfaces>
   <interface name='management'>
@@ -585,9 +603,9 @@
   <!-- TODO - only show this if the jacorb subsystem is added  -->
   <interface name='unsecure'>
     <!--
-    ~  Used for IIOP sockets in the standard configuration.
-    ~                  To secure JacORB you need to setup SSL
-    -->
+      ~  Used for IIOP sockets in the standard configuration.
+      ~                  To secure JacORB you need to setup SSL
+      -->
     <inet-address value='${jboss.bind.address.unsecure:127.0.0.1}'/>
   </interface>
 </interfaces>

data/templates/torquebox/config/rubber/role/torquebox/standalone.conf

@@ -51,7 +51,7 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JAVA_OPTS" = "x" ]; then
-   JAVA_OPTS="-Xms64m -Xmx768m -Xss2048k -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -server"
+   JAVA_OPTS="-Xms64m -Xmx768m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -server"
    JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true"
    JAVA_OPTS="$JAVA_OPTS -Djboss.bind.address=<%= rubber_env.full_host %>"
    JAVA_OPTS="$JAVA_OPTS -Djboss.mod_cluster.proxyList=<%= rubber_instances.for_role('web').collect { |host| "#{host.full_name}:80" }.join(',') %>"
@@ -74,7 +74,7 @@ fi
 #JAVA_OPTS="$JAVA_OPTS -Djboss.modules.metrics=true"
 
 
-JAVA_OPTS="$JAVA_OPTS $APPEND_JAVA_OPTS"
+JAVA_OPTS="$JAVA_OPTS -Xss2048k -Djruby.compile.invokedynamic=false -Dorg.quartz.scheduler.skipUpdateCheck=true $APPEND_JAVA_OPTS"
 
 # Prevent RVM from messing with TorqueBox loading.
 unset GEM_PATH

data/templates/torquebox/config/rubber/rubber-torquebox.yml

@@ -1,4 +1,4 @@
-torquebox_version: 2.1.0
+torquebox_version: 2.3.0
 torquebox_prefix: /opt
 torquebox_dir: "#{torquebox_prefix}/torquebox"
 torquebox_log_dir: /var/log/torquebox
@@ -7,11 +7,14 @@ torquebox_http_port: 9090
 torquebox_https_port: 9443
 torquebox_ajp_port: 8009
 
-backstage_user: nirvdrum
-backstage_password: negativetwenty
+backstage_user: admin
+backstage_password: admin123
 
 mod_cluster_version: 1.2.0
 
+apache_listen_port: 80
+apache_listen_ssl_port: 443
+
 roles:
   torquebox:
     packages: [openjdk-7-jdk libaio1, unzip]

data/templates/zookeeper/config/rubber/rubber-zookeeper.yml

@@ -1,5 +1,5 @@
 zookeeper_version: 3.3.6
-zookeeper_package_url: "http://www.ecoficial.com/am/zookeeper/stable/zookeeper-#{zookeeper_version}.tar.gz"
+zookeeper_package_url: "http://www.globalish.com/am/zookeeper/zookeeper-#{zookeeper_version}/zookeeper-#{zookeeper_version}.tar.gz"
 zookeeper_install_dir: "/usr/local/zookeeper-#{zookeeper_version}"
 zookeeper_data_dir: /mnt/zookeeper/data
 zookeeper_pid_file: "#{zookeeper_data_dir}/zookeeper_server.pid"

data/test/command_test.rb

@@ -3,25 +3,27 @@ require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 class CommandTest < Test::Unit::TestCase
 
   def setup
-    ENV['RUBBER_ROOT'] = Rubber.root
+    @project_root = File.expand_path(File.join(__FILE__, '../..'))
+    @rubber = "#{@project_root}/bin/rubber"
+    ENV['RUBBER_ROOT'] = @project_root
   end
   
   def test_rubber_help
-    out = `rubber`
+    out = `#{@rubber}`
     assert out =~ /Subcommands:\n(.*)\nOptions:/m
     subcommands = $1.scan(/^\s*(\S+)\s*/).flatten
-    assert_equal ["config", "cron", "util:rotate_logs", "util:backup", "util:backup_db", "util:restore_db", "vulcanize"].sort, subcommands.sort
+    assert_equal ["config", "cron", "util:rotate_logs", "util:backup", "util:backup_db", "util:obfuscation", "util:restore_db", "vulcanize"].sort, subcommands.sort
   end
 
   def test_rubber_help_size
-    out = `rubber --help`
+    out = `#{@rubber} --help`
     assert out.lines.all? {|l| l.size <= 81 }
     
     assert out =~ /Subcommands:\n(.*)\nOptions:/m
     subcommands = $1.scan(/^\s*(\S+)\s*/).flatten
     assert subcommands.size > 0
     subcommands.each do |s|
-      out = `rubber #{s} --help`
+      out = `#{@rubber} #{s} --help`
       assert out.lines.all? {|l| l.size <= 81 }, "help for #{s} exceeds 80 chars"
     end
   

data/test/commands/cron_test.rb

@@ -3,24 +3,28 @@ require File.expand_path(File.join(__FILE__, '../..', 'test_helper'))
 class CronTest < Test::Unit::TestCase
 
   def setup
-    system("rm -f #{Rubber.root}/log/*.log")
-    ENV['RUBBER_ROOT'] = Rubber.root
+    @project_root = File.expand_path(File.join(__FILE__, '../../..'))
+    @rubber_root = "#{@project_root}/test"
+    @rubber = "#{@project_root}/bin/rubber"
+    ENV['RUBBER_ROOT'] = @rubber_root
+    ENV['BUNDLE_GEMFILE'] = "#{@project_root}/Gemfile"
+    system("rm -f #{@rubber_root}/log/*.log")
   end
   
   def teardown
-    system("rm -f #{Rubber.root}/log/*.log")
+    system("rm -f #{@rubber_root}/log/*.log")
   end
 
   def test_rubber_cron_basic
     date = Time.now.tv_sec.to_s
-    out = `rubber cron echo #{date}`
+    out = `#{@rubber} cron echo #{date}`
 
     assert_equal 0, $?
     assert_equal "", out
 
-    logs = Dir["#{Rubber.root}/log/*.log"]
+    logs = Dir["#{@rubber_root}/log/*.log"]
     assert_equal 1, logs.size
-    assert_equal "#{Rubber.root}/log/cron-sh-echo.log", logs.first
+    assert_equal "#{@rubber_root}/log/cron-sh-echo.log", logs.first
     assert_match /rubber:cron running \["echo", "#{date}"\] at/, File.read(logs.first).strip
     assert_match /\n#{date}$/, File.read(logs.first).strip
   end
@@ -28,15 +32,15 @@ class CronTest < Test::Unit::TestCase
   def test_rubber_cron_log_append
     date = Time.now.tv_sec.to_s
 
-    out = `rubber cron echo #{date}`
+    out = `#{@rubber} cron echo #{date}`
     assert_equal 0, $?
     assert_equal "", out
 
-    out = `rubber cron echo #{date}`
+    out = `#{@rubber} cron echo #{date}`
     assert_equal 0, $?
     assert_equal "", out
 
-    logs = Dir["#{Rubber.root}/log/*.log"]
+    logs = Dir["#{@rubber_root}/log/*.log"]
     assert_equal 1, logs.size
     running_lines = File.read(logs.first).lines.to_a.grep(/rubber:cron running/)
     assert_equal 2, running_lines.size
@@ -44,38 +48,38 @@ class CronTest < Test::Unit::TestCase
   
   def test_rubber_cron_logfile
     date = Time.now.tv_sec.to_s
-    out = `rubber cron -l #{Rubber.root}/log/foo.log -- echo #{date}`
-    logs = Dir["#{Rubber.root}/log/*.log"]
+    out = `#{@rubber} cron -l #{@rubber_root}/log/foo.log -- echo #{date}`
+    logs = Dir["#{@rubber_root}/log/*.log"]
     assert_equal 1, logs.size
-    assert_equal "#{Rubber.root}/log/foo.log", logs.first
+    assert_equal "#{@rubber_root}/log/foo.log", logs.first
     assert_match /\n#{date}$/, File.read(logs.first).strip
   end
   
   def test_rubber_cron_task_logfile
     date = Time.now.tv_sec.to_s
-    out = `rubber cron --task -- cron -o -- echo #{date}`
-    logs = Dir["#{Rubber.root}/log/cron-task*.log"]
+    out = `#{@rubber} cron --task -- cron -o -- echo #{date}`
+    logs = Dir["#{@rubber_root}/log/cron-task*.log"]
     assert_equal 1, logs.size
     assert_match /\n#{date}$/, File.read(logs.first).strip
   end
   
   def test_rubber_cron_directory_changed
-    out = `rubber cron -o -r /tmp -- pwd`
+    out = `#{@rubber} cron -o -r /tmp -- pwd`
     assert_match /(\/private)?\/tmp/, out, "Unexpected output:\n#{out}"
   end
   
   def test_rubber_cron_output_empty
-    out = `rubber cron -- ls -la`
+    out = `#{@rubber} cron -- ls -la`
     assert_equal "", out, "Unexpected output:\n#{out}"
   end
 
   def test_rubber_cron_output_echoed
-    out = `rubber cron -o -- ls -la`
+    out = `#{@rubber} cron -o -- ls -la`
     assert_not_equal "", out, "Unexpected output:\n#{out}"
   end
   
   def test_rubber_cron_output_on_error
-    out = `rubber cron -- ls -la jkbhbj`
+    out = `#{@rubber} cron -- ls -la jkbhbj`
     assert_not_equal 0, $?
     assert_not_equal "", out, "Unexpected output:\n#{out}"
   end

data/test/commands/util_test.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.join(__FILE__, '../..', 'test_helper'))
+
+class UtilTest < Test::Unit::TestCase
+
+  def setup
+    @project_root = File.expand_path(File.join(__FILE__, '../../..'))
+    @rubber = "#{@project_root}/bin/rubber"
+    @key = Rubber::Encryption.generate_encrypt_key
+    ENV['RUBBER_ROOT'] = @project_root
+  end
+  
+  context "obfuscation" do
+
+    should "generate a key" do
+      out = `#{@rubber} util:obfuscation -g`
+      assert_equal 0, $?, "Process failed, output: #{out}"
+      assert_match /Obfuscation key: [^\n\s]+/, out
+    end
+    
+    should "encrypt and decrypt rubber-secret.yml" do
+      pend('This is not yet working on JRuby.') if defined?(JRUBY_VERSION)
+
+      fixture_dir = File.expand_path("#{File.dirname(__FILE__)}/../fixtures/secret")
+      out = `#{@rubber} util:obfuscation -f '#{fixture_dir}/secret.yml' -k '#{@key}'`
+      assert_equal 0, $?, "Process failed, output: #{out}"
+      assert out.size > 0
+      assert_no_match /secret_key: secret_val/, out
+      
+      tempfile = Tempfile.new('encryptedsecret')
+      open(tempfile.path, "w") {|f| f.write(out) }
+      
+      out2 = `#{@rubber} util:obfuscation -f '#{tempfile.path}' -k '#{@key}' -d`
+      assert_equal 0, $?, "Process failed, output: #{out2}"
+      assert out2.size > 0
+      assert_match /secret_key: secret_val/, out2
+    end
+
+  end
+  
+end