summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-03-25 13:13:19 (GMT)
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-03-25 15:14:50 (GMT)
commitdfc815027c9bf1fd7f772f293b0a6c1e95bd7a3c (patch)
treef372e5f0ff29b6c9554f0e285c93cb3417500995
parent0ed129b7644d080ddab8447b183e666623563e6b (diff)
downloaddefinitions-baserock/adamcoldrick/binary-delivery-v2.tar.gz
Make trove.configure perform required substitutionsbaserock/adamcoldrick/binary-delivery-v2
Since we added releases-repo-migration.sh and a systemd unit to call it, and both of these need to know the Trove ID, add them to the command that performs substitutions in trove.configure.
-rwxr-xr-xtrove.configure11
1 files changed, 10 insertions, 1 deletions
diff --git a/trove.configure b/trove.configure
index a1abae9..af9a52e 100755
--- a/trove.configure
+++ b/trove.configure
@@ -80,7 +80,9 @@ sed -f "$ROOT"/etc/trove-setup.sed -i \
"$ROOT"/etc/lorry.conf \
"$ROOT"/usr/share/gitano/skel/gitano-admin/*/*.lace \
"$ROOT"/usr/share/gitano/skel/gitano-admin/*/*.lua \
- "$ROOT"/usr/share/gitano/skel/gitano-admin/users/*/user.conf
+ "$ROOT"/usr/share/gitano/skel/gitano-admin/users/*/user.conf \
+ "$ROOT"/usr/share/trove/releases-repo-migration.sh \
+ "$ROOT"/usr/lib/systemd/system/releases-repo-migration.service
##########################################################################
@@ -94,6 +96,13 @@ cat <<EOF >> "$ROOT/etc/hosts"
EOF
##########################################################################
+
+# create a symlink in /var/www/htdocs to what will be the rsync area of
+# the releases repository
+ln -s "/home/git/repos/$TROVE_ID/site/releases.git/rsync" \
+ "$ROOT/var/www/htdocs/releases"
+
+##########################################################################
# Configuration of trove-early-setup
#
# We configure trove-early-setup so that it runs at first boot of an initial