nirvdrum-rubber 1.1.7 → 2.0.0.rails3.beta6

data/generators/vulcanize/templates/cassandra/config/rubber/deploy-cassandra.rb

@@ -0,0 +1,88 @@
+
+namespace :rubber do
+
+  namespace :cassandra do
+  
+    rubber.allow_optional_tasks(self)
+  
+    after "rubber:install_packages", "rubber:cassandra:install"
+    
+    task :install, :roles => :cassandra do
+      rubber.sudo_script 'install_cassandra', <<-ENDSCRIPT
+        if [[ ! -d "#{rubber_env.cassandra_dir}" ]]; then
+          wget -qNP /tmp #{rubber_env.cassandra_pkg_url}
+          tar -C #{rubber_env.cassandra_prefix} -zxf /tmp/apache-cassandra-#{rubber_env.cassandra_version}-bin.tar.gz
+          wget -nNO #{rubber_env.cassandra_dir}/jmxterm.jar http://downloads.sourceforge.net/project/cyclops-group/jmxterm/1.0-alpha-4/jmxterm-1.0-alpha-4-uber.jar
+        fi
+      ENDSCRIPT
+    end
+
+    after "rubber:bootstrap", "rubber:cassandra:bootstrap"
+
+    task :bootstrap, :roles => :cassandra do
+      instances = rubber_instances.for_role("cassandra") & rubber_instances.filtered
+      instances.each do |ic|
+        task_name = "_bootstrap_cassandra_#{ic.full_name}".to_sym()
+        task task_name, :hosts => ic.full_name do
+          env = rubber_cfg.environment.bind("cassandra", ic.name)
+          exists = capture("echo $(ls #{env.cassandra_data_dir}/ 2> /dev/null)")
+          if exists.strip.size == 0
+            # After everything installed on machines, we need the source tree
+            # on hosts in order to run rubber:config for bootstrapping the db
+            deploy.update_code
+
+            # Gen just the conf for cassandra
+            rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/cassandra", :FORCE => true, :deploy_path => release_path)
+
+            cassandra_start
+            
+            # temporary hack to load initial schema from cassandra.yaml until
+            # something better available.  Subsequent schema changes should be
+            # done using thrift system_* api
+            # http://wiki.apache.org/cassandra/FAQ#no_keyspaces
+            # http://wiki.apache.org/cassandra/LiveSchemaUpdates
+            if instances.size == 1
+              rubber.sudo_script "install_cassandra_schema", <<-ENDSCRIPT
+                echo run -b org.apache.cassandra.service:type=StorageService loadSchemaFromYAML |\
+                  java -jar #{rubber_env.cassandra_dir}/jmxterm.jar -n -l #{ic.full_name}:#{rubber_env.cassandra_jmx_port}
+              ENDSCRIPT
+            end
+          end
+        end
+        send task_name
+      end
+    end
+    
+    on :load do
+      rubber.serial_task self, :serial_restart, :roles => :cassandra do
+        cassandra_stop
+        cassandra_start
+      end
+
+      rubber.serial_task self, :serial_reload, :roles => :cassandra do
+      end
+    end
+
+    def cassandra_stop
+      rsudo "pid=`cat #{rubber_env.cassandra_pid_file}` && kill $pid; while ps $pid &> /dev/null; do sleep 1; done"
+    end
+
+    def cassandra_start
+      rsudo "nohup #{rubber_env.cassandra_dir}/bin/cassandra -p #{rubber_env.cassandra_pid_file} &> #{rubber_env.cassandra_log_dir}/startup.log"
+    end
+
+    task :restart, :roles => :cassandra do
+      rubber.cassandra.stop
+      rubber.cassandra.start
+    end
+    
+    task :stop, :roles => :cassandra do
+      cassandra_stop
+    end
+    
+    task :start, :roles => :cassandra do
+      cassandra_start
+    end
+    
+  end
+end

data/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.in.sh

