X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fstatic-mirroring%2Fstatic-mirror-run-all;h=c6aea0c10c404633d2aecc403bf117098c552871;hb=5dc5997952b5754e99c246f2887057de4ad4b126;hp=11ec2884f73174d44bdbe4c3ffde3e9eeda8a505;hpb=a6a56555039941b10af2d856138661f50680485b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/static-mirroring/static-mirror-run-all b/modules/roles/files/static-mirroring/static-mirror-run-all
index 11ec2884f..c6aea0c10 100755
--- a/modules/roles/files/static-mirroring/static-mirror-run-all
+++ b/modules/roles/files/static-mirroring/static-mirror-run-all
@@ -23,9 +23,14 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-set -e
 set -u
 
+. /etc/staticsync.conf
+if ! [ -n "$base" ]; then
+  echo >&2 "base not configured!"
+  exit 1
+fi
+
 awk -v host="$(hostname -f)" '
   !/^ *(#|$)/ {
     split($6,ignorehosts,",")
@@ -37,5 +42,5 @@ awk -v host="$(hostname -f)" '
     print $1, $2
   }' /etc/static-components.conf |
   while read master component ; do
-    static-mirror-run --one-stage "/srv/static.debian.org/mirrors/$component" "$master:$component/-live-"
+    static-mirror-run --one-stage "$base/mirrors/$component" "$master:$component/-live-"
   done