Redefine swift configs in SWIFT_DIR
We still need a link in /etc/swift until #885595 is fixed.
diff --git a/files/swift/account-server.conf b/files/swift/account-server.conf
index 920d45c..db0f097 100644
--- a/files/swift/account-server.conf
+++ b/files/swift/account-server.conf
@@ -4,6 +4,7 @@
bind_port = %BIND_PORT%
user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY%
+swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main]
pipeline = account-server
diff --git a/files/swift/container-server.conf b/files/swift/container-server.conf
index 8d59bf2..bdc3e3a 100644
--- a/files/swift/container-server.conf
+++ b/files/swift/container-server.conf
@@ -4,6 +4,7 @@
bind_port = %BIND_PORT%
user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY%
+swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main]
pipeline = container-server
diff --git a/files/swift/object-server.conf b/files/swift/object-server.conf
index 1b72e70..06fbffe 100644
--- a/files/swift/object-server.conf
+++ b/files/swift/object-server.conf
@@ -4,6 +4,7 @@
bind_port = %BIND_PORT%
user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY%
+swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main]
pipeline = object-server
diff --git a/files/swift/proxy-server.conf b/files/swift/proxy-server.conf
index 6b7dd52..fe7e39b 100644
--- a/files/swift/proxy-server.conf
+++ b/files/swift/proxy-server.conf
@@ -2,6 +2,7 @@
bind_port = 8080
user = %USER%
log_facility = LOG_LOCAL1
+swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main]
pipeline = healthcheck cache %AUTH_SERVER% proxy-server
diff --git a/files/swift/swift-remakerings b/files/swift/swift-remakerings
index 9343783..c65353c 100755
--- a/files/swift/swift-remakerings
+++ b/files/swift/swift-remakerings
@@ -1,6 +1,6 @@
#!/bin/bash
-cd /etc/swift
+cd %SWIFT_CONFIG_LOCATION%
rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz