From 4bf61e0ef0bb730a61323c696debbff663eb6c7e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 14:15:53 -0800
Subject: [PATCH] Updates production install instructions

---
 README.md          | 3 ++-
 nginx/default.conf | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 98ce9c76..8d8f1917 100644
--- a/README.md
+++ b/README.md
@@ -169,10 +169,11 @@ Instructions for running BookWyrm in production:
    - Set a secure database password for postgres
  - Update your nginx configuration in `nginx/default.conf`
    - Replace `your-domain.com` with your domain name
+   - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
  - Run the application (this should also set up a Certbot ssl cert for your domain) with
   `docker-compose up --build`, and make sure all the images build successfully
  - When docker has built successfully, stop the process with `CTRL-C`
- - Comment out the `command: certonly...` line in `docker-compose.yml`
+ - Comment out the `command: certonly...` line in `docker-compose.yml`, and uncomment the following line (`command: renew ...`) so that the certificate will be automatically renewed.
  - Run docker-compose in the background with: `docker-compose up -d`
  - Initialize the database with: `./bw-dev initdb`
 
diff --git a/nginx/default.conf b/nginx/default.conf
index 8ba8ec55..d32d606f 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -13,8 +13,8 @@ server {
         root /var/www/certbot;
     }
 
-    # redirect http to https www
-    return 301 https://www.your-domain.com$request_uri;
+    # redirect http to https
+    return 301 https://your-domain.com$request_uri;
 }
 
 server {