From: Dessalines <tyhou13@gmx.com>
Date: Sat, 7 Sep 2019 16:37:12 +0000 (-0700)
Subject: Adding docker update instructions.
X-Git-Url: http://these/git/%22https:/github.com/LemmyNet/lemmy/issues/%22?a=commitdiff_plain;h=b6ed1b81d022f03f3581c8acd02aeadb6d302497;p=lemmy.git

Adding docker update instructions.

- Fixes #270
---

diff --git a/README.md b/README.md
index 155d9b08..774d475a 100644
--- a/README.md
+++ b/README.md
@@ -81,13 +81,21 @@ docker-compose up -d
 
 and goto http://localhost:8536
 
-[A sample nginx config](/docker/prod/nginx.conf), could be setup with:
+[A sample nginx config](/ansible/templates/nginx.conf), could be setup with:
 
 ```bash
-wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/nginx.conf
+wget https://raw.githubusercontent.com/dessalines/lemmy/master/ansible/templates/nginx.conf
 # Replace the {{ vars }}
 sudo mv nginx.conf /etc/nginx/sites-enabled/lemmy.conf
 ```
+#### Updating
+
+To update to the newest version, run:
+
+```bash
+wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml
+docker-compose up -d
+```
 
 ### Ansible
 
diff --git a/docker/prod/nginx.conf b/docker/prod/nginx.conf
deleted file mode 100644
index 918851a0..00000000
--- a/docker/prod/nginx.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-server {
-    listen 80;
-    server_name {{ your domain }};
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl http2;
-    server_name {{ your domain }};
-
-    ssl_certificate /etc/letsencrypt/live/{{ your domain }}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/{{ your domain }}/privkey.pem;
-
-    # Various TLS hardening settings
-    # https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
-    ssl_protocols TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-    ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
-    ssl_session_timeout  10m;
-    ssl_session_cache shared:SSL:10m;
-    ssl_session_tickets off;
-    ssl_stapling on;
-    ssl_stapling_verify on;
-
-    # Hide nginx version
-    server_tokens off;
-
-    # Enable compression for JS/CSS/HTML bundle, for improved client load times.
-    # It might be nice to compress JSON, but leaving that out to protect against potential
-    # compression+encryption information leak attacks like BREACH.
-    gzip on;
-    gzip_types text/css application/javascript;
-    gzip_vary on;
-
-    # Only connect to this site via HTTPS for the two years
-    add_header Strict-Transport-Security "max-age=63072000";
-
-    # Various content security headers
-    add_header Referrer-Policy "same-origin";
-    add_header X-Content-Type-Options "nosniff";
-    add_header X-Frame-Options "DENY";
-    add_header X-XSS-Protection "1; mode=block";
-
-    location / {
-        rewrite (\/(user|u|inbox|post|community|c|login|search|sponsors|communities|modlog|home)+) /static/index.html break;
-        proxy_pass http://0.0.0.0:8536;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        # WebSocket support
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-}