move devices into /srv/node instead of /srv

pgp44 · Mar 10, 2016 · 36cb2e1 · 36cb2e1
1 parent 5e39179
commit 36cb2e1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/files/account-server.conf b/files/account-server.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-devices = /srv
+devices = /srv/node
 mount_check = false
 disable_fallocate = true
 bind_port = 6012
@@ -23,4 +23,4 @@ vm_test_mode = yes
 
 [account-auditor]
 
-[account-reaper]
+[account-reaper]
diff --git a/files/container-server.conf b/files/container-server.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-devices = /srv
+devices = /srv/node
 mount_check = false
 disable_fallocate = true
 bind_port = 6011
@@ -26,4 +26,4 @@ vm_test_mode = yes
 
 [container-auditor]
 
-[container-sync]
+[container-sync]
diff --git a/files/object-server.conf b/files/object-server.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-devices = /srv
+devices = /srv/node
 mount_check = false
 disable_fallocate = true
 bind_port = 6010
@@ -23,4 +23,4 @@ vm_test_mode = yes
 
 [object-updater]
 
-[object-auditor]
+[object-auditor]
diff --git a/files/rsyncd.conf b/files/rsyncd.conf
@@ -6,18 +6,18 @@ address = 127.0.0.1
 
 [account6012]
 max connections = 25
-path = /srv/
+path = /srv/node
 read only = false
 lock file = /var/lock/account6012.lock
 
 [container6011]
 max connections = 25
-path = /srv/
+path = /srv/node
 read only = false
 lock file = /var/lock/container6011.lock
 
 [object6010]
 max connections = 25
-path = /srv/
+path = /srv/node
 read only = false
-lock file = /var/lock/object6010.lock
+lock file = /var/lock/object6010.lock
diff --git a/files/startmain.sh b/files/startmain.sh
@@ -17,6 +17,9 @@ fi
 
 # This comes from a volume, so need to chown it here, not sure of a better way
 # to get it owned by Swift.
+if [ ! -e /srv/node ]; then
+  mkdir /srv/node
+fi
 chown -R swift:swift /srv
 
 if [ ! -e /etc/swift/account.builder ]; then