summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@nordu.net>2015-04-28 14:14:45 +0200
committerJohan Lundberg <lundberg@nordu.net>2015-04-28 14:14:45 +0200
commita8440f64223a8c2f83da91a38165550d12fb886f (patch)
tree905e259b89600b9c53e8cd5c5cc99163cf906074
parenta97fb6f14c4fff181dd0f6754772becb4f624894 (diff)
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp18
1 files changed, 10 insertions, 8 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index dc54b17..ca0e766 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -752,14 +752,16 @@ node 'sto-tug-kvm2.swamid.se' {
path => "/opt/flog/nginx/certs/flog.sunet.se.key",
mode => '0640',
content => hiera('server_cert_key', 'NOT_SET_IN_HIERA'),
- } ->
- file { "/opt/flog/dotenv":
- postgres_password => hiera('flog_postgres_password', 'NOT_SET_IN_HIERA'),
- ensure => file,
- path => "/opt/flog/dotenv",
- mode => '0640',
- content => template('sunet/flog/dotenv.erb'),
- } ->
+ }
+ define flog::config() {
+ $postgres_password = hiera('flog_postgres_password', 'NOT_SET_IN_HIERA'),
+ file { "/opt/flog/dotenv":
+ ensure => file,
+ path => "/opt/flog/dotenv",
+ mode => '0640',
+ content => template('sunet/flog/dotenv.erb'),
+ }
+ }
sunet::docker_run {'flog_db':
image => 'docker.sunet.se/flog/postgresql-9.3',
volumes => ['/opt/flog/postgres/ssl:/etc/ssl', '/var/docker/postgresql_data/:/var/lib/postgresql/','/var/log/flog_db/:/var/log/postgresql/'],