[50350] trunk/dports/databases/redis

ryandesign at macports.org ryandesign at macports.org
Wed Apr 29 10:14:59 PDT 2009


Revision: 50350
          http://trac.macports.org/changeset/50350
Author:   ryandesign at macports.org
Date:     2009-04-29 10:14:58 -0700 (Wed, 29 Apr 2009)
Log Message:
-----------
redis:

 * use correct prefix in sample conf files
 * don't create directory in post-activate; create it in post-destroot and tell MacPorts to keep it even though it's empty

Modified Paths:
--------------
    trunk/dports/databases/redis/Portfile

Added Paths:
-----------
    trunk/dports/databases/redis/files/redis-daemon.conf.sample.in
    trunk/dports/databases/redis/files/redis.conf.sample.in

Removed Paths:
-------------
    trunk/dports/databases/redis/files/redis-daemon.conf
    trunk/dports/databases/redis/files/redis.conf

Modified: trunk/dports/databases/redis/Portfile
===================================================================
--- trunk/dports/databases/redis/Portfile	2009-04-29 17:00:35 UTC (rev 50349)
+++ trunk/dports/databases/redis/Portfile	2009-04-29 17:14:58 UTC (rev 50350)
@@ -5,6 +5,7 @@
 
 name                    redis
 version                 0.092
+revision                1
 categories              databases
 maintainers             nomaintainer
 homepage                http://code.google.com/p/redis/
@@ -35,17 +36,26 @@
 use_configure           no
 
 build.env-append        CC=${configure.cc}
+post-build {
+    copy ${filespath}/redis.conf.sample.in ${workpath}/redis.conf.sample
+    copy ${filespath}/redis-daemon.conf.sample.in ${workpath}/redis-daemon.conf.sample
+    reinplace "s|@PREFIX@|${prefix}|g" \
+        ${workpath}/redis.conf.sample \
+        ${workpath}/redis-daemon.conf.sample
+}
 
+destroot.keepdirs ${destroot}${prefix}/var/db/redis
 destroot {
+    xinstall -d ${destroot}${prefix}/var/db/redis
     xinstall -m 0755 -W ${worksrcpath} \
         redis-benchmark \
         redis-cli \
         redis-server \
         ${destroot}${prefix}/bin
-    xinstall -m 0644 ${filespath}/redis.conf \
-        ${destroot}${prefix}/etc/redis.conf.sample
-    xinstall -m 0644 ${filespath}/redis-daemon.conf \
-        ${destroot}${prefix}/etc/redis-daemon.conf.sample
+    xinstall -m 0644 -W ${workpath} \
+        redis.conf.sample \
+        redis-daemon.conf.sample \
+        ${destroot}${prefix}/etc
 }
 
 post-activate {
@@ -57,7 +67,6 @@
         file copy ${prefix}/etc/redis.conf.sample \
             ${prefix}/etc/redis.conf
     }
-    xinstall -d ${prefix}/var/db/redis
     touch ${prefix}/var/log/redis.log
     ui_msg "
 =============================================================================

Deleted: trunk/dports/databases/redis/files/redis-daemon.conf
===================================================================
--- trunk/dports/databases/redis/files/redis-daemon.conf	2009-04-29 17:00:35 UTC (rev 50349)
+++ trunk/dports/databases/redis/files/redis-daemon.conf	2009-04-29 17:14:58 UTC (rev 50350)
@@ -1,87 +0,0 @@
-# Redis Daemon configuration file example
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize yes
-
-# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
-# You can specify a custom pid file location here.
-pidfile /opt/local/var/run/redis.pid
-
-# Accept connections on the specified port, default is 6379
-port 6379
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for connections.
-#
-# bind 127.0.0.1
-
-# Close the connection after a client is idle for N seconds
-timeout 300
-
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-save 900 1
-save 300 10
-save 60 10000
-
-# For default save/load DB in/from the working directory
-# Note that you must specify a directory not a file name.
-dir /opt/local/var/db/redis
-
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also 'stdout' can be used to force
-# the demon 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 /opt/local/var/log/redis.log
-
-# Set the number of databases.
-databases 16
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-
-# slaveof <masterip> <masterport>
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-
-# requirepass foobared
-
-############################### 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
-
-# Use object sharing. Can save a lot of memory if you have many common
-# string in your dataset, but performs lookups against the shared objects
-# pool so it uses more CPU and can be a bit slower. Usually it's a good
-# idea.
-shareobjects no

