Side by Side Diff: modules/discourse_docker/manifests/init.pp
Issue 29427603:
Noissue - Configure discourse containers to use smtp on the host system
Base URL: https://hg1/infrastructure
Patch Set: use host ip instead of undef
Created July 10, 2017, 11:20 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
modules/discourse_docker/templates/app.yml.erb » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 # == Class: discourse_docker | 1 # == Class: discourse_docker |
| 2 # | 2 # |
| 3 # Depends on module docker (for now) | 3 # Depends on module docker (for now) |
| 4 # | 4 # |
| 5 # == Parameters: | 5 # == Parameters: |
| 6 | 6 |
| 7 # [*domain*] | 7 # [*domain*] |
| 8 # Set the domain (hostname) for the site. This will be used in both nginx and d iscourse settings. | 8 # Set the domain (hostname) for the site. This will be used in both nginx and d iscourse settings. |
| 9 # | 9 # |
| 10 # [*certificate*] | 10 # [*certificate*] |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 # } | 45 # } |
| 46 # } | 46 # } |
| 47 # | 47 # |
| 48 class discourse_docker( | 48 class discourse_docker( |
| 49 $domain, | 49 $domain, |
| 50 $certificate = hiera('discourse_docker::certificate', undef), | 50 $certificate = hiera('discourse_docker::certificate', undef), |
| 51 $private_key = hiera('discourse_docker::private_key', undef), | 51 $private_key = hiera('discourse_docker::private_key', undef), |
| 52 $site_settings = hiera('discourse_docker::site_settings', {}), | 52 $site_settings = hiera('discourse_docker::site_settings', {}), |
| 53 $is_default = hiera('discourse_docker::is_default', false), | 53 $is_default = hiera('discourse_docker::is_default', false), |
| 54 $admins = hiera('discourse_docker::admins', []), | 54 $admins = hiera('discourse_docker::admins', []), |
| 55 $smtp_host = hiera('discourse_docker::smtp_host', '172.17.0.1'), | |
| 55 $google_oauth2_client_id = hiera('discourse_docker::google_oauth2_client_id', 'undef'), | 56 $google_oauth2_client_id = hiera('discourse_docker::google_oauth2_client_id', 'undef'), |
| 56 $google_oauth2_client_secret = hiera('discourse_docker::google_oauth2_client_s ecret', 'undef'), | 57 $google_oauth2_client_secret = hiera('discourse_docker::google_oauth2_client_s ecret', 'undef'), |
| 57 ) { | 58 ) { |
| 58 | 59 |
| 59 include stdlib | 60 include stdlib |
| 60 | 61 |
| 61 package {'git': | 62 package {'git': |
| 62 ensure => present, | 63 ensure => present, |
| 63 } | 64 } |
| 64 | 65 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 | 109 |
| 109 nginx::hostconfig {$domain: | 110 nginx::hostconfig {$domain: |
| 110 source => "puppet:///modules/discourse_docker/site.conf", | 111 source => "puppet:///modules/discourse_docker/site.conf", |
| 111 certificate => $certificate, | 112 certificate => $certificate, |
| 112 private_key => $private_key, | 113 private_key => $private_key, |
| 113 is_default => $is_default, | 114 is_default => $is_default, |
| 114 log => "access_log_intraforum" | 115 log => "access_log_intraforum" |
| 115 } | 116 } |
| 116 } | 117 } |
| 117 | 118 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/discourse_docker/templates/app.yml.erb » ('j')
|
no next file with comments »
