summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-16 22:17:59 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-16 22:17:59 +0200
commitc4be8feaa90830cf0c1cafdd496f383c6df361d0 (patch)
treee18b8ed9647a41b7ec061ee637a2441119997fb0 /global/overlay/etc/puppet
parent9f64c5737b4c57944bb33d78409cded63d07351a (diff)
parenta1f6be0730d25fd6f4ecff0d91bc75a8a250c0fe (diff)
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-16-v01
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index c313a0a..4249f7f 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -766,9 +766,9 @@ node 'sto-tug-kvm2.swamid.se' {
volumes => ['/opt/flog/dotenv:/opt/flog/.env','/var/log/flog/:/opt/flog/logs/'],
} ->
sunet::docker_run {'flog_nginx':
- image => 'docker.sunet.se/flog/nginx',
- ports => ['80:80', '443:443'],
- volumes => ['/opt/flog/nginx/sites-enabled/:/etc/nginx/sites-enabled/','/opt/flog/nginx/certs/:/etc/nginx/certs', '/var/log/flog_nginx/:/var/log/nginx'],
+ image => 'docker.sunet.se/flog/nginx',
+ ports => ['80:80', '443:443'],
+ volumes => ['/opt/flog/nginx/sites-enabled/:/etc/nginx/sites-enabled/','/opt/flog/nginx/certs/:/etc/nginx/certs', '/var/log/flog_nginx/:/var/log/nginx'],
}
}