rubber 2.1.0 → 2.1.1

data/templates/graylog/config/rubber/role/graylog_web/graylog_web-upstart.conf

@@ -9,7 +9,7 @@ stop on runlevel [016]
 
 script
   cd <%= rubber_env.graylog_web_dir %>
-  exec bash -l -c "passenger start -e production --user <%= rubber_env.app_user %> -p <%= rubber_env.graylog_web_port %> --log-file <%= rubber_env.graylog_web_dir %>/log/server.log"
+  exec bash -l -c "bundle exec puma -p <%= rubber_env.graylog_web_port %> <%= rubber_env.graylog_web_dir %>/config.ru"
 end script
 
 post-start script

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

@@ -1,4 +1,4 @@
-graylog_server_version: "0.9.6"
+graylog_server_version: "0.9.6p1"
 graylog_server_pkg_url: "https://github.com/downloads/Graylog2/graylog2-server/graylog2-server-#{graylog_server_version}.tar.gz"
 graylog_server_prefix: "/usr/local"
 graylog_server_dir: "#{graylog_server_prefix}/graylog2-server-#{graylog_server_version}"
@@ -6,7 +6,7 @@ graylog_server_pid_file: "/var/run/graylog-server.pid"
 graylog_server_port: 12201
 graylog_server_syslog_port: 12514
 
-graylog_web_version: "0.9.6"
+graylog_web_version: "0.9.6p1"
 graylog_web_pkg_url: "https://github.com/downloads/Graylog2/graylog2-web-interface/graylog2-web-interface-#{graylog_web_version}.tar.gz"
 graylog_web_prefix: "/usr/local"
 graylog_web_dir: "#{graylog_web_prefix}/graylog2-web-interface-#{graylog_web_version}"
@@ -37,6 +37,6 @@ roles:
     packages: [openjdk-6-jdk, mongodb-10gen]
   graylog_web:
     packages: [libcurl4-openssl-dev]
-    gems: [[passenger, "#{passenger_version || '3.0.7'}"]]
+    gems: [puma]
 
 gems: [gelf, graylog2_exceptions, graylog2-resque]

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

@@ -1,78 +1,91 @@
 
 namespace :rubber do
-  
+
   namespace :jenkins do
-    
+
     rubber.allow_optional_tasks(self)
-    
+
     before "rubber:install_packages", "rubber:jenkins:setup_apt_sources"
-  
+
     task :setup_apt_sources, :roles => :jenkins do
       # Setup apt sources to jenkins
       sources = <<-SOURCES
         deb http://pkg.jenkins-ci.org/debian binary/
       SOURCES
       sources.gsub!(/^[ \t]*/, '')
-      put(sources, "/etc/apt/sources.list.d/jenkins.list") 
+      put(sources, "/etc/apt/sources.list.d/jenkins.list")
       rsudo "wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add -"
     end
 
-    after "rubber:bootstrap", "rubber:jenkins:bootstrap"
+    after "rubber:apache:bootstrap", "rubber:jenkins:bootstrap"
 
     task :bootstrap, :roles => :jenkins do
       exists = capture("echo $(ls /etc/apache2/jenkins.auth 2> /dev/null)")
       if exists.strip.size == 0
         rubber.update_code_for_bootstrap
-        rubber.run_config(:file => "role/jenkins/", :force => true, :deploy_path => release_path)
+        rubber.run_config(:file => "role/jenkins", :force => true, :deploy_path => release_path)
 
         restart
         rubber.apache.restart
-        
+
         # user specific bootstrap (add plugins, etc)
+        sleep(5) # Allow Jenkins enough time to start up.
         custom_bootstrap
       end
     end
 
     task :custom_bootstrap, :roles => :jenkins do
       jenkins_cli = "java -jar /var/cache/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:#{rubber_env.jenkins_proxy_port}/"
