commit a2cd841265c81e03a92a7abb5d788ad3d2d46bcd
author Chmouel Boudjnah <chmouel@chmouel.com> Tue Nov 01 12:36:10 2011 +0100
committer Chmouel Boudjnah <chmouel@chmouel.com> Wed Nov 02 17:07:18 2011 +0100
tree 3304360a6e513b049d53986d407deaf0a02f8956
parent 28fa4e8d940cb8a7a3d5fcb932a7552ad5f1c90c

Change SWIFT_DRIVE_LOCATION to SWIFT_LOCATION

Fix some retarness along the way.

files/swift-proxy-server.conf

diff --git a/files/swift-proxy-server.conf b/files/swift-proxy-server.conf
index 99fc286..9e2b1dd 100644
--- a/files/swift-proxy-server.conf
+++ b/files/swift-proxy-server.conf
@@ -16,7 +16,7 @@
 user_test_tester = testing .admin
 user_test2_tester2 = testing2 .admin
 user_test_tester3 = testing3
-bind_ip = ${MY_IP}
+bind_ip = 0.0.0.0
 
 [filter:healthcheck]
 use = egg:swift#healthcheck

files/swift-rsyncd.conf

diff --git a/files/swift-rsyncd.conf b/files/swift-rsyncd.conf
index 80ec186..1cea98c 100644
--- a/files/swift-rsyncd.conf
+++ b/files/swift-rsyncd.conf
@@ -6,74 +6,74 @@
 
 [account6012]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/1/node/
+path = %SWIFT_LOCATION%/1/node/
 read only = false
 lock file = /var/lock/account6012.lock
 
 [account6022]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/2/node/
+path = %SWIFT_LOCATION%/2/node/
 read only = false
 lock file = /var/lock/account6022.lock
 
 [account6032]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/3/node/
+path = %SWIFT_LOCATION%/3/node/
 read only = false
 lock file = /var/lock/account6032.lock
 
 [account6042]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/4/node/
+path = %SWIFT_LOCATION%/4/node/
 read only = false
 lock file = /var/lock/account6042.lock
 
 
 [container6011]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/1/node/
+path = %SWIFT_LOCATION%/1/node/
 read only = false
 lock file = /var/lock/container6011.lock
 
 [container6021]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/2/node/
+path = %SWIFT_LOCATION%/2/node/
 read only = false
 lock file = /var/lock/container6021.lock
 
 [container6031]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/3/node/
+path = %SWIFT_LOCATION%/3/node/
 read only = false
 lock file = /var/lock/container6031.lock
 
 [container6041]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/4/node/
+path = %SWIFT_LOCATION%/4/node/
 read only = false
 lock file = /var/lock/container6041.lock
 
 
 [object6010]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/1/node/
+path = %SWIFT_LOCATION%/1/node/
 read only = false
 lock file = /var/lock/object6010.lock
 
 [object6020]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/2/node/
+path = %SWIFT_LOCATION%/2/node/
 read only = false
 lock file = /var/lock/object6020.lock
 
 [object6030]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/3/node/
+path = %SWIFT_LOCATION%/3/node/
 read only = false
 lock file = /var/lock/object6030.lock
 
 [object6040]
 max connections = 25
-path = %SWIFT_LOOPBACK_DISK_SIZE%/4/node/
+path = %SWIFT_LOCATION%/4/node/
 read only = false
 lock file = /var/lock/object6040.lock