diff options
Diffstat (limited to 'distbuild.configure')
| -rw-r--r-- | distbuild.configure | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/distbuild.configure b/distbuild.configure index 65ac47e3..6c298967 100644 --- a/distbuild.configure +++ b/distbuild.configure @@ -43,7 +43,7 @@ set -e # If ARTIFACT_CACHE_SERVER isn't set, default to $TROVE_ID. if [ "x$ARTIFACT_CACHE_SERVER" = x ] then - ARTIFACT_CACHE_SERVER="$TROVE_ID" + ARTIFACT_CACHE_SERVER="$TROVE_HOST" fi set -u @@ -52,7 +52,6 @@ set -u # Create the mount point for extra disk space. install -d -o 0 -g 0 -m 0755 "$1/srv/distbuild" - # Configuration shared by all instances of Morph. For reasons of # convenience, this sets the controller-initiator-address, so # that when users invoke "morph", they don't need to manually @@ -63,20 +62,21 @@ install -d -o 0 -g 0 -m 0755 "$1/srv/distbuild" cat <<EOF > "$1/etc/morph.conf" [config] -log = /var/log/morph.log +log = /srv/distbuild/morph.log log-max = 100M cachedir = /srv/distbuild tempdir = /srv/distbuild/tmp -trove-host = $TROVE_ID +trove-host = $TROVE_HOST trove-id = $TROVE_ID controller-initiator-address = $CONTROLLERHOST tempdir-min-space = 4G cachedir-min-space = 4G build-ref-prefix = $TROVE_ID -artifact-cache-server = http://${ARTIFACT_CACHE_SERVER}:8080/ -git-resolve-cache-server = http://${TROVE_ID}:8080/ +artifact-cache-server = http://$ARTIFACT_CACHE_SERVER:8080/ +git-resolve-cache-server = http://$TROVE_HOST:8080/ EOF +ln -s /srv/distbuild/morph.log "$1/var/log/morph.log" # Configuration for a distbuild controller. This configuration # file gets used by the systemd unit that runs the controller. @@ -88,24 +88,28 @@ if [ "$DISTBUILD_CONTROLLER" = True ] then cat <<EOF > "$1/etc/morph-controller.conf" [config] -log = /var/log/morph-controller.log +log = /srv/distbuild/morph-controller.log log-max = 100M -writeable-cache-server = http://${ARTIFACT_CACHE_SERVER}:8081/ +writeable-cache-server = http://$ARTIFACT_CACHE_SERVER:8081/ worker = $WORKERS controller-helper-address = 127.0.0.1 EOF - + +ln -s /srv/distbuild/morph-controller.log "$1/var/log/morph-controller.log" + # Configuration for the controller's helper process. This # gets used by the systemd unit that starts the helper. cat <<EOF > "$1/etc/morph-controller-helper.conf" [config] -log = /var/log/morph-controller-helper.log +log = /srv/distbuild/morph-controller-helper.log log-max = 100M parent-port = 5656 parent-address = 127.0.0.1 EOF +ln -s /srv/distbuild/morph-controller-helper.log "$1/var/log/morph-controller-helper.log" + fi # Configuration for a distbuild worker. This gets reference @@ -118,25 +122,28 @@ if [ "$DISTBUILD_WORKER" = True ] then cat <<EOF > "$1/etc/morph-worker.conf" [config] -log = /var/log/morph-worker.log +log = /srv/distbuild/morph-worker.log log-max = 100M controller-initiator-address = EOF - # This will be used for a systemd generator which +ln -s /srv/distbuild/morph-worker.log "$1/var/log/morph-worker.log" + + # This will be used for a systemd generator which # nfs mounts the ccache from the trove - echo "$TROVE_ID" > "$1/etc/trove-host" + echo "$TROVE_HOST" > "$1/etc/trove-host" # Configuration for the controller's helper process. This # gets used by the systemd unit that starts the helper. cat <<EOF > "$1/etc/morph-worker-helper.conf" [config] -log = /var/log/morph-worker-helper.log +log = /srv/distbuild/morph-worker-helper.log log-max = 100M parent-address = 127.0.0.1 EOF +ln -s /srv/distbuild/morph-worker-helper.log "$1/var/log/morph-worker-helper.log" # Configuration for the Morph cache server daemon. We # only run the cache server on workers. @@ -155,5 +162,5 @@ install -m 0600 "$WORKER_SSH_KEY" "$1/root/.ssh/id_rsa" install -m 0644 "${WORKER_SSH_KEY}.pub" "$1/root/.ssh/id_rsa.pub" # Add trove's host key -ssh-keyscan -t dsa,ecdsa,rsa "$TROVE_ID" >> "$1/root/.ssh/known_hosts" +ssh-keyscan -t dsa,ecdsa,rsa "$TROVE_HOST" >> "$1/root/.ssh/known_hosts" fi |