diff options
author | Johan Lundberg <lundberg@nordu.net> | 2015-04-28 14:00:20 +0200 |
---|---|---|
committer | Johan Lundberg <lundberg@nordu.net> | 2015-04-28 14:00:20 +0200 |
commit | 15dba620b3b2702d7707087279677d9dcfb92fbb (patch) | |
tree | aee530dc85a6dc656c640085359198d08f0bb3f5 /global/overlay/etc/puppet | |
parent | ed5f3a1b427814c9a7bc21fd0617dc922e93a5e0 (diff) |
Added flog files.sunet-ops-2015-04-28-v03
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 13 | ||||
-rw-r--r-- | global/overlay/etc/puppet/modules/sunet/templates/flog/dotenv.erb | 18 |
2 files changed, 31 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index b7b1601..f2d532a 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -698,6 +698,7 @@ node 'cdr1.sunet.se' { node 'sto-tug-kvm2.swamid.se' { class { 'sunet::nagios': } + $postgres_password = hiera('flog_postgres_password', 'NOT_SET_IN_HIERA'), file {'/var/docker': ensure => 'directory', } -> @@ -747,6 +748,18 @@ node 'sto-tug-kvm2.swamid.se' { group => 'www-data', mode => '1775', } -> + file { "/opt/flog/nginx/certs/flog.sunet.se.key": + ensure => file, + path => "/opt/flog/nginx/certs/flog.sunet.se.key", + mode => '0640', + content => hiera('server_cert_key', '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/'], diff --git a/global/overlay/etc/puppet/modules/sunet/templates/flog/dotenv.erb b/global/overlay/etc/puppet/modules/sunet/templates/flog/dotenv.erb new file mode 100644 index 0000000..bcd167b --- /dev/null +++ b/global/overlay/etc/puppet/modules/sunet/templates/flog/dotenv.erb @@ -0,0 +1,18 @@ +ALLOWED_HOSTS='flog.sunet.se flog_app.docker 192.36.125.10 2001:6b0:7::10' +EDUROAM_META_DATA='/opt/flog/institution.xml' +SENTRY_DSN='https://1ac5a19b73d04d91995055a81710e537:c31c3e5a162f477e8d6a9665aa134f8a@sentry.nordu.net/4' +EMAIL_HOST='localhost' +EMAIL_HOST_PASSWORD='' +EMAIL_HOST_USER='' +EMAIL_PORT='' +DB_ENGINE='django.db.backends.postgresql_psycopg2' +DB_NAME='flog' +DB_USER='flog' +DB_PASSWORD='<%= @postgres_password %>' +DB_HOST='flog_db.docker' +DB_PORT=5432 +#CACHE_BACKEND='django.core.cache.backends.db.DatabaseCache' +#CACHE_LOCATION='flog_cache_table' +CACHE_BACKEND='django.core.cache.backends.memcached.MemcachedCache' +CACHE_LOCATION='memcached.docker:11211' +STATIC_URL='/static/' |