-      
-      rsudo "#{jenkins_cli} install-plugin -restart github"
-      
-      rubber.sudo_script 'configure_git', <<-ENDSCRIPT
+
+      rubber.sudo_script "update_jenkins_plugin_list", <<-ENDSCRIPT
+        curl -L http://updates.jenkins-ci.org/update-center.json | sed '1d;$d' | curl -X POST -H "Accept: application/json" -d @- http://localhost:#{rubber_env.jenkins_proxy_port}/updateCenter/byId/default/postBack
+      ENDSCRIPT
+
+      rsudo "#{jenkins_cli} install-plugin github"
+      rsudo "#{jenkins_cli} install-plugin gravatar"
+      rsudo "#{jenkins_cli} install-plugin brakeman"
+      rsudo "#{jenkins_cli} install-plugin rubyMetrics"
+      rsudo "#{jenkins_cli} install-plugin xvfb"
+      rsudo "#{jenkins_cli} restart"
+
+      init_jenkins_user_ssh = <<-ENDSCRIPT
         # Get host key for src machine to prevent ssh from failing
-        rm -f #{jenkins_build_home}/.ssh/known_hosts
+        rm -f #{rubber_env.jenkins_build_home}/.ssh/known_hosts
         ssh -o 'StrictHostKeyChecking=no' git@github.com &> /dev/null || true
       ENDSCRIPT
+
+      rubber.sudo_script 'configure_git', init_jenkins_user_ssh, :as => "jenkins"
+
       #
       # Manual configuration steps in jenkins webui
       #
+      # Set discard old builds (7 days?)
+      # Set email notification
       # set github project (url for linking from build results): http://github.com/user/project/
       # set repository url to github clone address: git@github.com:user/project.git
       # set branches to build to: master
-      # Under git advanced settings:
-      #    Set Config user.name: jenkins
-      #    Set Config user.email: jenkins@localhost
+      # Check Build when a change is pushed to GitHub
+      #   (add https://jenkins.host/github-webhook/ to github post receive hook on github project)
       # Set build command to:
-      #    export RAILS_ENV=development
-      #    bundle install --path $HOME/bundler
-      #    bundle exec rake db:drop:all db:setup
-      #    bundle exec rake
+      #    ./script/ci_test.sh
+      # Check Publish JUnit test result report, xmls: test/reports/*.xml
+      # Check Publish Rcov report, directory: coverage/rcov
     end
-    
+
     desc <<-DESC
       Starts the jenkins daemon
     DESC
     task :start, :roles => :jenkins do
       rsudo "service jenkins start"
     end
-    
+
     desc <<-DESC
       Stops the jenkins daemon
     DESC
     task :stop, :roles => :jenkins do
       rsudo "service jenkins stop || true"
     end
-    
+
     desc <<-DESC
       Restarts the jenkins daemon
     DESC
@@ -80,7 +93,7 @@ namespace :rubber do
       stop
       start
     end
-    
+
   end
 
 end

data/templates/jenkins/config/rubber/role/jenkins/crontab

@@ -0,0 +1,7 @@
+<%
+  @read_cmd = 'crontab -l'
+  @write_cmd = 'crontab -'
+  @additive = ["# rubber-confluence-start", "# rubber-confluence-end"]
+%>
+
+0 2 * * * cd <%= Rubber.root %> && ./bin/rubber cron --task util:backup --directory=/mnt/jenkins_backups --name=jenkins --command="nice zip -r \%dir\%/jenkins_<%= rubber_env.host %>_\%time_stamp\%.zip <%= rubber_env.jenkins_build_home %>  -x \*.bundler\* \*bundler\* \*.gem\* \*.java\* \*.dbus\* \*.mozilla\*"

data/templates/jenkins/config/rubber/role/jenkins/github-deploy-key.pem

@@ -1,6 +1,8 @@
 <%
   @path = "#{rubber_env.jenkins_build_home}/.ssh/id_dsa"
   @perms = 0600
+  @owner = "jenkins"
+  @post = "chown #{@owner} #{rubber_env.jenkins_build_home}/.ssh"
 %>
 
 <% raise "Create a ssh keypair and add the private key contents here, or delete this file" %>

data/templates/jenkins/config/rubber/role/jenkins/github-deploy-key.pem.pub

@@ -1,5 +1,7 @@
 <%
   @path = "#{rubber_env.jenkins_build_home}/.ssh/id_dsa.pub"
   @perms = 0600