@@ -0,0 +1,58 @@
+<%
+  @path = "#{rubber_env.cassandra_dir}/bin/cassandra.in.sh"
+%>
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+cassandra_home=`dirname $0`/..
+
+# The directory where Cassandra's configs live (required)
+CASSANDRA_CONF=$cassandra_home/conf
+
+# This can be the path to a jar file, or a directory containing the
+# compiled classes. NOTE: This isn't needed by the startup script,
+# it's just used here in constructing the classpath.
+cassandra_bin=$cassandra_home/build/classes
+#cassandra_bin=$cassandra_home/build/cassandra.jar
+
+# JAVA_HOME can optionally be set here
+#JAVA_HOME=/usr/local/jdk6
+
+# The java classpath (required)
+CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
+
+for jar in $cassandra_home/lib/*.jar; do
+    CLASSPATH=$CLASSPATH:$jar
+done
+
+# Arguments to pass to the JVM
+JVM_OPTS=" \
+        -ea \
+        -Xms128M \
+        -Xmx1G \
+        -XX:TargetSurvivorRatio=90 \
+        -XX:+AggressiveOpts \
+        -XX:+UseParNewGC \
+        -XX:+UseConcMarkSweepGC \
+        -XX:+CMSParallelRemarkEnabled \
+        -XX:+HeapDumpOnOutOfMemoryError \
+        -XX:SurvivorRatio=128 \
+        -XX:MaxTenuringThreshold=0 \
+        -Dcom.sun.management.jmxremote.port=<%= rubber_env.cassandra_jmx_port %> \
+        -Dcom.sun.management.jmxremote.ssl=false \
+        -Dcom.sun.management.jmxremote.authenticate=false"

data/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.yaml

@@ -0,0 +1,210 @@
+<%
+  @path = "#{rubber_env.cassandra_dir}/conf/cassandra.yaml"
+  @post = "mkdir -p #{rubber_env.cassandra_data_dir} #{rubber_env.cassandra_commitlog_dir} #{rubber_env.cassandra_log_dir}"
+%>
+# Cassandra storage config YAML
+# See http://wiki.apache.org/cassandra/StorageConfiguration for
+# explanations of configuration directives.
+
+# name of the cluster
+cluster_name: '<%= rubber_env.app_name %>_<%= Rubber.env %>_cluster'
+
+# Set to true to make new [non-seed] nodes automatically migrate the
+# right data to themselves.
+auto_bootstrap: <%= rubber_instances.for_role("cassandra").size > 1 ? "true" : "false" %>
+
+# authentication backend, implementing IAuthenticator; used to limit keyspace access
+authenticator: org.apache.cassandra.auth.AllowAllAuthenticator
+
+# any IPartitioner may be used, including your own as long as it is on
+# the classpath.  Out of the box, Cassandra provides
+# org.apache.cassandra.dht.RandomPartitioner
+# org.apache.cassandra.dht.OrderPreservingPartitioner, and
+# org.apache.cassandra.dht.CollatingOrderPreservingPartitioner.
+partitioner: org.apache.cassandra.dht.RandomPartitioner
+
+# directories where Cassandra should store data on disk.
+data_file_directories:
+    - <%= rubber_env.cassandra_data_dir %>
+
+# Addresses of hosts that are deemed contact points.
+# Cassandra nodes use this list of hosts to find each other and learn
+# the topology of the ring.  You must change this if you are running
+# multiple nodes!
+<%
+  seeds = rubber_instances.for_role('cassandra_seed')
+  seeds = rubber_instances.for_role('cassandra') if seeds.size == 0
+  seed_hosts = seeds.collect { |i| i.full_name }
+%>
+seeds:
+    <% seed_hosts.each do |host| %>
+      - <%= host %>
+    <% end %>
+
+# Access mode.  mmapped i/o is substantially faster, but only practical on
+# a 64bit machine (which notably does not include EC2 "small" instances)
+# or relatively small datasets.  "auto", the safe choice, will enable
+# mmapping on a 64bit JVM.  Other values are "mmap", "mmap_index_only"
+# (which may allow you to get part of the benefits of mmap on a 32bit
+# machine by mmapping only index files) and "standard".
+# (The buffer size settings that follow only apply to standard,
+# non-mmapped i/o.)
+disk_access_mode: auto
+
+# Unlike most systems, in Cassandra writes are faster than reads, so
+# you can afford more of those in parallel.  A good rule of thumb is 2
+# concurrent reads per processor core.  Increase ConcurrentWrites to
+# the number of clients writing at once if you enable CommitLogSync +
+# CommitLogSyncDelay. -->
+concurrent_reads: 8
+concurrent_writes: 32
+
+# Buffer size to use when performing contiguous column slices.
+# Increase this to the size of the column slices you typically perform
+sliced_buffer_size_in_kb: 64
+
+# TCP port, for commands and data
+storage_port: <%= rubber_env.cassandra_storage_port %>
+
+# Address to bind to and tell other nodes to connect to. You _must_
+# change this if you want multiple nodes to be able to communicate!
+listen_address: <%= rubber_env.full_host %>
+
+# The address to bind the Thrift RPC service to
+rpc_address: <%= rubber_env.full_host %>
+# port for Thrift to listen on
+rpc_port: <%= rubber_env.cassandra_rpc_port %>
+# Whether or not to use a framed transport for Thrift.
+thrift_framed_transport: false
+snapshot_before_compaction: false
+
+# The threshold size in megabytes the binary memtable must grow to,
+# before it's submitted for flushing to disk.
+binary_memtable_throughput_in_mb: 256
+# Number of minutes to keep a memtable in memory
+memtable_flush_after_mins: 60
+# Size of the memtable in memory before it is dumped
+memtable_throughput_in_mb: 64
+# Number of objects in millions in the memtable before it is dumped
+memtable_operations_in_millions: 0.3
+# Buffer size to use when flushing !memtables to disk.
+flush_data_buffer_size_in_mb: 32
+# Increase (decrease) the index buffer size relative to the data
+# buffer if you have few (many) columns per key.
+flush_index_buffer_size_in_mb: 8
+
+column_index_size_in_kb: 64
+row_warning_threshold_in_mb: 512
+
+# commit log
+commitlog_directory: <%= rubber_env.cassandra_commitlog_dir %>
+
+# Size to allow commitlog to grow to before creating a new segment
+commitlog_rotation_threshold_in_mb: 128
+
+# commitlog_sync may be either "periodic" or "batch."
+# When in batch mode, Cassandra won't ack writes until the commit log
+# has been fsynced to disk.  It will wait up to
+# CommitLogSyncBatchWindowInMS milliseconds for other writes, before
+# performing the sync.
+commitlog_sync: periodic
+
+# the other option is "timed," where writes may be acked immediately
+# and the CommitLog is simply synced every commitlog_sync_period_in_ms
+# milliseconds.
+commitlog_sync_period_in_ms: 10000
+
+# Time to wait for a reply from other nodes before failing the command
+rpc_timeout_in_ms: 10000
+
+# time to wait before garbage collecting tombstones (deletion markers)
+gc_grace_seconds: 864000
+
+# endpoint_snitch -- Set this to a class that implements
+# IEndpointSnitch, which will let Cassandra know enough
+# about your network topology to route requests efficiently.
+# Out of the box, Cassandra provides
+# org.apache.cassandra.locator.SimpleSnitch,
+# org.apache.cassandra.locator.RackInferringSnitch, and
+# org.apache.cassandra.locator.PropertyFileSnitch.
+endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch
+
+# A ColumnFamily is the Cassandra concept closest to a relational table.
+#
+# Keyspaces are separate groups of ColumnFamilies.  Except in very
+# unusual circumstances you will have one Keyspace per application.
+#
+# Keyspace required parameters:
+# - name: name of the keyspace; "system" and "definitions" are
+#   reserved for Cassandra Internals.
+# - replica_placement_strategy: the class that determines how replicas
+#   are distributed among nodes.  Must implement IReplicaPlacementStrategy.
+#   Out of the box, Cassandra provides
+#   org.apache.cassandra.locator.RackUnawareStrategy and
+#   org.apache.cassandra.locator.RackAwareStrategy.  RackAwareStrategy
+#   place one replica in each of two datacenter, and other replicas in
+#   different racks in one.
+# - replication_factor: Number of replicas of each row
+# - column_families: column families associated with this keyspace
+#
+# ColumnFamily required parameters:
+# - name: name of the ColumnFamily.  Must not contain the character "-".
+# - compare_with: tells Cassandra how to sort the columns for slicing
+#   operations. The default is BytesType, which is a straightforward
+#   lexical comparison of the bytes in each column.  Other options are
+#   AsciiType, UTF8Type, LexicalUUIDType, TimeUUIDType, and LongType.
+#   You can also specify the fully-qualified class name to a class of
+#   your choice extending org.apache.cassandra.db.marshal.AbstractType.
+#
+# ColumnFamily optional parameters:
+# - keys_cached: specifies the number of keys per sstable whose
+#   locations we keep in memory in "mostly LRU" order.  (JUST the key
+#   locations, NOT any column values.) Specify a fraction (value less
+#   than 1) or an absolute number of keys to cache.  Defaults to 200000
+#   keys.
+# - rows_cached: specifies the number of rows whose entire contents we
+#   cache in memory. Do not use this on ColumnFamilies with large rows,
+#   or ColumnFamilies with high write:read ratios. Specify a fraction
+#   (value less than 1) or an absolute number of rows to cache.
+#   Defaults to 0. (i.e. row caching is off by default)
+# - comment: used to attach additional human-readable information about
+#   the column family to its definition.
+# - read_repair_chance: specifies the probability with which read
+#   repairs should be invoked on non-quorum reads.  must be between 0
+#   and 1. defaults to 1.0 (always read repair).
+# - preload_row_cache: If true, will populate row cache on startup.
+#   Defaults to false.
+#
+keyspaces:
+    - name: <%= rubber_env.app_name.capitalize %>
+      replica_placement_strategy: org.apache.cassandra.locator.RackUnawareStrategy
+      replication_factor: 1
+      column_families:
+        - name: Standard1
+          compare_with: BytesType
+
+        - name: Standard2
+          compare_with: UTF8Type
+          read_repair_chance: 0.1
+          keys_cached: 100
+
+        - name: StandardByUUID1
+          compare_with: TimeUUIDType
+
+        - name: Super1
+          column_type: Super
+          compare_with: BytesType
+          compare_subcolumns_with: BytesType
+
+        - name: Super2
+          column_type: Super
+          compare_subcolumns_with: UTF8Type
+          preload_row_cache: true
+          rows_cached: 10000
+          keys_cached: 50
+          comment: 'A column family with supercolumns, whose column and subcolumn names are UTF8 strings'
+
+        - name: Super3
+          column_type: Super
+          compare_with: LongType
+          comment: 'A column family with supercolumns, whose column names are Longs (8 bytes)'

data/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/log4j-server.properties

@@ -0,0 +1,45 @@
+<%
+  @path = "#{rubber_env.cassandra_dir}/conf/log4j-server.properties"
+%>
+
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# for production, you should probably set the root to INFO
+# and the pattern to %c instead of %l.  (%l is slower.)
+
+# output messages into a rolling log file as well as stdout
+log4j.rootLogger=INFO,stdout,R
+
+# stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
+
+# rolling log file
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.file.maxFileSize=20MB
+log4j.appender.file.maxBackupIndex=50
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
+# Edit the next line to point to your logs directory
+log4j.appender.R.File=<%= rubber_env.cassandra_log_dir %>/system.log
+
+# Application logging options
+#log4j.logger.com.facebook=DEBUG
+#log4j.logger.com.facebook.infrastructure.gms=DEBUG
+#log4j.logger.com.facebook.infrastructure.db=DEBUG

data/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/monit-cassandra.conf

@@ -0,0 +1,8 @@
+<%
+  @path = '/etc/monit/monit.d/monit-cassandra.conf'
+%>
+check process cassandra with pidfile <%= rubber_env.cassandra_pid_file %>
+  group cassandra-<%= RUBBER_ENV %>
+  start program = "<%= rubber_env.cassandra_dir %>/bin/cassandra -p <%= rubber_env.cassandra_pid_file %>"
+  stop program = "kill `cat <%= rubber_env.cassandra_pid_file %>`"
+  if failed host <%= rubber_env.host %> port <%= rubber_env.cassandra_rpc_port %> with timeout 10 seconds for 10 cycles then restart

data/generators/vulcanize/templates/cassandra/config/rubber/rubber-cassandra.yml

@@ -0,0 +1,18 @@
+cassandra_version: 2010-05-05_14-04-54
+cassandra_prefix: /usr/local
+cassandra_dir: "#{cassandra_prefix}/apache-cassandra-#{cassandra_version}"
+cassandra_data_dir: "/var/lib/cassandra/data"
+cassandra_commitlog_dir: "/var/lib/cassandra/commitlog"
+cassandra_log_dir: "/var/log/cassandra"
+cassandra_pid_file: "/var/run/cassandra.pid"
+cassandra_pkg_url: "http://hudson.zones.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-#{cassandra_version}-bin.tar.gz"
+cassandra_rpc_port: 9160
+cassandra_storage_port: 7070
+cassandra_jmx_port: 8181
+
+role_dependencies:
+  cassandra_seed: [cassandra]
+  
+roles:
+  cassandra:
+    packages: [openjdk-6-jdk]

data/generators/vulcanize/templates/cassandra/templates.yml

@@ -0,0 +1 @@
+description: The Cassandra distributed data store 

data/generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/haproxy/haproxy-mongrel.conf

@@ -8,14 +8,14 @@ listen mongrel_proxy 0.0.0.0:<%= rubber_env.haproxy_listen_port %>
     # Since we do "fair" load balancing to the mongrels, we don't want to share mongrels
     # between haproxy instances otherwise we still end up with requests getting queued behind
     # slow ones.
-    mongrel_hosts = rubber_instances.for_role('mongrel').collect { |i| i.name }
+    app_hosts = rubber_instances.for_role('app').collect { |i| i.name }
     haproxy_hosts = rubber_instances.for_role('haproxy').collect { |i| i.name }
     ports = (rubber_env.mongrel_base_port.to_i ... rubber_env.mongrel_base_port.to_i + rubber_env.mongrel_count.to_i).to_a
     host_count = haproxy_hosts.size
     host_mod = haproxy_hosts.sort.index(rubber_env.host) rescue 0
     ports = ports.find_all {|x| x % host_count == host_mod}
   %>
-  <% mongrel_hosts.each do |server| %>
+  <% app_hosts.each do |server| %>
     <% ports.each do |port| %>
       server <%= server %>_<%= port %> <%= server %>:<%= port %> maxconn 1 check
     <% end %>

data/generators/vulcanize/templates/{complete_passenger_mysql → complete_passenger}/config/rubber/role/haproxy/haproxy-passenger.conf

@@ -4,7 +4,7 @@
 %>
 
 <%
-  backend_hosts = rubber_instances.for_role('passenger').collect { |i| i.name }
+  backend_hosts = rubber_instances.for_role('app').collect { |i| i.name }
 %>
 
 listen passenger_proxy 0.0.0.0:<%= rubber_env.web_port %>
@@ -13,7 +13,7 @@ listen passenger_proxy 0.0.0.0:<%= rubber_env.web_port %>
     server <%= server %> <%= server %>:<%= rubber_env.passenger_listen_port %> maxconn <%= rubber_env.max_app_connections %> check
   <% end %>
 
-listen passenger_proxy 0.0.0.0:<%= rubber_env.web_ssl_port %>
+listen passenger_proxy_ssl 0.0.0.0:<%= rubber_env.web_ssl_port %>
   mode tcp
   option forwardfor
   <% backend_hosts.each do |server| %>

data/generators/vulcanize/templates/complete_passenger/templates.rb

@@ -0,0 +1,9 @@
+database_engines = ['mysql', 'postgresql']
+if ! database_engines.any? {|d| @template_dependencies.include?(d)}
+  db = Rubber::Util::prompt("DATABASE",
+                            "The database engine to use (#{database_engines.join(', ')})",
+                            true,
+                            'mysql')
+  template_dependencies << db
+end
+

data/generators/vulcanize/templates/complete_passenger/templates.yml

@@ -0,0 +1,9 @@
+description: A fairly complete and scalable deployment setup
+dependent_templates:
+  - base
+  - haproxy
+  - apache
+  - passenger
+  - monit
+  - munin
+  - memcached

data/generators/vulcanize/templates/complete_passenger_mysql/templates.yml

@@ -1,10 +1,4 @@
 description: A fairly complete and scalable mysql deployment setup
 dependent_templates:
-  - base
+  - complete_passenger
   - mysql
-  - haproxy
-  - apache
-  - passenger
-  - monit
-  - munin
-  - memcached

data/generators/vulcanize/templates/complete_passenger_postgresql/templates.yml

@@ -0,0 +1,4 @@
+description: A fairly complete and scalable postgresql deployment setup
+dependent_templates:
+  - complete_passenger
+  - postgresql

data/generators/vulcanize/templates/cruise/config/rubber/deploy-cruise.rb

@@ -54,12 +54,12 @@ namespace :rubber do
 
     desc "Start cruise control daemon"
     task :start, :roles => :cruise do
-      run "/etc/init.d/cruise start"
+      rsudo "/etc/init.d/cruise start"
     end
     
     desc "Stop cruise control daemon"
-    task :stop, :roles => :cruise, :on_error => :continue do
-      run "/etc/init.d/cruise stop"
+    task :stop, :roles => :cruise do
+      rsudo "/etc/init.d/cruise stop; exit 0"
     end
     
     desc "Restart cruise control daemon"

data/generators/vulcanize/templates/cruise/config/rubber/role/cruise/my.cnf

@@ -1,6 +1,6 @@
 <%
   @path = '/etc/mysql/my.cnf'
-  @post = '/etc/init.d/mysql restart'
+  @post = 'service mysql restart'
 %>
 
 # Generated by rubber for host <%= rubber_instances[rubber_env.host].external_ip %>

data/generators/vulcanize/templates/haproxy/config/rubber/deploy-haproxy.rb

@@ -9,10 +9,10 @@ namespace :rubber do
     # rubber auto-roles don't get defined till after all tasks are defined
     on :load do
       rubber.serial_task self, :serial_restart, :roles => :haproxy do
-        run "/etc/init.d/haproxy restart"
+        rsudo "service haproxy restart"
       end
       rubber.serial_task self, :serial_reload, :roles => :haproxy do
-        run "if ! ps ax | grep -v grep | grep -c haproxy &> /dev/null; then /etc/init.d/haproxy start; else /etc/init.d/haproxy reload; fi"
+        rsudo "if ! ps ax | grep -v grep | grep -c haproxy &> /dev/null; then service haproxy start; else service haproxy reload; fi"
       end
     end
     
@@ -21,13 +21,13 @@ namespace :rubber do
     after "deploy:restart", "rubber:haproxy:reload"
     
     desc "Stops the haproxy server"
-    task :stop, :roles => :haproxy, :on_error => :continue do
-      run "/etc/init.d/haproxy stop"
+    task :stop, :roles => :haproxy do
+      rsudo "service haproxy stop; exit 0"
     end
     
     desc "Starts the haproxy server"
     task :start, :roles => :haproxy do
-      run "/etc/init.d/haproxy start"
+      rsudo "service haproxy start"
     end
     
     desc "Restarts the haproxy server"

data/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/monit-haproxy.conf

@@ -4,6 +4,6 @@
 <% PIDFILE = "/var/run/haproxy.pid" %>
 check process haproxy with pidfile <%= PIDFILE %>
   group haproxy-<%= RUBBER_ENV %>
-  start program = "/etc/init.d/haproxy start"
-  stop program = "/etc/init.d/haproxy stop"
+  start program = "/usr/sbin/service haproxy start"
+  stop program = "/usr/sbin/service haproxy stop"
   if failed host <%= rubber_env.host %> port <%= rubber_env.haproxy_monitor_port %> with timeout 10 seconds for 10 cycles then restart

data/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/syslog-haproxy.conf

@@ -1,6 +1,11 @@
 <%
-  @path = "/etc/syslog.conf"
-  @post = "/etc/init.d/sysklogd restart"
-  @additive = ["# rubber-haproxy-start", "# rubber-haproxy-end"]
+  is_rsyslog = File.exist?('/etc/init.d/rsyslog')
+  if is_rsyslog
+    @path = "/etc/rsyslog.d/haproxy.conf"
+    @post = "service rsyslog restart"
+  else
+    @path = "/etc/syslog.conf"
+    @post = "/etc/init.d/sysklogd restart"
+  end
 %>
 local0.* /var/log/haproxy.log

data/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/syslogd-default.conf

@@ -1,7 +1,11 @@
 <%
+  is_rsyslog = File.exist?('/etc/init.d/rsyslog')
+  @skip = is_rsyslog
   @path = "/etc/default/syslogd"
   @post = "/etc/init.d/sysklogd restart"
 %>
+# This file goes away once we remove backward compatibility for sysklog
+# in alestic AMIs
 #
 # Top configuration file for syslogd
 #

data/generators/vulcanize/templates/jetty/config/rubber/deploy-jetty.rb

@@ -10,7 +10,7 @@ namespace :rubber do
     task :custom_install, :roles => :jetty do
       rubber.sudo_script 'install_jetty', <<-ENDSCRIPT
         if [[ -z `ls #{rubber_env.jetty_prefix}/jetty-hightide-#{rubber_env.jetty_version} 2> /dev/null` ]]; then
-          wget -q http://dist.codehaus.org/jetty/jetty-hightide-7.0.0/jetty-hightide-#{rubber_env.jetty_version}.tar.gz
+          wget -qN http://dist.codehaus.org/jetty/jetty-hightide-7.0.0/jetty-hightide-#{rubber_env.jetty_version}.tar.gz
           tar -zxf jetty-hightide-#{rubber_env.jetty_version}.tar.gz
           
           # Install to appropriate location.
@@ -36,7 +36,7 @@ namespace :rubber do
     after "rubber:setup_app_permissions", "rubber:jetty:setup_jetty_permissions"
 
     task :setup_jetty_permissions, :roles => :jetty do
-      run "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.jetty_dir}"
+      rsudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.jetty_dir}"
     end
     
     before "deploy:stop", "rubber:jetty:stop"
@@ -44,15 +44,15 @@ namespace :rubber do
     after "deploy:restart", "rubber:jetty:restart"
     
     task :restart, :roles => :jetty do
-      run "#{rubber_env.jetty_dir}/bin/jetty.sh restart"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh restart"
     end
     
     task :stop, :roles => :jetty do
-      run "#{rubber_env.jetty_dir}/bin/jetty.sh stop"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh stop"
     end
     
     task :start, :roles => :jetty do
-      run "#{rubber_env.jetty_dir}/bin/jetty.sh start"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh start"
     end
     
   end

data/generators/vulcanize/templates/memcached/config/rubber/role/memcached/memcached.conf

@@ -1,6 +1,6 @@
 <%
   @path = "/etc/memcached.conf"
-  @post = "/etc/init.d/memcached restart"
+  @post = "service memcached restart"
 %>
 
 # memcached default config file edited for mobicious