Merge branch 'master' of github.com:diaspora/diaspora

pkg

@@ -1 +1 @@
-Subproject commit a667cc50586f884d16e8621531cba9f7e8505f05
+Subproject commit bce52315e63b45635c0b64713f9352fad48577ee

script/server

@@ -70,15 +70,9 @@ function redis_config
     fi
 
     cp $redis_conf config/redis.conf
-    case $OS in
-    ## bsd sed doesn't seem to handle empty in-place edits correctly
-    *[Bb][Ss][Dd]*|Darwin)
-	    sed -i '' '/^[^#]*daemonize/s/yes/no/' config/redis.conf
-	    ;;
-    *)
-	    sed -i '/^[^#]*daemonize/s/yes/no/' config/redis.conf
-	    ;;
-    esac
+    sed -i -e '/^[^#]*daemonize/s/yes/no/'                               \
+           -e '/^[^#]*logfile/s|.*|logfile /var/log/diaspora/redis.log|' \
+        config/redis.conf
 }
 
 # Scan for -p, find out what port thin is about to use.