+  @owner = "jenkins"
+  @post = "chown #{@owner} #{rubber_env.jenkins_build_home}/.ssh"
 %>
 <% raise "Create a ssh keypair and add the public key contents here, or delete this file" %>

data/templates/jenkins/config/rubber/role/jenkins/jenkins-apache-vhost.conf

@@ -32,7 +32,7 @@ NameVirtualHost *:<%= rubber_env.jenkins_web_ssl_port %>
     AuthType Basic
     AuthName "Jenkins"
     AuthUserFile /etc/apache2/jenkins.auth
-    Require user <%= rubber_env.web_tools_user %>
+    Require valid-user
 
     Allow from all
   </Location>

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

@@ -30,4 +30,4 @@ security_groups:
 roles:
   jenkins:
     assigned_security_groups: [jenkins_web]
-    packages: [openjdk-6-jdk, jenkins]
+    packages: [openjdk-7-jdk, jenkins, xvfb, firefox]

data/templates/monit/config/rubber/role/couchbase/monit-couchbase.conf

@@ -0,0 +1,7 @@
+<%
+  @path = '/etc/monit/monit.d/monit-couchbase.conf'
+%>
+check process couchbase with pidfile <%= rubber_env.couchbase_pid_file %>
+  group couchbase-<%= Rubber.env %>
+  start program = "/usr/bin/env service couchbase-server start"
+  stop program = "/usr/bin/env service couchbase-server stop"

data/templates/monit/config/rubber/role/resque_scheduler/monit-resque_scheduler.conf

@@ -0,0 +1,10 @@
+<%
+  @path = '/etc/monit/monit.d/monit-resque_scheduler.conf'
+%>
+
+check process resque_scheduler with pidfile <%= rubber_env.resque_scheduler_pid_file %>
+  group resque-<%= Rubber.env %>
+  start program = "/usr/bin/env service resque-scheduler start"
+  stop program = "/usr/bin/env service resque-scheduler stop"
+
+  if totalmem > 350.0 MB for 15 cycles then restart

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

@@ -40,6 +40,7 @@ namespace :rubber do
             pass = "identified by '#{env.db_pass}'" if env.db_pass
             rubber.sudo_script "create_master_db", <<-ENDSCRIPT
               mysql -u root -e "create database #{env.db_name};"
+              mysql -u root -e "delete from mysql.user where user='' and host='localhost';"
               mysql -u root -e "grant all on *.* to '#{env.db_user}'@'%' #{pass};"
               mysql -u root -e "grant select on *.* to '#{env.db_slave_user}'@'%' #{pass};"
               mysql -u root -e "grant replication slave on *.* to '#{env.db_replicator_user}'@'%' #{pass};"

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

@@ -20,17 +20,56 @@ namespace :rubber do
         fi
       ENDSCRIPT
     end
+    
+    on :load do
+      # serial_reload and serial_restart
+      apache_serial_tasks = rubber.apache.tasks.values.select {|t| t.name =~ /^_serial_task_serial_/ }
+      
+      apache_serial_tasks.each do |apache_task|
+        qualifier = apache_task.name.to_s.gsub(/^_serial_task_serial_/, '')
+        remove_pool_name = "serial_remove_from_pool_#{qualifier}"
+        add_pool_name = "serial_add_to_pool_#{qualifier}"
+        
+        task remove_pool_name.to_sym,
+             search_task(:remove_from_pool).options.merge(:hosts => apache_task.options[:hosts]),
+             &search_task(:remove_from_pool).body
+        task add_pool_name.to_sym,
+             search_task(:add_to_pool).options.merge(:hosts => apache_task.options[:hosts]),
+             &search_task(:add_to_pool).body
+        before apache_task.fully_qualified_name, "rubber:passenger:#{remove_pool_name}"
+        after apache_task.fully_qualified_name, "rubber:passenger:#{add_pool_name}"
+      end
+    end
+    
+    before "rubber:apache:stop", "rubber:passenger:remove_from_pool"
+
+    task :remove_from_pool, :roles => :passenger do
+      maybe_sleep = " && sleep 5" if Rubber.env == 'production'
+      rsudo "rm -f #{releases_path}/*/public/httpchk.txt#{maybe_sleep}"
+    end
+    
+    after "rubber:apache:start", "rubber:passenger:add_to_pool"
+    
+    task :add_to_pool, :roles => :passenger do
+      # Wait for passenger to startup before adding host back into haproxy pool
+      logger.info "Waiting for passenger to startup"
 
