summaryrefslogtreecommitdiff
path: root/global/overlay
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-16 12:22:02 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-16 12:22:02 +0200
commit57fbeb3b9f3bc679336123091e38f76c9785eadf (patch)
tree8e27958339fabd7e421aa775be137d5ecdb0e2bf /global/overlay
parent556565891efbb6be0b62a868bb198588cb660c1c (diff)
Diffstat (limited to 'global/overlay')
-rw-r--r--global/overlay/etc/puppet/cosmos-modules.conf1
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp2
2 files changed, 2 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf
index 0260724..eaed23d 100644
--- a/global/overlay/etc/puppet/cosmos-modules.conf
+++ b/global/overlay/etc/puppet/cosmos-modules.conf
@@ -18,3 +18,4 @@ varnish git://github.com/samlbits/puppet-varnish.git yes puppet-varnish-*
docker git://github.com/SUNET/garethr-docker.git yes sunet-*
network git://github.com/SUNET/attachmentgenie-network.git yes sunet-*
sunet git://github.com/SUNET/puppet-sunet.git yes sunet-*
+sysctl git://github.com/SUNET/puppet-sysctl.git yes sunet-*
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index b48d911..890162e 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -137,7 +137,7 @@ node 'datasets.sunet.se' {
volumes => ['/etc/ssl:/etc/ssl','/var/log:/var/log'],
ports => ['80:80','443:443'],
env => ["REDIS_PORT=tcp://datasets-redis.docker:6379",'BASE_URL=https://datasets.sunet.se'],
- start_on => 'docker-redis'
+ start_on => 'docker-datasets-redis'
}
}