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-27 17:27:57 (GMT)
commit5d2eaed41c0260340ba7fe6c18f640ba35a52778 (patch)
tree50e186daf8bcd64d0b98ef55b3e06b5ecda2e035
parentad50e80f107aa1af8f3ee0ff250e457347342629 (diff)
downloaddefinitions-baserock/adamcoldrick/binary-delivery-v4-rebase.tar.gz
Make trove.configure perform required substitutionsbaserock/adamcoldrick/binary-delivery-v4-rebase
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.configure12
1 files changed, 11 insertions, 1 deletions
diff --git a/trove.configure b/trove.configure
index a1abae9..42ad632 100755
--- a/trove.configure
+++ b/trove.configure
@@ -80,7 +80,10 @@ 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-setup/releases-repo-migration.sh \
+ "$ROOT"/usr/share/trove-setup/releases-repo-README \
+ "$ROOT"/usr/lib/systemd/system/releases-repo-migration.service
##########################################################################
@@ -94,6 +97,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