amend config to work nicely with new zero sample files policy

[discourse_docker.git] / templates / web.template.yml

diff --git a/templates/web.template.yml b/templates/web.template.yml
index bfa6a90def115b8f2a6690245c26871670cf25b0..53ee7eb1702af0220ba85e6a8903482f36d51ba2 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -1,8 +1,5 @@
 env:
-  # Comma delimited list of emails, required if you want admin access for first account
-  DEVELOPER_EMAILS: 'YOUR_EMAIL@EMAIL.COM1'
   # You can have redis on a different box
-  # REDIS_PROVIDER_URL: 'redis://l.discourse:6379'
   RAILS_ENV: 'production'
   UNICORN_WORKERS: 3
   # slightly less aggressive than "recommendation" but works fine with oobgc
@@ -10,24 +7,17 @@ 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
+
+
 params:
   # SSH key is required for remote access into the container
   version: HEAD
 
   home: /var/www/discourse
 
-  # You can connect to any DB you wish to
-  database_yml:
-    production:
-      database: discourse
-      username: discourse
-      socket: /var/run/postgresql
-# TODO allow param here?
-      # password:
-      # host:
-      # host_names:
-      #   - YOUR_HOSTNAME_HERE
-
 run:
 
   - file:
@@ -68,9 +58,6 @@ run:
         - git clean -f
         - git pull
         - git checkout $version
-        - cp config/database.yml.production-sample config/database.yml
-        - cp config/redis.yml.sample config/redis.yml
-        - cp config/environments/production.rb.sample config/environments/production.rb
         - mkdir -p tmp/pids
         - mkdir -p tmp/sockets
         - touch tmp/.gitkeep
@@ -103,8 +90,6 @@ run:
       from: /server_name.+$/
       to: server_name _ ;
 
-  - merge: $home/config/database.yml $database_yml
-
   - exec:
       cmd: echo "done configuring web"
       hook: web_config