summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-10-31 22:07:44 +0100
committerLeif Johansson <leifj@sunet.se>2013-10-31 22:07:44 +0100
commita24ce2ad22074fd5f82b92f5ce958fa81512d432 (patch)
treed97dac9e5d5eaa0849c083d24c8da15d362b8776
parent0b5391c01ad7f919122e2d3737c860aec1d5cca6 (diff)
parent2af2ea6db555bbe6b4ace6f772921824dc9354e2 (diff)
Merge branch 'multiverse'sunet-ops-2013-10-31-v06
-rwxr-xr-xapt/bootstrap-cosmos.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/apt/bootstrap-cosmos.sh b/apt/bootstrap-cosmos.sh
index 5dbb21a..2087a1c 100755
--- a/apt/bootstrap-cosmos.sh
+++ b/apt/bootstrap-cosmos.sh
@@ -28,8 +28,7 @@ hostname $cmd_hostname
perl -pi -e "s,#COSMOS_REPO_MODELS=.*,COSMOS_REPO_MODELS=\"\\\$COSMOS_REPO/global/:\\\$COSMOS_REPO/$cmd_hostname/\"," /etc/cosmos/cosmos.conf
perl -pi -e 's,#COSMOS_UPDATE_VERIFY_GIT_TAG_PATTERN=.*,COSMOS_UPDATE_VERIFY_GIT_TAG_PATTERN="eduid-cosmos*",' /etc/cosmos/cosmos.conf
-COSMOS_BASE=/var/cache/cosmos /var/cache/cosmos/repo/global/post-tasks.d/015cosmos-trust
-COSMOS_KEYS=/var/cache/cosmos/repo/global/overlay/etc/cosmos/keys
+COSMOS_BASE=/var/cache/cosmos COSMOS_KEYS=/var/cache/cosmos/repo/global/overlay/etc/cosmos/keys /var/cache/cosmos/repo/global/post-tasks.d/015cosmos-trust
(date; nohup cosmos -v update && nohup cosmos -v apply; date) > /var/log/cosmos.log 2>&1