Update standalone.yml

[discourse_docker.git] / samples / web_only.yml

diff --git a/samples/web_only.yml b/samples/web_only.yml
index 8c61c625b79b2beb6cb38861b1b23273fc09855c..142fddfc710970c1d191222789325ea4f3790170 100644 (file)
--- a/samples/web_only.yml
+++ b/samples/web_only.yml
@@ -2,7 +2,6 @@
 # TODO: change SOME_SECRET in this template
 
 templates:
-  - "templates/sshd.template.yml"
   - "templates/web.template.yml"
   - "templates/web.ratelimited.template.yml"
 
@@ -10,6 +9,15 @@ expose:
   - "80:80"
   - "2222:22"
 
+# Use 'links' key to link containers together, aka use Docker --link flag.
+links:
+  - link:
+      name: data
+      alias: data
+
+# any extra arguments for Docker?
+# docker_args:
+
 params:
   ## Which Git revision should this container use? (default: tests-passed)
   #version: tests-passed
@@ -18,14 +26,15 @@ env:
   LANG: en_US.UTF-8
   ## TODO: How many concurrent web requests are supported?
   ## With 2GB we recommend 3-4 workers, with 1GB only 2
+  ## If you have lots of memory, use one or two workers per logical CPU core
   #UNICORN_WORKERS: 3
 
   ## TODO: configure connectivity to the databases
   DISCOURSE_DB_SOCKET: ''
-  #DISCOURSE_DB_USER: discourse
+  #DISCOURSE_DB_USERNAME: discourse
   DISCOURSE_DB_PASSWORD: SOME_SECRET
-  DISCOURSE_DB_HOST: DB_IP_ADDRESS
-  DISCOURSE_REDIS_HOST: REDIS_IP_ADDRESS
+  DISCOURSE_DB_HOST: data
+  DISCOURSE_REDIS_HOST: data
   ##
   ## TODO: List of comma delimited emails that will be made admin and developer
   ## on initial signup example 'user1@example.com,user2@example.com'
@@ -51,12 +60,6 @@ volumes:
       host: /var/discourse/shared/web-only/log/var-log
       guest: /var/log
 
-#Use 'links' key to link containers together, aka use Docker --link flag.
-#links:
-#  - link:
-#      name: data
-#      alias: data
-
 ## The docker manager plugin allows you to one-click upgrade Discouse
 ## http://discourse.example.com/admin/docker
 hooks:
@@ -64,7 +67,6 @@ hooks:
     - exec:
         cd: $home/plugins
         cmd:
-          - mkdir -p plugins
           - git clone https://github.com/discourse/docker_manager.git
 
 ## Remember, this is YAML syntax - you can only have one block with a name