rubber 2.6.5 → 2.7.0

data/templates/graylog/config/rubber/role/graylog_server/monit-graylog_server.conf

@@ -0,0 +1,8 @@
+<%
+  @path = '/etc/monit/monit.d/monit-graylog_server.conf'
+%>
+check process graylog_server with pidfile <%= rubber_env.graylog_server_pid_file %>
+  group graylog-<%= Rubber.env %>
+  start program = "/usr/bin/env service graylog-server start"
+  stop program = "/usr/bin/env service graylog-server stop"
+  if failed host <%= rubber_env.host %> port <%= rubber_env.graylog_server_port %> type UDP with timeout 10 seconds for 10 cycles then restart

data/templates/graylog/config/rubber/role/graylog_web/graylog2-web-interface.conf

@@ -0,0 +1,19 @@
+<%
+  @path = "#{rubber_env.graylog_web_dir}/conf/graylog2-web-interface.conf"
+
+  graylog_server_uris = rubber_instances.for_role('graylog_server').collect { |i| "http://#{i.internal_ip}:12900/" }.join(',')
+%>
+# graylog2-server REST URIs (one or more, comma separated) For example: "http://127.0.0.1:12900/,http://127.0.0.1:12910/"
+graylog2-server.uris="<%= graylog_server_uris %>"
+
+# Secret key
+# ~~~~~
+# The secret key is used to secure cryptographics functions. Set this to a long and randomly generated string.
+# If you deploy your application to several instances be sure to use the same key!
+# Generate for example with: pwgen -s 96
+application.secret="<%= rubber_env.graylog_web_secret %>"
+
+# Web interface timezone
+# Graylog2 stores all timestamps in UTC. To properly display times, set the default timezone of the interface.
+# If you leave this out, Graylog2 will pick your system default as the timezone. Usually you will want to configure it explicitly.
+timezone="<%= rubber_env.timezone %>"

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 "RAILS_ENV=production bundle exec puma -p <%= rubber_env.graylog_web_port %> <%= rubber_env.graylog_web_dir %>/config.ru"
+  exec ./bin/graylog2-web-interface > graylog.log 2>&1
 end script
 
 post-start script

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

@@ -0,0 +1,8 @@
+<%
+  @path = '/etc/monit/monit.d/monit-graylog_web.conf'
+%>
+check process graylog_web with pidfile <%= rubber_env.graylog_web_pid_file %>
+  group graylog-<%= Rubber.env %>
+  start program = "/usr/bin/env service graylog-web start"
+  stop program = "/usr/bin/env service graylog-web stop"
+  if failed host <%= rubber_env.host %> port <%= rubber_env.graylog_web_port %> with timeout 10 seconds for 10 cycles then restart

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

@@ -1,24 +1,21 @@
-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_version: "0.20.0-rc.1-1"
 graylog_server_prefix: "/usr/local"
 graylog_server_dir: "#{graylog_server_prefix}/graylog2-server-#{graylog_server_version}"
 graylog_server_pid_file: "/var/run/graylog-server.pid"
 graylog_server_port: 12201
 graylog_server_syslog_port: 12514
 
-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_version: "0.20.0-rc.1-1"
 graylog_web_prefix: "/usr/local"
 graylog_web_dir: "#{graylog_web_prefix}/graylog2-web-interface-#{graylog_web_version}"
 graylog_web_pid_file: "/var/run/graylog-web.pid"
-graylog_web_port: 3005
+graylog_web_port: 9000
 
 graylog_web_username: admin
 graylog_web_password: admin1
-graylog_web_email: "#{admin_email}"
 
 graylog_mongo_database: graylog2
-graylog_elasticsearch_index: graylog2
+graylog_elasticsearch_index: "graylog2_#{Rubber.env}"
 
 web_tools_proxies:
   graylog:
@@ -27,7 +24,6 @@ web_tools_proxies:
     path: /
 
 role_dependencies:
-  web_tools: [graylog_web, graylog_server]
   graylog_server: [graylog_mongodb, graylog_elasticsearch]
   graylog_mongodb: [mongodb]
   graylog_elasticsearch: [elasticsearch]
@@ -36,7 +32,4 @@ roles:
   graylog_server:
     packages: [openjdk-7-jdk, mongodb-10gen]
   graylog_web:
