From 23c730f0ae261d53c8314d48e828682a004e136d Mon Sep 17 00:00:00 2001 From: Jay Pfaffman Date: Mon, 11 Dec 2017 20:48:23 -0800 Subject: [PATCH] Update samples (#385) * update web_only.yml to match app.yml * update data.yml to match standalone.yml * missing quotes around variable --- discourse-setup | 4 +-- samples/data.yml | 10 +++----- samples/web_only.yml | 61 ++++++++++++++++++++++++++------------------ 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/discourse-setup b/discourse-setup index f440a41..2a0ba78 100755 --- a/discourse-setup +++ b/discourse-setup @@ -380,9 +380,9 @@ ask_user_for_config() { if [ ! -z $smtp_user_name ] then read -p "SMTP user name? [$smtp_user_name]: " new_value - if [ ! -z $new_value ] + if [ ! -z "$new_value" ] then - smtp_user_name=$new_value + smtp_user_name="$new_value" fi fi diff --git a/samples/data.yml b/samples/data.yml index a38ffa0..9f626ce 100644 --- a/samples/data.yml +++ b/samples/data.yml @@ -13,15 +13,11 @@ params: db_default_text_search_config: "pg_catalog.english" ## Set db_shared_buffers to a max of 25% of the total memory. - ## - ## On 1GB installs set to 128MB (to leave room for other processes) - ## on a 4GB instance you may raise to 1GB + ## will be set automatically by bootstrap based on detected RAM, or you can override #db_shared_buffers: "256MB" - # - ## Set higher on large instances it defaults to 10MB, for a 3GB install 40MB is a good default - ## this improves sorting performance, but adds memory usage per-connection + + ## can improve sorting performance, but adds memory usage per-connection #db_work_mem: "40MB" - # env: # ensure locale exists in container, you may need to install it diff --git a/samples/web_only.yml b/samples/web_only.yml index a93260e..ea4ebfa 100644 --- a/samples/web_only.yml +++ b/samples/web_only.yml @@ -4,10 +4,16 @@ templates: - "templates/web.template.yml" - "templates/web.ratelimited.template.yml" +## Uncomment these two lines if you wish to add Lets Encrypt (https) + #- "templates/web.ssl.template.yml" + #- "templates/web.letsencrypt.ssl.template.yml" +## which TCP/IP ports should this container expose? +## If you want Discourse to share a port with another webserver like Apache or nginx, +## see https://meta.discourse.org/t/17247 for details expose: - - "80:80" - - "2222:22" + - "80:80" # http + - "443:443" # https # Use 'links' key to link containers together, aka use Docker --link flag. links: @@ -24,35 +30,40 @@ params: 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 + # DISCOURSE_DEFAULT_LOCALE: en + + ## How many concurrent web requests are supported? Depends on memory and CPU cores. + ## will be set automatically by bootstrap based on detected CPUs, or you can override #UNICORN_WORKERS: 3 + ## TODO: The domain name this Discourse instance will respond to + DISCOURSE_HOSTNAME: 'discourse.example.com' + + ## Uncomment if you want the container to be started with the same + ## hostname (-h option) as specified above (default "$hostname-$config") + #DOCKER_USE_HOSTNAME: true + + ## TODO: List of comma delimited emails that will be made admin and developer + ## on initial signup example 'user1@example.com,user2@example.com' + DISCOURSE_DEVELOPER_EMAILS: 'me@example.com,you@example.com' + + ## TODO: The SMTP mail server used to validate new accounts and send notifications + DISCOURSE_SMTP_ADDRESS: smtp.example.com # required + #DISCOURSE_SMTP_PORT: 587 # (optional, default 587) + #DISCOURSE_SMTP_USER_NAME: user@example.com # required + #DISCOURSE_SMTP_PASSWORD: pa$$word # required, WARNING the char '#' in pw can cause problems! + #DISCOURSE_SMTP_ENABLE_START_TLS: true # (optional, default true) + + ## If you added the Lets Encrypt template, uncomment below to get a free SSL certificate + #LETSENCRYPT_ACCOUNT_EMAIL: me@example.com + ## TODO: configure connectivity to the databases DISCOURSE_DB_SOCKET: '' #DISCOURSE_DB_USERNAME: discourse DISCOURSE_DB_PASSWORD: SOME_SECRET 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' - DISCOURSE_DEVELOPER_EMAILS: 'me@example.com' - ## - ## TODO: The domain name this Discourse instance will respond to - DISCOURSE_HOSTNAME: 'discourse.example.com' - ## - ## Uncomment if you want the container to be started with the same - ## hostname (-h option) as specified above (default "$hostname-$config") - #DOCKER_USE_HOSTNAME: true - ## - ## TODO: The mailserver this Discourse instance will use - DISCOURSE_SMTP_ADDRESS: smtp.example.com # (mandatory) - #DISCOURSE_SMTP_PORT: 587 # (optional) - #DISCOURSE_SMTP_USER_NAME: user@example.com # (optional) - #DISCOURSE_SMTP_PASSWORD: pa$$word # (optional) - ## + ## The CDN address for this Discourse instance (configured to pull) #DISCOURSE_CDN_URL: //discourse-cdn.example.com @@ -64,8 +75,8 @@ volumes: host: /var/discourse/shared/web-only/log/var-log guest: /var/log -## The docker manager plugin allows you to one-click upgrade Discouse -## http://discourse.example.com/admin/docker +## Plugins go here +## see https://meta.discourse.org/t/19157 for details hooks: after_code: - exec: -- 2.25.1