Copied: trunk/dports/databases/redis/files/redis-daemon.conf.sample.in (from rev 50337, trunk/dports/databases/redis/files/redis-daemon.conf)
===================================================================
--- trunk/dports/databases/redis/files/redis-daemon.conf.sample.in	                        (rev 0)
+++ trunk/dports/databases/redis/files/redis-daemon.conf.sample.in	2009-04-29 17:14:58 UTC (rev 50350)
@@ -0,0 +1,87 @@
+# Redis Daemon configuration file example
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize yes
+
+# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
+# You can specify a custom pid file location here.
+pidfile @PREFIX@/var/run/redis.pid
+
+# Accept connections on the specified port, default is 6379
+port 6379
+
+# If you want you can bind a single interface, if the bind option is not
+# specified all the interfaces will listen for connections.
+#
+# bind 127.0.0.1
+
+# Close the connection after a client is idle for N seconds
+timeout 300
+
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+save 900 1
+save 300 10
+save 60 10000
+
+# For default save/load DB in/from the working directory
+# Note that you must specify a directory not a file name.
+dir @PREFIX@/var/db/redis
+
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also 'stdout' can be used to force
+# the demon 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 @PREFIX@/var/log/redis.log
+
+# Set the number of databases.
+databases 16
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# so for example it is possible to configure the slave to save the DB with a
+# different interval, or to listen to another port, and so on.
+
+# slaveof <masterip> <masterport>
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+
+############################### 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
+
+# Use object sharing. Can save a lot of memory if you have many common
+# string in your dataset, but performs lookups against the shared objects
+# pool so it uses more CPU and can be a bit slower. Usually it's a good
+# idea.
+shareobjects no

Deleted: trunk/dports/databases/redis/files/redis.conf
===================================================================
--- trunk/dports/databases/redis/files/redis.conf	2009-04-29 17:00:35 UTC (rev 50349)
+++ trunk/dports/databases/redis/files/redis.conf	2009-04-29 17:14:58 UTC (rev 50350)
@@ -1,87 +0,0 @@
-# Redis Daemon configuration file example
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
-# You can specify a custom pid file location here.
-pidfile /opt/local/var/run/redis.pid
-
-# Accept connections on the specified port, default is 6379
-port 6379
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for connections.
-#
-# bind 127.0.0.1
-
-# Close the connection after a client is idle for N seconds
-timeout 300
-
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-save 900 1
-save 300 10
-save 60 10000
-
-# For default save/load DB in/from the working directory
-# Note that you must specify a directory not a file name.
-dir /opt/local/var/db/redis
-
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel debug
-
-# Specify the log file name. Also 'stdout' can be used to force
-# the demon 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 stdout
-
-# Set the number of databases.
-databases 16
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-
-# slaveof <masterip> <masterport>
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-
-# requirepass foobared
-
-############################### 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
-
-# Use object sharing. Can save a lot of memory if you have many common
-# string in your dataset, but performs lookups against the shared objects
-# pool so it uses more CPU and can be a bit slower. Usually it's a good
-# idea.
-shareobjects no

Copied: trunk/dports/databases/redis/files/redis.conf.sample.in (from rev 50337, trunk/dports/databases/redis/files/redis.conf)
===================================================================
--- trunk/dports/databases/redis/files/redis.conf.sample.in	                        (rev 0)
+++ trunk/dports/databases/redis/files/redis.conf.sample.in	2009-04-29 17:14:58 UTC (rev 50350)
@@ -0,0 +1,87 @@
+# Redis Daemon configuration file example
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
+# You can specify a custom pid file location here.
+pidfile @PREFIX@/var/run/redis.pid
+
+# Accept connections on the specified port, default is 6379
+port 6379
+
+# If you want you can bind a single interface, if the bind option is not
+# specified all the interfaces will listen for connections.
+#
+# bind 127.0.0.1
+
+# Close the connection after a client is idle for N seconds
+timeout 300
+
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+save 900 1
+save 300 10
+save 60 10000
+
+# For default save/load DB in/from the working directory
+# Note that you must specify a directory not a file name.
+dir @PREFIX@/var/db/redis
+
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel debug
+
+# Specify the log file name. Also 'stdout' can be used to force
+# the demon 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 stdout
+
+# Set the number of databases.
+databases 16
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# so for example it is possible to configure the slave to save the DB with a
+# different interval, or to listen to another port, and so on.
+
+# slaveof <masterip> <masterport>
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+
+############################### 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
+
+# Use object sharing. Can save a lot of memory if you have many common
+# string in your dataset, but performs lookups against the shared objects
+# pool so it uses more CPU and can be a bit slower. Usually it's a good
+# idea.
+shareobjects no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090429/9fb06c00/attachment-0001.html>


More information about the macports-changes mailing list