This repository was archived by the owner on Sep 27, 2018. It is now read-only.
Commit bba20b1
Jimmy Angelakos
Added branding.yml copy.
1 parent 3ee1640 commit bba20b1
6 files changed
Lines changed: 39 additions & 12 deletions
File tree
- environments/development/modules/dcc/manifests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,11 +8,11 @@ It uses Vagrant to deploy two Docker containers, one for the database and the ot | |||
| 8 | 8 | ||
| 9 | 9 | ## Requirements | |
| 10 | 10 | 1. Docker | |
| 11 | - * Linux: [Docker v1.10.3](https://docs.docker.com/engine/installation) | ||
| 12 | - * Mac OSX: [Docker for Mac Beta](https://docs.docker.com/docker-for-mac) | ||
| 13 | - * Windows: [Docker for Windows Beta](https://docs.docker.com/docker-for-windows) (untested) | ||
| 11 | + * Linux: [Docker v1.10.3](https://docs.docker.com/engine/installation)+ | ||
| 12 | + * Mac OSX: [Docker for Mac Beta](https://docs.docker.com/docker-for-mac) | ||
| 13 | + * Windows: [Docker for Windows Beta](https://docs.docker.com/docker-for-windows) (untested) | ||
| 14 | 14 | 2. Vagrant | |
| 15 | - * [Vagrant v1.8.6](https://www.vagrantup.com/downloads.html) | ||
| 15 | + * [Vagrant v1.8.6](https://www.vagrantup.com/downloads.html)+ | ||
| 16 | 16 | ||
| 17 | 17 | ## Instructions | |
| 18 | 18 | 1. Clone this configuration repository: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,7 +5,7 @@ | |||
| 5 | 5 | ENV['VAGRANT_DEFAULT_PROVIDER'] ||= 'docker' | |
| 6 | 6 | ||
| 7 | 7 | # build one image before the other (no race) | |
| 8 | - ENV['VAGRANT_NO_PARALLEL'] = 'yes' | ||
| 8 | + # ENV['VAGRANT_NO_PARALLEL'] = 'yes' | ||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | 11 | Vagrant.configure(2) do |config| | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,11 +9,6 @@ | |||
| 9 | 9 | class { 'postgresql::server': | |
| 10 | 10 | listen_addresses => '*', | |
| 11 | 11 | port => 5435, | |
| 12 | - ipv4acls => [ | ||
| 13 | - 'local all postgres trust', | ||
| 14 | - 'local all dmproadmap trust', | ||
| 15 | - 'host all dmproadmap 172.18.0.0/24 md5 ', | ||
| 16 | - ], | ||
| 17 | 12 | pg_hba_conf_defaults => false, | |
| 18 | 13 | } | |
| 19 | 14 | postgresql::server::db { 'dmproadmap' : | |
@@ -25,4 +20,25 @@ | |||
| 25 | 20 | superuser => true, | |
| 26 | 21 | password_hash => postgresql_password('dmproadmap', 'dmproadmap'), | |
| 27 | 22 | } | |
| 23 | + postgresql::server::pg_hba_rule { 'local all postgres trust' : | ||
| 24 | + type => 'local', | ||
| 25 | + database => 'all', | ||
| 26 | + user => 'postgres', | ||
| 27 | + auth_method => 'trust', | ||
| 28 | + } | ||
| 29 | + postgresql::server::pg_hba_rule { 'local all dmproadmap trust' : | ||
| 30 | + type => 'local', | ||
| 31 | + database => 'all', | ||
| 32 | + user => 'dmproadmap', | ||
| 33 | + auth_method => 'trust', | ||
| 34 | + } | ||
| 35 | + postgresql::server::pg_hba_rule { 'host all dmproadmap 172.18.0.0/24 md5' : | ||
| 36 | + type => 'host', | ||
| 37 | + database => 'all', | ||
| 38 | + user => 'dmproadmap', | ||
| 39 | + address => '172.18.0.0/24', | ||
| 40 | + auth_method => 'md5', | ||
| 41 | + } | ||
| 42 | + | ||
| 43 | + | ||
| 28 | 44 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,10 +17,20 @@ | |||
| 17 | 17 | file { '/opt/src/dmproadmap.git/config/initializers/devise.rb': | |
| 18 | 18 | ensure => present, | |
| 19 | 19 | source => '/opt/src/dmproadmap.git/config/initializers/devise.rb.example', | |
| 20 | + owner => 'vagrant', | ||
| 21 | + group => 'source', | ||
| 20 | 22 | } -> | |
| 21 | 23 | file { '/opt/src/dmproadmap.git/config/initializers/recaptcha.rb': | |
| 22 | 24 | ensure => present, | |
| 23 | 25 | source => '/opt/src/dmproadmap.git/config/initializers/recaptcha.rb.example', | |
| 26 | + owner => 'vagrant', | ||
| 27 | + group => 'source', | ||
| 28 | + } -> | ||
| 29 | + file { '/opt/src/dmproadmap.git/config/branding.yml': | ||
| 30 | + ensure => present, | ||
| 31 | + source => '/opt/src/dmproadmap.git/config/branding_example.yml', | ||
| 32 | + owner => 'vagrant', | ||
| 33 | + group => 'source', | ||
| 24 | 34 | } -> | |
| 25 | 35 | file { '/opt/src/dmproadmap.git/tmp': | |
| 26 | 36 | ensure => 'directory', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -39,8 +39,8 @@ | |||
| 39 | 39 | } | |
| 40 | 40 | ||
| 41 | 41 | file { '/opt/src/dmproadmap.git/config/database.yml' : | |
| 42 | - owner => 'vagrant', | ||
| 43 | - group => 'source', | ||
| 42 | + owner => 'vagrant', | ||
| 43 | + group => 'source', | ||
| 44 | 44 | content => "development:\n adapter: postgresql\n host: 172.18.0.2\n port: 5435\n database: dmproadmap\n username: dmproadmap\n password: dmproadmap\n encoding: utf8", | |
| 45 | 45 | } | |
| 46 | 46 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,6 +13,7 @@ | |||
| 13 | 13 | package { [ | |
| 14 | 14 | 'bash-completion', | |
| 15 | 15 | 'bzip2', | |
| 16 | + 'ca-certificates', | ||
| 16 | 17 | 'man', | |
| 17 | 18 | 'mlocate', | |
| 18 | 19 | 'nano', | |
0 commit comments