From fc0b3c124729eb2ea7f4a9ba738ff9c5f13dca4b Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Tue, 25 Mar 2014 13:13:19 +0000 Subject: Make trove.configure perform required substitutions 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. --- trove.configure | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/trove.configure b/trove.configure index a1abae97..2f943ff3 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-setup/releases-repo-migration.sh \ + "$ROOT"/usr/lib/systemd/system/releases-repo-migration.service ########################################################################## @@ -93,6 +95,13 @@ cat <> "$ROOT/etc/hosts" 127.0.0.1 localhost 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 # -- cgit v1.2.1