Delta Between Two Patch Sets: hiera/roles/intraforumserver.yaml
Issue 29347356:
Issue 4234 - Migrate Discourse to a Docker-based setup (Closed)
Left Patch Set:
Created July 8, 2016, 3:35 p.m.
Right Patch Set: Clone from GitHub, updated to Discourse 1.6.4
Created Oct. 12, 2016, 1:17 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« Vagrantfile ('k')
|
modules/discourse/files/init-discourse » ('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: | 2 statsclient: |
| 3 discourse: | 3 discourse: |
| 4 domain: "intraforum.adblockplus.org" | 4 domain: "intraforum.adblockplus.org" |
| 5 certificate: "intraforum.adblockplus.org_sslcert.pem" | 5 certificate: "intraforum.adblockplus.org_sslcert.pem" |
| 6 private_key: "intraforum.adblockplus.org_sslcert.key" | 6 private_key: "intraforum.adblockplus.org_sslcert.key" |
| 7 is_default: true | 7 is_default: true |
| 8 site_settings: | 8 site_settings: |
| 9 title: "Adblock Plus internal discussions" | 9 title: "Adblock Plus internal discussions" |
| 10 contact_email: "admins@adblockplus.org" | 10 contact_email: "admins@adblockplus.org" |
| 11 notification_email: "donotreply@adblockplus.org" | 11 notification_email: "donotreply@adblockplus.org" |
| 12 site_contact_username: "system" | 12 site_contact_username: "system" |
| 13 allow_user_locale: "t" | 13 allow_user_locale: "t" |
| 14 share_links: "" | 14 share_links: "" |
|
Wladimir Palant
2016/07/08 15:46:38
This setting is new, we didn't have it in our prev
| |
| 15 login_required: "t" | 15 login_required: "t" |
| 16 must_approve_users: "f" | 16 must_approve_users: "f" |
| 17 enable_local_logins: "f" | 17 enable_local_logins: "f" |
| 18 allow_new_registrations: "t" | 18 allow_new_registrations: "t" |
|
Wladimir Palant
2016/07/08 15:46:38
For some reason, this is necessary even for creati
| |
| 19 enable_google_oauth2_logins: "t" | 19 enable_google_oauth2_logins: "t" |
| 20 enable_yahoo_logins: "f" | 20 enable_yahoo_logins: "f" |
| 21 enable_twitter_logins: "f" | 21 enable_twitter_logins: "f" |
| 22 enable_instagram_logins: "f" | 22 enable_instagram_logins: "f" |
|
Wladimir Palant
2016/07/08 15:46:38
This setting is new, we didn't have it in our prev
| |
| 23 enable_facebook_logins: "f" | 23 enable_facebook_logins: "f" |
| 24 enable_github_logins: "f" | 24 enable_github_logins: "f" |
| 25 email_domains_blacklist: "" | 25 email_domains_blacklist: "" |
| 26 email_domains_whitelist: "adblockplus.org|eyeo.com" | 26 email_domains_whitelist: "adblockplus.org|eyeo.com" |
| 27 enforce_global_nicknames: "f" | 27 enforce_global_nicknames: "f" |
| 28 max_mentions_per_post: 50 | 28 max_mentions_per_post: 50 |
| 29 google_oauth2_client_id: "%{hiera('discourse::google_oauth2_client_id')}" | 29 google_oauth2_client_id: "%{hiera('discourse::google_oauth2_client_id')}" |
| 30 google_oauth2_client_secret: "%{hiera('discourse::google_oauth2_client_sec ret')}" | 30 google_oauth2_client_secret: "%{hiera('discourse::google_oauth2_client_sec ret')}" |
| 31 # Note: use_https will be renamed into force_https in Discourse 1.6. | 31 force_https: "t" |
| 32 use_https: "t" | |
| 33 white_listed_spam_host_domains: "adblockplus.org,eyeo.com" | 32 white_listed_spam_host_domains: "adblockplus.org,eyeo.com" |
| 34 | 33 |
| 35 requirements: | 34 requirements: |
| 36 memory: 1024 | 35 memory: 4096 |
| LEFT | RIGHT |
« Vagrantfile ('k')
|
modules/discourse/files/init-discourse » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