+      opts = get_host_options('rolling_restart_port') {|port| port.to_s}
+      rsudo "while ! curl -s -f http://localhost:$CAPISTRANO:VAR$/ &> /dev/null; do echo .; done", opts
+      rsudo "touch #{current_path}/public/httpchk.txt"
+    end
+    
+    
     # passenger depends on apache for start/stop/restart, just need these defined
     # as apache hooks into standard deploy lifecycle
-    
-    deploy.task :restart, :roles => :app do
+
+    deploy.task :restart, :roles => :passenger do
     end
     
-    deploy.task :stop, :roles => :app do
+    deploy.task :stop, :roles => :passenger do
     end
     
-    deploy.task :start, :roles => :app do
+    deploy.task :start, :roles => :passenger do
     end
     
   end

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

@@ -1,4 +1,4 @@
-passenger_version: 3.0.12
+passenger_version: 3.0.15
 passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{rvm_prefix}/wrappers/#{`bash -l -c 'rvm strings #{rvm_ruby}'`.strip}/ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
@@ -13,4 +13,7 @@ roles:
   passenger:
     packages: [apache2-mpm-prefork, apache2-prefork-dev, libcurl4-openssl-dev, libapache2-mod-xsendfile]
     gems: [fastthread, rack, [passenger, "#{passenger_version}"]]
+    rolling_restart_port: "#{passenger_listen_port}"
 
+  web_tools:
+    rolling_restart_port: "#{web_tools_port}"

data/templates/passenger_nginx/config/rubber/role/passenger_nginx/application.conf

@@ -28,3 +28,16 @@ location = /404.html
 {
   root <%= Rubber.root + "/public" %>;
 }
+
+<% if Rubber::Util.has_asset_pipeline? %>
+# Give static assets a far-future header and serve the pre-compressed version of the asset
+# instead of compressing on the fly.
+location ~ ^/(assets)/ {
+  gzip_static on;
+  expires     max;
+  add_header  Cache-Control public;
+  add_header  Last-Modified "";
+  add_header  ETag "";
+  break;
+}
+<% end %>

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

@@ -1,7 +1,7 @@
 <%
         @path = "#{rubber_env.torquebox_dir}/jboss/standalone/configuration/standalone-ha.xml"
         %><?xml version='1.0' encoding='UTF-8'?>
-<server xmlns='urn:jboss:domain:1.2'>
+<server xmlns='urn:jboss:domain:1.3'>
 <extensions>
   <extension module='org.jboss.as.clustering.infinispan'/>
   <extension module='org.jboss.as.clustering.jgroups'/>
@@ -35,15 +35,15 @@
   <extension module='org.jboss.as.weld'/>
   <extension module='org.torquebox.bootstrap'/>
   <extension module='org.torquebox.core'/>
-  <extension module='org.torquebox.services'/>
-  <extension module='org.torquebox.security'/>
-  <extension module='org.torquebox.jobs'/>
-  <extension module='org.torquebox.stomp'/>
   <extension module='org.torquebox.messaging'/>
-  <extension module='org.torquebox.cdi'/>
+  <extension module='org.torquebox.stomp'/>
   <extension module='org.torquebox.web'/>
-  <extension module='org.torquebox.cache'/>
+  <extension module='org.torquebox.security'/>
+  <extension module='org.torquebox.services'/>
+  <extension module='org.torquebox.cdi'/>
+  <extension module='org.torquebox.jobs'/>
   <extension module='org.projectodd.polyglot.hasingleton'/>
+  <extension module='org.projectodd.polyglot.cache'/>
 </extensions>
 <system-properties>
   <property name='org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR' value='false'/>
@@ -53,13 +53,18 @@
   <security-realms>
     <security-realm name='ManagementRealm'>
       <authentication>