-    packages: [libcurl4-openssl-dev]
-    gems: [puma]
-
-gems: [gelf, graylog2_exceptions, graylog2-resque]
+    packages: [openjdk-7-jdk]

data/templates/graylog/templates.rb

@@ -1,5 +1,13 @@
-if Rubber::Util::is_bundler?
-  append_to_file "Gemfile", "gem 'gelf'\n"
-  append_to_file "Gemfile", "gem 'graylog2_exceptions', :git => 'git://github.com/wr0ngway/graylog2_exceptions.git'\n"
-  append_to_file "Gemfile", "gem 'graylog2-resque'\n"
-end
+require 'securerandom'
+
+extra_config = <<-EXTRA
+# This was auto-generated by Rubber and is unique to your machine.  Feel free to regenerate if you'd like.
+# You may want to move this to your rubber-secret.yml to keep it out of version control.
+graylog_server_secret: #{SecureRandom.hex(96)}
+
+# This was auto-generated by Rubber and is unique to your machine.  Feel free to regenerate if you'd like.
+# You may want to move this to your rubber-secret.yml to keep it out of version control.
+graylog_web_secret: #{SecureRandom.hex(96)}
+EXTRA
+
+append_to_file 'config/rubber/rubber-graylog.yml', "\n#{extra_config}"

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

@@ -3,6 +3,22 @@ namespace :rubber do
   
   namespace :memcached do
 
+    desc "Starts memcached shared memory"
+    task :start, :roles => :memcached do
+      rsudo "service memcached status || service memcached start"
+    end
+
+    desc "Stops memcached shared memory"
+    task :stop, :roles => :memcached do
+      rsudo "service memcached stop || true"
+    end
+
+    desc "Restarts memcached shared memory"
+    task :restart, :roles => :memcached do
+      stop
+      start
+    end
+
     desc "Display status of memcached shared memory"
     task :status, :roles => :memcached do
       rsudo "service memcached status || true"

data/templates/memcached/config/rubber/role/memcached/dalli.rb

@@ -0,0 +1,20 @@
+<%
+  @path = "#{Rubber.root}/config/dalli.rb"
+%>
+
+module Rubber
+  module Dalli
+    module Config
+      include ::Rails::Initializable
+
+      initializer :set_dalli_cache, :before => :initialize_cache do |app|
+        config.action_controller.perform_caching = true
+        config.cache_store = :dalli_store,
+<%- rubber_instances.for_role('memcached').each do |ic| %>
+            '<%= ic.full_name %>:<%= rubber_env.memcached_port %>',
+<%- end %>
+            { :value_max_bytes => <%= rubber_env.memcached_max_slab_bytes %> }
+      end
+    end
+  end
+end

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

@@ -1,9 +1,10 @@
 <%
   @path = "/etc/memcached.conf"
-  @post = "service memcached restart"
+  max_mem = rubber_env.memcached_max_mem
+  max_mem = max_mem[rubber_instances[rubber_env.host].image_type.split('.')[1]] if max_mem.is_a?(Hash)
 %>
 
-# memcached default config file edited for mobicious
+# memcached default config file
 # 2003 - Jay Bonci <jaybonci@debian.org>
 # This configuration file is read by the start-memcached script provided as
 # part of the Debian GNU/Linux distribution.
@@ -16,8 +17,11 @@
 # Log memcached's output to /var/log/memcached
 logfile <%= rubber_env.memcached_log_dir %>/memcached.log
 
-# Be verbose
- -v
+# pid file
+-P <%= rubber_env.memcached_pid_file %>
+
+# Be verbose (shows errors, warnings, and socket connections)
+-v
 
 # Be even more verbose (print client commands as well)
 # -vv
@@ -25,19 +29,24 @@ logfile <%= rubber_env.memcached_log_dir %>/memcached.log
 # Start with a cap of 64 megs of memory. It's reasonable, and the daemon default
 # Note that the daemon will grow to this size, but does not start out holding this much
 # memory
--m <%= rubber_env.memcached_max_mem %>
+-m <%= max_mem %>
+
+# Override the size of each slab page in bytes, i.e. the maximum item size that
+# memcached will accept. Recommended not to set above 1 MB for performance reasons.
+# The default value is 1 MB.
+-I <%= rubber_env.memcached_max_slab_bytes %>
 
 # Default connection port is 11211
