summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2015-03-31 08:45:24 +0200
committerFredrik Thulin <fredrik@thulin.net>2015-03-31 08:45:24 +0200
commitda6ff70ce62a4fe85a4fa62751821a39295b1bbf (patch)
tree5a8218be4d7bfee63eb63b17b3e6b5c8da7eb703
parentd3ba9e646a7f4263f00ae694a410452555d03055 (diff)
parentd6d496a7ab3d01550f25e48581ae7e53e559f42d (diff)
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-03-31-v01
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp15
1 files changed, 15 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index a519ccf..b4ea64d 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -698,6 +698,8 @@ node 'cdr1.sunet.se' {
node 'sto-tug-kvm2.swamid.se' {
docker::image {'docker.sunet.se/flog/postgresql-9.3': }
+ docker::image {'docker.sunet.se/flog/nginx': }
+ docker::image {'docker.sunet.se/flog/flog_app': }
file {'/opt/docker/postgresql_data':
ensure => 'directory',
}
@@ -708,6 +710,19 @@ node 'sto-tug-kvm2.swamid.se' {
image => 'docker.sunet.se/flog/postgresql-9.3',
use_name => true,
volumes => ['/opt/docker/postgresql_data/:/var/lib/postgresql/','/var/log/flog_db/:/var/log/postgresql/'],
+ } ->
+ docker::run {'flog_app':
+ image => 'docker.sunet.se/flog/flog_app',
+ use_name => true,
+ links => ['flog_db:flog_db'],
+ volumes => ['/opt/flog/dotenv:/opt/flog/.env','/var/log/flog/:/opt/flog/logs/'],
+ } ->
+ docker::run {'flog_nginx':
+ image => 'docker.sunet.se/flog/nginx',
+ use_name => true,
+ ports => ['80:80', '443:443'],
+ links => ['flog_app:flog_app'],
+ volumes => ['/opt/flog/nginx/sites-enabled/:/etc/nginx/sites-enabled/','/opt/flog/nginx/certs/:/etc/nginx/certs', '/var/log/flog_nginx/:/var/log/nginx'],
}
}