+        <local default-user='$local'/>
         <properties path='mgmt-users.properties' relative-to='jboss.server.config.dir'/>
       </authentication>
     </security-realm>
     <security-realm name='ApplicationRealm'>
       <authentication>
+        <local default-user='$local' allowed-users='*'/>
         <properties path='application-users.properties' relative-to='jboss.server.config.dir'/>
       </authentication>
+      <authorization>
+        <properties path='application-roles.properties' relative-to='jboss.server.config.dir'/>
+      </authorization>
     </security-realm>
   </security-realms>
   <management-interfaces>
@@ -115,7 +120,7 @@
   </subsystem>
   <subsystem xmlns='urn:jboss:domain:cmp:1.0'/>
   <subsystem xmlns='urn:jboss:domain:configadmin:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:datasources:1.0'>
+  <subsystem xmlns='urn:jboss:domain:datasources:1.1'>
     <datasources>
       <datasource jndi-name='java:jboss/datasources/ExampleDS' pool-name='ExampleDS' enabled='true' use-java-context='true'>
         <connection-url>
@@ -145,8 +150,15 @@
   <subsystem xmlns='urn:jboss:domain:deployment-scanner:1.1'>
     <deployment-scanner path='deployments' relative-to='jboss.server.base.dir' scan-interval='5000' deployment-timeout='1200'/>
   </subsystem>
-  <subsystem xmlns='urn:jboss:domain:ee:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:ejb3:1.2'>
+  <subsystem xmlns='urn:jboss:domain:ee:1.1'>
+    <spec-descriptor-property-replacement>
+      false
+    </spec-descriptor-property-replacement>
+    <jboss-descriptor-property-replacement>
+      true
+    </jboss-descriptor-property-replacement>
+  </subsystem>
+  <subsystem xmlns='urn:jboss:domain:ejb3:1.3'>
     <session-bean>
       <stateless>
         <bean-instance-pool-ref pool-name='slsb-strict-max-pool'/>
@@ -186,27 +198,27 @@
     </thread-pools>
     <iiop enable-by-default='false' use-qualified-name='false'/>
   </subsystem>
-  <subsystem xmlns='urn:jboss:domain:infinispan:1.2' default-cache-container='cluster'>
+  <subsystem xmlns='urn:jboss:domain:infinispan:1.3'>
     <cache-container name='cluster' aliases='ha-partition' default-cache='default'>
       <transport lock-timeout='60000'/>
       <replicated-cache name='default' mode='SYNC' batching='true'>
         <locking isolation='REPEATABLE_READ'/>
       </replicated-cache>
     </cache-container>
-    <cache-container name='web' aliases='torquebox standard-session-cache' default-cache='repl'>
+    <cache-container name='web' aliases='polyglot torquebox standard-session-cache' default-cache='repl' module='org.jboss.as.clustering.web.infinispan'>
       <transport lock-timeout='60000'/>
-      <replicated-cache name='repl' mode='ASYNC' batching='true'>
+      <replicated-cache name='repl' mode='ASYNC' batching='true' start='EAGER'>
         <file-store/>
       </replicated-cache>
       <replicated-cache name='sso' mode='SYNC' batching='true'/>
-      <distributed-cache name='dist' mode='ASYNC' batching='true'>
+      <distributed-cache name='dist' mode='ASYNC' batching='true' l1-lifespan='0'>
         <file-store/>
       </distributed-cache>
     </cache-container>
-    <cache-container name='ejb' aliases='sfsb sfsb-cache' default-cache='repl'>
+    <cache-container name='ejb' aliases='sfsb sfsb-cache' default-cache='repl' module='org.jboss.as.clustering.ejb3.infinispan'>
       <transport lock-timeout='60000'/>
       <replicated-cache name='repl' mode='ASYNC' batching='true'>
-        <eviction strategy='LRU'/>
+        <eviction strategy='LRU' max-entries='10000'/>
         <file-store/>
       </replicated-cache>
       <!--
@@ -214,12 +226,12 @@
       ~                 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'>
-        <eviction strategy='LRU'/>
+      <distributed-cache name='dist' mode='ASYNC' batching='true' l1-lifespan='0'>
+        <eviction strategy='LRU' max-entries='10000'/>
         <file-store/>
       </distributed-cache>
     </cache-container>
