Delta Between Two Patch Sets: modules/private-stub/hiera/hosts/abpforum1.yaml
Issue 29427603:
Noissue - Configure discourse containers to use smtp on the host system
Base URL: https://hg1/infrastructure
Left Patch Set:
Created May 2, 2017, 9:23 p.m.
Right 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 change/comment
|
« modules/discourse_docker/templates/app.yml.erb ('k')
|
modules/private-stub/hiera/hosts/eyeoforum1.yaml » ('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 classes: | 1 classes: |
| 2 statsclient: | |
| 3 nginx: | 2 nginx: |
| 4 worker_connections: 500 | 3 worker_connections: 500 |
| 5 discourse_docker: | 4 discourse_docker: |
| 6 domain: "forum.adblockplus.org" | 5 domain: "forum.adblockplus.org" |
| 7 certificate: "forum.adblockplus.org_sslcert.pem" | 6 certificate: "forum.adblockplus.org_sslcert.pem" |
| 8 private_key: "forum.adblockplus.org_sslcert.key" | 7 private_key: "forum.adblockplus.org_sslcert.key" |
| 9 is_default: true | 8 is_default: true |
| 10 admins: | 9 admins: |
| 11 - 'test1@adblockplus.org' | 10 - 'test1@adblockplus.org' |
| 12 - 'test2@adblockplus.org' | 11 - 'test2@adblockplus.org' |
| 13 smtp_host: "172.17.0.1" | 12 smtp_host: '172.17.0.1' |
| 14 # Google OAuth2 credentials (only valid for https://forum-test.adblockplus.o rg) | 13 # Google OAuth2 credentials (only valid for https://forum-test.adblockplus.o rg) |
| 15 google_oauth2_client_id: '698709125406-3jodbnl429ie9r00gv4j3ve1olg02sv7.apps .googleusercontent.com' | 14 google_oauth2_client_id: '698709125406-3jodbnl429ie9r00gv4j3ve1olg02sv7.apps .googleusercontent.com' |
| 16 google_oauth2_client_secret: 'tB2ESr1b99qJpbOYqv3PtuPU' | 15 google_oauth2_client_secret: 'tB2ESr1b99qJpbOYqv3PtuPU' |
| 17 site_settings: | 16 site_settings: |
| 18 title: "Adblock Plus Community Forum" | 17 title: "Adblock Plus Community Forum" |
| 19 contact_email: "admins@adblockplus.org" | 18 contact_email: "admins@adblockplus.org" |
| 20 notification_email: "donotreply@adblockplus.org" | 19 notification_email: "donotreply@adblockplus.org" |
| 21 site_contact_username: "system" | 20 site_contact_username: "system" |
| 22 allow_user_locale: "t" | 21 allow_user_locale: "t" |
| 23 share_links: "" | 22 share_links: "" |
| 24 login_required: "f" | 23 login_required: "f" |
| 25 must_approve_users: "f" | 24 must_approve_users: "f" |
| 26 enable_local_logins: "f" | 25 enable_local_logins: "f" |
| 27 allow_new_registrations: "t" | 26 allow_new_registrations: "t" |
| 28 enable_google_oauth2_logins: "t" | 27 enable_google_oauth2_logins: "t" |
| 29 enable_yahoo_logins: "f" | 28 enable_yahoo_logins: "f" |
| 30 enable_twitter_logins: "t" | 29 enable_twitter_logins: "t" |
| 31 enable_instagram_logins: "f" | 30 enable_instagram_logins: "f" |
| 32 enable_facebook_logins: "t" | 31 enable_facebook_logins: "t" |
| 33 enable_github_logins: "t" | 32 enable_github_logins: "t" |
| 34 email_domains_blacklist: "" | 33 email_domains_blacklist: "" |
| 35 email_domains_whitelist: "" | 34 email_domains_whitelist: "" |
| 36 enforce_global_nicknames: "f" | 35 enforce_global_nicknames: "f" |
| 37 max_mentions_per_post: 50 | 36 max_mentions_per_post: 50 |
| 38 force_https: "t" | 37 force_https: "t" |
| 39 white_listed_spam_host_domains: "adblockplus.org,eyeo.com" | 38 white_listed_spam_host_domains: "adblockplus.org,eyeo.com" |
| 40 | 39 |
| LEFT | RIGHT |
« modules/discourse_docker/templates/app.yml.erb ('k')
|
modules/private-stub/hiera/hosts/eyeoforum1.yaml » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
