Merge pull request #1762 from trident523/patch-1

INSTALL-ubuntu docs update.

config/discourse_quickstart.conf

@@ -0,0 +1,67 @@
+# Discourse supports multiple mechanisms for production config, detailed in the _defaults file.
+# This file includes the most commonly changed enviroment variables, to allow users following the official install guide to quickly get started; if the option you're looking for is not here it may be defined in the _defaults file.
+
+# Change the following!
+# All settings apply to production only
+
+# database name running discourse, in INSTALL-ubuntu this is discourse_prod
+db_name = discourse_prod
+
+# hostname running the forum; i.e the external address of your form.
+hostname = "discourse.example.com"
+
+# address of smtp server used to send emails. If testing, this can be left empty; but e-mails are a very important part of discourse.
+smtp_address =
+
+# port of smtp server used to send emails. This varies based on your e-mail host.
+smtp_port = 25
+
+# domain passed to smtp server
+smtp_domain =
+
+# username for smtp server
+smtp_user_name =
+
+# password for smtp server
+smtp_password =
+
+# enable TLS encryption for smtp connections
+smtp_enable_start_tls = true
+
+# enable MiniProfiler for administrators, by default this is true. This shows response times in the top left for admin users only. Uncomment this line to turn this off.
+# enable_mini_profiler = false
+
+# recommended, cdn used to access assets. This can be left empty at first.
+cdn_url =
+
+# comma delimited list of emails that have devloper level access. 
+developer_emails =
+
+# More advanded settings. Unless you changed these in your enviroment, the defaults will work.
+
+## Database
+
+# host address for db server, uncomment if needed
+# db_host = localhost
+
+# port running db server, uncomment if needed
+# db_port = 5432
+
+# username accessing database, if connecting remotely
+# db_username = discourse
+
+# password used to access the db, if connecting remotely
+# db_password =
+
+# Redis
+
+# redis server address
+# redis_host = localhost
+
+# redis server port
+# redis_port = 6379
+
+# redis password
+# redis_password =
+
+

docs/INSTALL-ubuntu.md

@@ -168,7 +168,8 @@ Configure Discourse:
 
     # Run these commands as the discourse user
     cd /var/www/discourse/config
-    cp discourse_defaults.conf discourse.conf
+    cp discourse_quickstart.conf discourse.conf
+    cp discourse.pill.sample discourse.pill
 
 Editing /var/www/discourse/config/discourse.conf:
 
@@ -180,10 +181,13 @@ Redis:
 - no changes if this is the only application using redis, but have a look
 
 E-mail:
-- browse througn all the settings
-- be sure to add your mail server SMTP settings so outgoing mail can be sent (we recommend [Mandrill](https://mandrillapp.com))
+- browse through all the settings and be sure to add your mail server SMTP settings so outgoing mail can be sent (we recommend [Mandrill](https://mandrillapp.com))
 - If your users will come from "internal" [private unroutable IPs](https://en.wikipedia.org/wiki/Private_network) like 10.x.x.x or 192.168.x.x please [see this topic](http://meta.discourse.org/t/all-of-my-internal-users-show-as-coming-from-127-0-0-1/6607).
 
+Editing: /var/www/discourse/config/discourse.pill
+- change application name from 'discourse' if necessary
+- Ensure appropriate Bluepill.application line is uncommented
+
 Initialize the database:
 
     # Run these commands as the discourse user