-    <cache-container name='hibernate' default-cache='local-query'>
+    <cache-container name='hibernate' default-cache='local-query' module='org.jboss.as.jpa.hibernate:4'>
       <transport lock-timeout='60000'/>
       <local-cache name='local-query'>
         <transaction mode='NONE'/>
@@ -237,8 +249,8 @@
       </replicated-cache>
     </cache-container>
   </subsystem>
-  <subsystem xmlns='urn:jboss:domain:jacorb:1.1'>
-    <orb>
+  <subsystem xmlns='urn:jboss:domain:jacorb:1.2'>
+    <orb socket-binding='jacorb' ssl-socket-binding='jacorb-ssl'>
       <initializers transactions='spec' security='on'/>
     </orb>
   </subsystem>
@@ -282,6 +294,7 @@
       <protocol type='UFC'/>
       <protocol type='MFC'/>
       <protocol type='FRAG2'/>
+      <protocol type='RSVP'/>
     </stack>
     <stack name='tcp'>
       <transport type='TCP' socket-binding='jgroups-tcp' diagnostics-socket-binding='jgroups-diagnostics'/>
@@ -290,7 +303,6 @@
           <%= rubber_instances.for_role('torquebox').collect { |host| "#{host.full_name}[7600]" }.join(',') %>
         </property>
       </protocol>
-      <protocol type='MPING' socket-binding='jgroups-mping'/>
       <protocol type='MERGE2'/>
       <protocol type='FD_SOCK' socket-binding='jgroups-tcp-fd'/>
       <protocol type='FD'/>
@@ -303,6 +315,7 @@
       <protocol type='UFC'/>
       <protocol type='MFC'/>
       <protocol type='FRAG2'/>
+      <protocol type='RSVP'/>
     </stack>
   </subsystem>
   <subsystem xmlns='urn:jboss:domain:jmx:1.1'>
@@ -318,11 +331,14 @@
       <smtp-server outbound-socket-binding-ref='mail-smtp'/>
     </mail-session>
   </subsystem>
-  <subsystem xmlns='urn:jboss:domain:messaging:1.1'>
+  <subsystem xmlns='urn:jboss:domain:messaging:1.2'>
     <hornetq-server>
       <clustered>
         true
       </clustered>
+      <cluster-password>
+        ${jboss.messaging.cluster.password:CHANGE ME!!}
+      </cluster-password>
       <persistence-enabled>
         true
       </persistence-enabled>
@@ -349,25 +365,25 @@
       </acceptors>
       <broadcast-groups>
         <broadcast-group name='bg-group1'>
+          <socket-binding>
+            messaging-group
+          </socket-binding>
           <broadcast-period>
             5000
           </broadcast-period>
           <connector-ref>
             netty
           </connector-ref>
-          <socket-binding>
-            messaging-group
-          </socket-binding>
         </broadcast-group>
       </broadcast-groups>
       <discovery-groups>
         <discovery-group name='dg-group1'>
-          <refresh-timeout>
-            10000
-          </refresh-timeout>
           <socket-binding>
             messaging-group
           </socket-binding>
+          <refresh-timeout>
+            10000
+          </refresh-timeout>
         </discovery-group>
       </discovery-groups>
       <cluster-connections>
@@ -432,7 +448,6 @@
             <connector-ref connector-name='netty'/>
           </connectors>
           <entries>
-            <entry name='RemoteConnectionFactory'/>
             <entry name='java:jboss/exported/jms/RemoteConnectionFactory'/>
           </entries>
           <consumer-window-size>
@@ -449,14 +464,6 @@
           </entries>
         </pooled-connection-factory>
       </jms-connection-factories>
-      <jms-destinations>
-      </jms-destinations>
-      <cluster-user>
-        admin
-      </cluster-user>
-      <cluster-password>
-        password
-      </cluster-password>
       <jmx-management-enabled>
         true
       </jmx-management-enabled>
@@ -465,14 +472,16 @@
       </security-enabled>
     </hornetq-server>
   </subsystem>
