Delta Between Two Patch Sets: modules/discourse_docker/manifests/init.pp
Issue 29370691:
Issue 4234 - New discourse module based on docker (Closed)
Left Patch Set: Added docs, using docker class
Created Jan. 6, 2017, 10:39 a.m.
Right Patch Set: add empty line at eof
Created Jan. 6, 2017, 3:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« modules/discourse_docker/files/site.conf ('k')
|
modules/discourse_docker/templates/app.yml.erb » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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 27 matching lines...) Expand all Loading... | |
| 38 # is_default => true, | 38 # is_default => true, |
| 39 # admins => ['test1@adblockplus.org','test2@adblockplus.org'], | 39 # admins => ['test1@adblockplus.org','test2@adblockplus.org'], |
| 40 # google_oauth2_client_id => '698703124405-3jodbnl423ie9r01gv4j3ve1olg02sv3. apps.googleusercontent.com', | 40 # google_oauth2_client_id => '698703124405-3jodbnl423ie9r01gv4j3ve1olg02sv3. apps.googleusercontent.com', |
| 41 # google_oauth2_client_secret => 'tB2ESr1b99qJpbOYqv3PtuPU', | 41 # google_oauth2_client_secret => 'tB2ESr1b99qJpbOYqv3PtuPU', |
| 42 # site_settings => { | 42 # site_settings => { |
| 43 # title => 'Awesome Forum', | 43 # title => 'Awesome Forum', |
| 44 # # .. many more site settings here... | 44 # # .. many more site settings here... |
| 45 # } | 45 # } |
| 46 # } | 46 # } |
| 47 # | 47 # |
| 48 | |
|
f.lopez
2017/01/06 14:37:54
we don't use a new line after the documentation
f.nicolaisen
2017/01/06 15:36:03
Acknowledged.
| |
| 49 class discourse_docker( | 48 class discourse_docker( |
| 50 $domain, | 49 $domain, |
| 51 $certificate = hiera('discourse_docker::certificate', undef), | 50 $certificate = hiera('discourse_docker::certificate', undef), |
| 52 $private_key = hiera('discourse_docker::private_key', undef), | 51 $private_key = hiera('discourse_docker::private_key', undef), |
| 53 $site_settings = hiera('discourse_docker::site_settings', {}), | 52 $site_settings = hiera('discourse_docker::site_settings', {}), |
| 54 $is_default = hiera('discourse_docker::is_default', false), | 53 $is_default = hiera('discourse_docker::is_default', false), |
| 55 $admins = hiera('discourse_docker::admins', []), | 54 $admins = hiera('discourse_docker::admins', []), |
| 56 $google_oauth2_client_id = hiera('discourse_docker::google_oauth2_client_id', 'undef'), | 55 $google_oauth2_client_id = hiera('discourse_docker::google_oauth2_client_id', 'undef'), |
| 57 $google_oauth2_client_secret = hiera('discourse_docker::google_oauth2_client_s ecret', 'undef'), | 56 $google_oauth2_client_secret = hiera('discourse_docker::google_oauth2_client_s ecret', 'undef'), |
| 58 ) { | 57 ) { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 } | 107 } |
| 109 | 108 |
| 110 nginx::hostconfig {$domain: | 109 nginx::hostconfig {$domain: |
| 111 source => "puppet:///modules/discourse_docker/site.conf", | 110 source => "puppet:///modules/discourse_docker/site.conf", |
| 112 certificate => $certificate, | 111 certificate => $certificate, |
| 113 private_key => $private_key, | 112 private_key => $private_key, |
| 114 is_default => $is_default, | 113 is_default => $is_default, |
| 115 log => "access_log_intraforum" | 114 log => "access_log_intraforum" |
| 116 } | 115 } |
| 117 } | 116 } |
| 117 | |
| LEFT | RIGHT |
« modules/discourse_docker/files/site.conf ('k')
|
modules/discourse_docker/templates/app.yml.erb » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