--p 11211
+-p <%= rubber_env.memcached_port %>
 
 # Run the daemon as root. The start-memcached will default to running as root if no
 # -u command is present in this config file
--u nobody
+-u memcache
 
 # Specify which IP address to listen on. The default is to listen on all IP addresses
 # This parameter is one of the only security measures that memcached has, so make sure
 # it's listening on a firewalled interface.
-#-l 127.0.0.1
+# -l 127.0.0.1
 
 # Limit the number of simultaneous incoming connections. The daemon default is 1024
 # -c 1024

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

@@ -1,7 +1,31 @@
 # Sets up memcached server and client as dalli
+#
+# !!!IMPORTANT!!! add the following lines inside your application.rb class:
+#
+# dalli_config = Rails.root.join('config','dalli.rb')
+# if File.exists?(dalli_config)
+#   require dalli_config; include ::Rubber::Dalli::Config
+# end
 
+memcached_pid_file: /var/run/memcached.pid
 memcached_log_dir: /var/log/memcached
-memcached_max_mem:  64
+memcached_port: 11211
+
+# MB memory max to use for object storage in megabytes.
+# Accepts either a single value or a hash by instance size
+memcached_max_mem:
+  micro:   64    # 613MB max
+  small:   768   # 1.7GB max
+  medium:  2048  # 3.7GB max
+  large:   4096  # 7.5GB max
+  xlarge:  10240 # 15GB max
+  2xlarge: 20480 # 30GB max
+  4xlarge: 51200 # 60GB max
+
+# Set size of each slab page in bytes, i.e. maximum item size
+# that memcached will accept. Recommended not to set above 1 MB
+# for performance reasons.
+memcached_max_slab_bytes: "#{1024*1024}"
 
 gems: [dalli]
 

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

@@ -0,0 +1,9 @@
+<%
+  @path = '/etc/monit/monit.d/monit-memcached.conf'
+%>
+check process memcache with pidfile <%= rubber_env.memcached_pid_file %>
+   group memcache-<%= Rubber.env %>
+   start program = "/usr/bin/env service memcached start"
+   stop  program = "/usr/bin/env service memcached stop"
+   if failed port <%= rubber_env.memcached_port %> protocol memcache then restart
+   if 5 restarts within 5 cycles then timeout

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

@@ -6,5 +6,6 @@ check process mongodb with pidfile <%= rubber_env.mongodb_pid %>
    group mongodb-<%= Rubber.env %>
    start program = "/bin/bash -c 'rm -f <%= rubber_env.mongodb_pid %>; /usr/bin/env service mongodb start'"
    stop program = "/usr/bin/env service mongodb stop"
+   if does not exist for 5 cycles then restart
    if failed port 27017 then restart
    if 5 restarts within 5 cycles then timeout

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

@@ -1,4 +1,3 @@
-
 namespace :rubber do
   
   namespace :mysql do
@@ -40,7 +39,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 "delete from mysql.user where user='';"
               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/newrelic/config/rubber/deploy-newrelic.rb

@@ -0,0 +1,49 @@
+
+namespace :rubber do
+
+  namespace :newrelic do
+
+    rubber.allow_optional_tasks(self)
+
+    before "rubber:install_packages", "rubber:newrelic:install_newrelic_apt"
+
+    task :install_newrelic_apt, :roles => :newrelic do
+      rubber.sudo_script 'install_newrelic', <<-ENDSCRIPT
+        if [[ -z $(cat /etc/apt/sources.list.d/newrelic.list 2> /dev/null) ]]; then
+          wget -O /etc/apt/sources.list.d/newrelic.list http://download.newrelic.com/debian/newrelic.list
+          apt-key adv --keyserver hkp://subkeys.pgp.net --recv-keys 548C16BF
+        fi
+      ENDSCRIPT
+    end
+
+    after "rubber:bootstrap", "rubber:newrelic:bootstrap"
+
+    task :bootstrap, :roles => :newrelic do
+      rubber.sudo_script 'bootstrap_newrelic', <<-ENDSCRIPT
+        if [[ -z $(cat /etc/newrelic/nrsysmond.cfg | grep #{rubber_env.nrsysmond_license_key} 2> /dev/null) ]]; then
+          nrsysmond-config --set license_key=#{rubber_env.nrsysmond_license_key}
+        fi
+      ENDSCRIPT
+
+      restart
+    end
+
+    desc "Start newrelic system monitoring"
+    task :start, :roles => :newrelic do
+      rsudo "service newrelic-sysmond start"
+    end
+
+    desc "Stop newrelic system monitoring"
+    task :stop, :roles => :newrelic do
+      rsudo "service newrelic-sysmond stop || true"
+    end
+
+    desc "Restart newrelic system monitoring"
+    task :restart, :roles => :newrelic do
+      stop
+      start
+    end
+
+  end
+
+end

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

@@ -0,0 +1,9 @@
+<%
+  @path = '/etc/monit/monit.d/monit-newrelic.conf'
+%>
+
+check process nrsysmond with pidfile /var/run/nrsysmond.pid
+   group newrelic-<%= Rubber.env %>
+   start program = "/usr/bin/env service newrelic-sysmond restart"
+   stop program = "/usr/bin/env service newrelic-sysmond stop"
+   if 5 restarts within 5 cycles then timeout

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

@@ -0,0 +1,5 @@
+nrsysmond_license_key: 11111222223333444455555
+
+roles:
+  newrelic:
+    packages: [newrelic-sysmond]

data/templates/newrelic/templates.yml

@@ -0,0 +1 @@
+description: The newrelic server monitoring module

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

@@ -11,10 +11,13 @@ namespace :rubber do
         # Check if there is an nginx with the required version and passenger built in.
         if [ -x /usr/sbin/nginx ]
           then echo 'Found nginx on system'
-          pax=$(/usr/sbin/nginx -V 2>&1 | awk '/nginx\\/#{rubber_env.nginx_version}/{a++}/passenger-#{rubber_env.passenger_version}/{b++} END {print a&&b}')
-          if [ $pax -eq 1 ]
-            then echo 'Nginx/Passenger version matches'
-            exit 0
+          if [ $(find #{rubber_env.ruby_path} -regex .*passenger-#{rubber_env.passenger_version}.*PassengerWatchdog | wc -l) -gt 0 ]
+            then echo 'Found passenger-nginx-module on system'
+            pax=$(/usr/sbin/nginx -V 2>&1 | awk '/nginx\\/#{rubber_env.nginx_version}/{a++}/passenger-#{rubber_env.passenger_version}/{b++} END {print a&&b}')
+            if [ $pax -eq 1 ]
+              then echo 'Nginx/Passenger version matches'
+              exit 0
+            fi
           fi
         fi
         # Lets install

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

@@ -3,6 +3,7 @@ nginx_version: 1.2.8
 passenger_root: "#{`bash -l -c 'find #{ruby_path} -name passenger-#{passenger_version}'`.strip}"
 passenger_ruby: "#{ruby_path}/bin/ruby"
 passenger_lib: "#{passenger_root}/ext/nginx"
+nginx_log_dir: /mnt/nginx/logs
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001
 max_app_connections: 20

data/templates/redis/config/rubber/role/redis/redis.conf

@@ -32,12 +32,17 @@ pidfile /var/run/redis.pid
 # If port 0 is specified Redis will not listen on a TCP socket.
 port <%= rubber_env.redis_server_port %>
 
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for incoming connections.
+# By default Redis listens for connections from all the network interfaces
+# available on the server. It is possible to listen to just one or multiple
+# interfaces using the "bind" configuration directive, followed by one or
+# more IP addresses.
 #
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
 # bind 127.0.0.1
 
-# Specify the path for the unix socket that will be used to listen for
+# Specify the path for the Unix socket that will be used to listen for
 # incoming connections. There is no default, so Redis will not listen
 # on a unix socket when not specified.
 #
@@ -71,7 +76,7 @@ tcp-keepalive 60
 # warning (only very important / critical messages are logged)
 loglevel notice
 
-# Specify the log file name. Also 'stdout' can be used to force
+# Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile <%= rubber_env.redis_server_log_file %>
@@ -119,16 +124,16 @@ save 60 10000
 
 # By default Redis will stop accepting writes if RDB snapshots are enabled
 # (at least one save point) and the latest background save failed.
-# This will make the user aware (in an hard way) that data is not persisting
+# This will make the user aware (in a hard way) that data is not persisting
 # on disk properly, otherwise chances are that no one will notice and some
-# distater will happen.
+# disaster will happen.
 #
 # If the background saving process will start working again Redis will
 # automatically allow writes again.
 #
 # However if you have setup your proper monitoring of the Redis server
 # and persistence, you may want to disable this feature so that Redis will
-# continue to work as usually even if there are problems with disk,
+# continue to work as usual even if there are problems with disk,
 # permissions, and so forth.
 stop-writes-on-bgsave-error yes
 
@@ -207,7 +212,7 @@ slave-serve-stale-data yes
 # Note: read only slaves are not designed to be exposed to untrusted clients
 # on the internet. It's just a protection layer against misuse of the instance.
 # Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extend you can improve
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
 # security of read only slaves using 'rename-command' to shadow all the
 # administrative / dangerous commands.
 slave-read-only yes
@@ -218,8 +223,11 @@ slave-read-only yes
 #
 # repl-ping-slave-period 10
 
-# The following option sets a timeout for both Bulk transfer I/O timeout and
-# master data or ping response timeout. The default value is 60 seconds.
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
 #
 # It is important to make sure that this value is greater than the value
 # specified for repl-ping-slave-period otherwise a timeout will be detected
@@ -242,13 +250,35 @@ slave-read-only yes
 # be a good idea.
 repl-disable-tcp-nodelay no
 
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The biggest the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
 # The slave priority is an integer number published by Redis in the INFO output.
 # It is used by Redis Sentinel in order to select a slave to promote into a
 # master if the master is no longer working correctly.
 #
 # A slave with a low priority number is considered better for promotion, so
 # for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one wtih priority 10, that is the lowest.
+# pick the one with priority 10, that is the lowest.
 #
 # However a special priority of 0 marks the slave as not able to perform the
 # role of master, so a slave with priority of 0 will never be selected by
@@ -256,6 +286,28 @@ repl-disable-tcp-nodelay no
 #
 # By default the priority is 100.
 slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEES that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
 <%- end %>
 
 ################################## SECURITY ###################################
@@ -307,7 +359,7 @@ slave-priority 100
 
 # Don't use more memory than the specified amount of bytes.
 # When the memory limit is reached Redis will try to remove keys
-# accordingly to the eviction policy selected (see maxmemmory-policy).
+# according to the eviction policy selected (see maxmemory-policy).
 #
 # If Redis can't remove keys according to the policy, or if the policy is
 # set to 'noeviction', Redis will start to reply with errors to commands
@@ -315,7 +367,7 @@ slave-priority 100
 # to reply to read-only commands like GET.
 #
 # This option is usually useful when using Redis as an LRU cache, or to set
-# an hard memory limit for an instance (using the 'noeviction' policy).
+# a hard memory limit for an instance (using the 'noeviction' policy).
 #
 # WARNING: If you have slaves attached to an instance with maxmemory on,
 # the size of the output buffers needed to feed the slaves are subtracted
@@ -495,6 +547,52 @@ slowlog-log-slower-than 10000
 # You can reclaim memory used by the slow log with SLOWLOG RESET.
 slowlog-max-len 1024
 
+############################# Event notification ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/keyspace-events
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
 ############################### ADVANCED CONFIG ###############################
 
 # Hashes are encoded using a memory efficient data structure when they have a
@@ -525,7 +623,7 @@ zset-max-ziplist-value 64
 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
 # order to help rehashing the main Redis hash table (the one mapping top-level
 # keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into an hash table
+# performs a lazy rehashing: the more operation you run into a hash table
 # that is rehashing, the more rehashing "steps" are performed, so if the
 # server is idle the rehashing is never complete and some more memory is used
 # by the hash table.
@@ -580,10 +678,10 @@ client-output-buffer-limit slave 256mb 64mb 60
 client-output-buffer-limit pubsub 32mb 8mb 60
 
 # Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeot, purging expired keys that are
+# closing connections of clients in timeout, purging expired keys that are
 # never requested, and so forth.
 #
-# Not all tasks are perforemd with the same frequency, but Redis checks for
+# Not all tasks are performed with the same frequency, but Redis checks for
 # tasks to perform accordingly to the specified "hz" value.
 #
 # By default "hz" is set to 10. Raising the value will use more CPU when
@@ -596,6 +694,12 @@ client-output-buffer-limit pubsub 32mb 8mb 60
 # 100 only in environments where very low latency is required.
 hz 10
 
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
+
 ################################## INCLUDES ###################################
 
 # Include one or more other config files here.  This is useful if you