-  <subsystem xmlns='urn:jboss:domain:modcluster:1.0'>
-    <mod-cluster-config proxy-list="${jboss.mod_cluster.proxyList}" excluded-contexts='invoker,jbossws,juddi,console'>
+  <subsystem xmlns='urn:jboss:domain:modcluster:1.1'>
+    <mod-cluster-config advertise="false" proxy-list="${jboss.mod_cluster.proxyList}" connector='ajp' excluded-contexts='invoker,jbossws,juddi,console'>
       <dynamic-load-provider>
         <load-metric type='busyness'/>
       </dynamic-load-provider>
     </mod-cluster-config>
   </subsystem>
-  <subsystem xmlns='urn:jboss:domain:naming:1.1'/>
+  <subsystem xmlns='urn:jboss:domain:naming:1.2'>
+    <remote-naming/>
+  </subsystem>
   <subsystem xmlns='urn:jboss:domain:osgi:1.2' activation='lazy'>
     <properties>
       <!-- Specifies the beginning start level of the framework -->
@@ -497,17 +506,14 @@
   </subsystem>
   <subsystem xmlns='urn:jboss:domain:resource-adapters:1.0'/>
   <subsystem xmlns='urn:jboss:domain:sar:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:security:1.1'>
+  <subsystem xmlns='urn:jboss:domain:security:1.2'>
     <security-domains>
       <security-domain name='other' cache-type='default'>
         <authentication>
           <login-module code='Remoting' flag='optional'>
             <module-option name='password-stacking' value='useFirstPass'/>
           </login-module>
-          <login-module code='RealmUsersRoles' flag='required'>
-            <module-option name='usersProperties' value='${jboss.server.config.dir}/application-users.properties'/>
-            <module-option name='rolesProperties' value='${jboss.server.config.dir}/application-roles.properties'/>
-            <module-option name='realm' value='ApplicationRealm'/>
+          <login-module code='RealmDirect' flag='required'>
             <module-option name='password-stacking' value='useFirstPass'/>
           </login-module>
         </authentication>
@@ -525,7 +531,7 @@
     </security-domains>
   </subsystem>
   <subsystem xmlns='urn:jboss:domain:threads:1.1'/>
-  <subsystem xmlns='urn:jboss:domain:transactions:1.1'>
+  <subsystem xmlns='urn:jboss:domain:transactions:1.2'>
     <core-environment>
       <process-id>
         <uuid/>
@@ -559,15 +565,15 @@
   <subsystem xmlns='urn:jboss:domain:weld:1.0'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-bootstrap:1.0'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-core:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0' socket-binding='stomp'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-messaging:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:torquebox-cdi:1.0'/>
+  <subsystem xmlns='urn:jboss:domain:torquebox-stomp:1.0' socket-binding='stomp'/>
   <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
-  <subsystem xmlns='urn:jboss:domain:torquebox-cache:1.0'/>
+  <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0'/>
+  <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0'/>
+  <subsystem xmlns='urn:jboss:domain:torquebox-cdi:1.0'/>
+  <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'/>
 </profile>
 <interfaces>
   <interface name='management'>
@@ -601,6 +607,7 @@
   <socket-binding name='jgroups-udp' port='55200' multicast-address='${jboss.default.multicast.address:230.0.0.4}' multicast-port='45688'/>
   <socket-binding name='jgroups-udp-fd' port='54200'/>
   <socket-binding name='messaging' port='5445'/>
+  <socket-binding name='messaging-group' port='0' multicast-address='${jboss.messaging.group.address:231.7.7.7}' multicast-port='${jboss.messaging.group.port:9876}'/>
   <socket-binding name='messaging-throughput' port='5455'/>
   <socket-binding name='modcluster' port='0' multicast-address='224.0.1.105' multicast-port='23364'/>
   <socket-binding name='osgi-http' interface='management' port='8090'/>
@@ -611,6 +618,5 @@
     <remote-destination host='localhost' port='25'/>
   </outbound-socket-binding>
   <socket-binding name='stomp' port='8675'/>
-  <socket-binding name='messaging-group' port='0' multicast-address='${jboss.messaging.group.address:231.7.7.7}' multicast-port='${jboss.messaging.group.port:9876}'/>
 </socket-binding-group>
 </server>