correct base templates

diff --git a/samples/standalone.yml b/samples/standalone.yml
index 264445525138a4bd456a4a909ac160c29290344c..a31d831bdd43593ee140f62e0c16a5c67488c621 100644 (file)
--- a/samples/standalone.yml
+++ b/samples/standalone.yml
@@ -24,7 +24,11 @@ env:
   # CHANGE ME to your hostname
   DISCOURSE_HOSTNAME: 'www.example.com'
   # SET ME to your smtp server eg mandrill
-  # SMTP_URL: 'smtp://user@example.com:password@smtp.mandrillapp.com:587'
+  # don't forget to set mail
+  # DISCOURSE_SMTP_ADDRESS: smtp.mandrillapp.com
+  # DISCOURSE_SMTP_PORT: 587
+  # DISCOURSE_SMTP_USER_NAME: user@example.com
+  # DISCOURSE_SMTP_PASSWORD: p@ssword
 
 volumes:
   - volume:

diff --git a/samples/web_only.yml b/samples/web_only.yml
index 15704681124150ad7c71455140bcd5b319f71b03..61f7998d6aa29de2a3e5c9ebb75e9772dc492768 100644 (file)
--- a/samples/web_only.yml
+++ b/samples/web_only.yml
@@ -25,7 +25,10 @@ env:
   DISCOURSE_HOSTNAME: 'www.example.com'
   DISCOURSE_REDIS_HOST: YOUR_IP_ADDRESS
   # don't forget to set mail
-  # SMTP_URL: 'smtp://user@example.com:password@smtp.mandrillapp.com:587'
+  # DISCOURSE_SMTP_ADDRESS: smtp.mandrillapp.com
+  # DISCOURSE_SMTP_PORT: 587
+  # DISCOURSE_SMTP_USER_NAME: user@example.com
+  # DISCOURSE_SMTP_PASSWORD: p@ssword
 
 volumes:
   - volume:

diff --git a/templates/web.template.yml b/templates/web.template.yml
index b179d1efbb3075a4a8945e6b4a89879818662658..65a60648b7785d90dcb60d7cf730eb5d276c14ba 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -8,6 +8,8 @@ env:
   RUBY_HEAP_MIN_SLOTS: 800000
 
   DISCOURSE_DB_SOCKET: /var/run/postgresql
+  DISCOURSE_DB_HOST:
+  DISCOURSE_DB_PORT:
 
 
 params: