Side by Side Diff: 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
Patch Set:
Created May 2, 2017, 9:23 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/discourse_docker/manifests/init.pp ('K')
|
« modules/discourse_docker/templates/app.yml.erb ('k')
|
modules/private-stub/hiera/hosts/eyeoforum1.yaml » ('j')
|
modules/private-stub/hiera/hosts/eyeoforum1.yaml » ('J')
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 classes: | 1 classes: |
| 2 statsclient: | 2 statsclient: |
| 3 nginx: | 3 nginx: |
| 4 worker_connections: 500 | 4 worker_connections: 500 |
| 5 discourse_docker: | 5 discourse_docker: |
| 6 domain: "forum.adblockplus.org" | 6 domain: "forum.adblockplus.org" |
| 7 certificate: "forum.adblockplus.org_sslcert.pem" | 7 certificate: "forum.adblockplus.org_sslcert.pem" |
| 8 private_key: "forum.adblockplus.org_sslcert.key" | 8 private_key: "forum.adblockplus.org_sslcert.key" |
| 9 is_default: true | 9 is_default: true |
| 10 admins: | 10 admins: |
| 11 - 'test1@adblockplus.org' | 11 - 'test1@adblockplus.org' |
| 12 - 'test2@adblockplus.org' | 12 - 'test2@adblockplus.org' |
| 13 smtp_host: "172.17.0.1" | |
| 13 # Google OAuth2 credentials (only valid for https://forum-test.adblockplus.o rg) | 14 # Google OAuth2 credentials (only valid for https://forum-test.adblockplus.o rg) |
| 14 google_oauth2_client_id: '698709125406-3jodbnl429ie9r00gv4j3ve1olg02sv7.apps .googleusercontent.com' | 15 google_oauth2_client_id: '698709125406-3jodbnl429ie9r00gv4j3ve1olg02sv7.apps .googleusercontent.com' |
| 15 google_oauth2_client_secret: 'tB2ESr1b99qJpbOYqv3PtuPU' | 16 google_oauth2_client_secret: 'tB2ESr1b99qJpbOYqv3PtuPU' |
| 16 site_settings: | 17 site_settings: |
| 17 title: "Adblock Plus Community Forum" | 18 title: "Adblock Plus Community Forum" |
| 18 contact_email: "admins@adblockplus.org" | 19 contact_email: "admins@adblockplus.org" |
| 19 notification_email: "donotreply@adblockplus.org" | 20 notification_email: "donotreply@adblockplus.org" |
| 20 site_contact_username: "system" | 21 site_contact_username: "system" |
| 21 allow_user_locale: "t" | 22 allow_user_locale: "t" |
| 22 share_links: "" | 23 share_links: "" |
| 23 login_required: "f" | 24 login_required: "f" |
| 24 must_approve_users: "f" | 25 must_approve_users: "f" |
| 25 enable_local_logins: "f" | 26 enable_local_logins: "f" |
| 26 allow_new_registrations: "t" | 27 allow_new_registrations: "t" |
| 27 enable_google_oauth2_logins: "t" | 28 enable_google_oauth2_logins: "t" |
| 28 enable_yahoo_logins: "f" | 29 enable_yahoo_logins: "f" |
| 29 enable_twitter_logins: "t" | 30 enable_twitter_logins: "t" |
| 30 enable_instagram_logins: "f" | 31 enable_instagram_logins: "f" |
| 31 enable_facebook_logins: "t" | 32 enable_facebook_logins: "t" |
| 32 enable_github_logins: "t" | 33 enable_github_logins: "t" |
| 33 email_domains_blacklist: "" | 34 email_domains_blacklist: "" |
| 34 email_domains_whitelist: "" | 35 email_domains_whitelist: "" |
| 35 enforce_global_nicknames: "f" | 36 enforce_global_nicknames: "f" |
| 36 max_mentions_per_post: 50 | 37 max_mentions_per_post: 50 |
| 37 force_https: "t" | 38 force_https: "t" |
| 38 white_listed_spam_host_domains: "adblockplus.org,eyeo.com" | 39 white_listed_spam_host_domains: "adblockplus.org,eyeo.com" |
| 39 | 40 |
| OLD | NEW |
