projects / discourse_docker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4374ef7)
cleanup templates to work with new config
authorSam Saffron <sam.saffron@gmail.com>
Fri, 20 Dec 2013 05:27:58 +0000 (21:27 -0800)
committerSam Saffron <sam.saffron@gmail.com>
Fri, 20 Dec 2013 05:27:58 +0000 (21:27 -0800)
samples/standalone.yml patch | blob | blame | history
templates/web.template.yml patch | blob | blame | history

diff --git a/samples/standalone.yml b/samples/standalone.yml
index f3eda22b25f6c4222073dceaa7e238044f1247e6..264445525138a4bd456a4a909ac160c29290344c 100644 (file)
--- a/samples/standalone.yml
+++ b/samples/standalone.yml
@@ -20,7 +20,7 @@ params:
 
 env:
   # your email here
-  DEVELOPER_EMAILS: 'my_email@email.com'
+  DISCOURSE_DEVELOPER_EMAILS: 'my_email@email.com'
   # CHANGE ME to your hostname
   DISCOURSE_HOSTNAME: 'www.example.com'
   # SET ME to your smtp server eg mandrill
diff --git a/templates/web.template.yml b/templates/web.template.yml
index 53ee7eb1702af0220ba85e6a8903482f36d51ba2..b179d1efbb3075a4a8945e6b4a89879818662658 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -7,9 +7,7 @@ env:
   # this ensures we have enough heap space to handle a big pile of small reqs
   RUBY_HEAP_MIN_SLOTS: 800000
 
-  POSTGRES_SOCKET: /var/run/postgresql
-  POSTGRES_URL: pg://discourse@localhost
-  POSTGRES_DB: discourse
+  DISCOURSE_DB_SOCKET: /var/run/postgresql
 
 
 params: