le1t0-deprec 2.1.6.075 → 2.1.6.076

data/lib/deprec/recipes/redis.rb

@@ -5,10 +5,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       set :redis_user, 'redis'
       set :redis_group, 'redis'
+      set :redis_ports, [6379]
       
       SRC_PACKAGES[:redis] = {
-        :md5sum => '7799de79f36ebdb73bcb8f09816d1ac3  redis-2.0.3.tar.gz',
-        :url => "http://redis.googlecode.com/files/redis-2.0.3.tar.gz",
+        :md5sum => '1c5b0d961da84a8f9b44a328b438549e  redis-2.2.2.tar.gz',
+        :url => "http://redis.googlecode.com/files/redis-2.2.2.tar.gz",
         :configure => nil,
       }
       
@@ -22,12 +23,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       SYSTEM_CONFIG_FILES[:redis] = [
         
         {:template => "redis-init.erb",
-         :path => '/etc/init.d/redis',
+         :path => '/etc/init.d/redis_@@PORT@@',
          :mode => 0755,
          :owner => 'root:root'},
 
         {:template => "redis-conf.erb",
-         :path => '/etc/redis/redis.conf',
+         :path => '/etc/redis/redis_@@PORT@@.conf',
          :mode => 0755,
          :owner => 'root:root'}
         
@@ -40,14 +41,24 @@ Capistrano::Configuration.instance(:must_exist).load do
       The can be pushed to the server with the :config task.
       DESC
       task :config_gen do
-        SYSTEM_CONFIG_FILES[:redis].each do |file|
-          deprec2.render_template(:redis, file)
+        redis_ports.each do |port|
+          SYSTEM_CONFIG_FILES[:redis].each do |file|
+            file_settings = file.dup
+            file_settings[:path].gsub!(/@@PORT@@/, port)
+            deprec2.render_template(:redis, file_settings)
+          end
         end
       end
 
       desc "Push redis config files to server"
       task :config, :roles => :redis do
-        deprec2.push_configs(:redis, SYSTEM_CONFIG_FILES[:redis])
+        redis_ports.each do |port|
+          SYSTEM_CONFIG_FILES[:redis].each do |file|
+            file_settings = file.dup
+            file_settings[:path].gsub!(/@@PORT@@/, port)
+            deprec2.push_configs(:redis, [file_settings])
+          end
+        end
       end
 
       task :create_redis_user, :roles => :redis do

data/lib/deprec/templates/redis/redis-conf.erb

@@ -18,16 +18,23 @@ daemonize yes
 
 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
 # default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+pidfile /var/run/redis_<%= redis_port %>.pid
 
-# Accept connections on the specified port, default is 6379
-port 6379
+# Accept connections on the specified port, default is 6379.
+# If port 0 is specified Redis will not listen on a TCP socket.
+port <%= redis_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.
 #
 # bind 127.0.0.1
 
+# 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.
+#
+# unixsocket /tmp/redis.sock
+
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
@@ -44,6 +51,16 @@ loglevel verbose
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility.  Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
 # Set the number of databases. The default database is DB 0, you can select
 # a different one on a per-connection basis using SELECT <dbid> where
 # dbid is a number between 0 and 'databases'-1
@@ -104,6 +121,19 @@ dir ./
 #
 # masterauth <master-password>
 
+# When a slave lost the connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of data data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
 ################################## SECURITY ###################################
 
 # Require clients to issue AUTH <PASSWORD> before processing any other
@@ -119,6 +149,22 @@ dir ./
 #
 # requirepass foobared
 
+# Command renaming.
+#
+# It is possilbe to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# of hard to guess so that it will be still available for internal-use
+# tools but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possilbe to completely kill a command renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+
 ################################### LIMITS ####################################
 
 # Set the max number of connected clients at the same time. By default there
@@ -148,6 +194,37 @@ dir ./
 #
 # maxmemory <bytes>
 
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached? You can select among five behavior:
+# 
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key accordingly to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys->random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+# 
+# Note: with all the kind of policies, Redis will return an error on write
+#       operations, when there are not suitable keys for eviction.
+#
+#       At the date of writing this commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy volatile-lru
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can select as well the sample
+# size to check. For instance for default Redis will check three keys and
+# pick the one that was used less recently, you can change the sample size
+# using the following configuration directive.
+#
+# maxmemory-samples 3
+
 ############################## APPEND ONLY MODE ###############################
 
 # By default Redis asynchronously dumps the dataset on disk. If you can live
@@ -195,6 +272,26 @@ appendonly no
 appendfsync everysec
 # appendfsync no
 
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving the durability of Redis is
+# the same as "appendfsync none", that in pratical terms means that it is
+# possible to lost up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+# 
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+no-appendfsync-on-rewrite no
+
 ################################ VIRTUAL MEMORY ###############################
 
 # Virtual Memory allows Redis to work with datasets bigger than the actual
@@ -269,17 +366,25 @@ vm-max-threads 4
 
 ############################### ADVANCED CONFIG ###############################
 
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
-
 # Hashes are encoded in a special way (much more memory efficient) when they
 # have at max a given numer of elements, and the biggest element does not
 # exceed a given threshold. You can configure this limits with the following
 # configuration directives.
-hash-max-zipmap-entries 64
-hash-max-zipmap-value 512
+hash-max-zipmap-entries 512
+hash-max-zipmap-value 64
+
+# Similarly to hashes, small lists are also encoded in a special way in order
+# to save a lot of space. The special representation is only used when
+# you are under the following limits:
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happens to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
 
 # 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
@@ -309,4 +414,4 @@ activerehashing yes
 # other files, so use this wisely.
 #
 # include /path/to/local.conf
-# include /path/to/other.conf
+# include /path/to/other.conf

data/lib/deprec/templates/redis/redis-init.erb

@@ -2,10 +2,10 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/local/bin/redis-server
-DAEMON_ARGS=/etc/redis/redis.conf
+DAEMON_ARGS=/etc/redis/redis_<%= redis_port %>.conf
 NAME=redis-server
 DESC=redis-server
-PIDFILE=/var/run/redis.pid
+PIDFILE=/var/run/redis_<%= redis_port %>.pid
 USER=<%= redis_user %>
 GROUP=<%= redis_group %>
 

metadata

@@ -2,7 +2,7 @@
 name: le1t0-deprec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.6.075
+  version: 2.1.6.076
 platform: ruby
 authors: 
 - Le1t0
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency