From 382db977ae3cc9cbed3c95bacb56438c81d2003d Mon Sep 17 00:00:00 2001
From: KTachibanaM <whj19931115@gmail.com>
Date: Tue, 12 Dec 2023 01:18:08 +0800
Subject: [PATCH] Install guide fixes (#1252)

* fix instructions for editing nginx configuration so that a snakeoil cert is used
* add snakeoil ssl certs for proxying object storage with nginx
---
 content/en/admin/install.md                       | 12 +++++++++++-
 content/en/admin/optional/object-storage-proxy.md |  3 +++
 content/zh-cn/admin/install.md                    | 12 +++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/content/en/admin/install.md b/content/en/admin/install.md
index 6d300cd9..756c96cf 100644
--- a/content/en/admin/install.md
+++ b/content/en/admin/install.md
@@ -199,7 +199,17 @@ cp /home/mastodon/live/dist/nginx.conf /etc/nginx/sites-available/mastodon
 ln -s /etc/nginx/sites-available/mastodon /etc/nginx/sites-enabled/mastodon
 ```
 
-Then edit `/etc/nginx/sites-available/mastodon` to replace `example.com` with your own domain name, and make any other adjustments you might need.
+Then edit `/etc/nginx/sites-available/mastodon` to 
+
+1. Replace `example.com` with your own domain name
+2. Uncomment the `ssl_certificate` and `ssl_certificate_key` lines and replace the two lines with (ignore this step if you are bringing your own certificate)
+
+```
+ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+```
+
+3. Make any other adjustments you might need.
 
 Un-comment the lines starting with `ssl_certificate` and `ssl_certificate_key`, updating the path with the correct domain name.
 
diff --git a/content/en/admin/optional/object-storage-proxy.md b/content/en/admin/optional/object-storage-proxy.md
index 1ee06e3f..66ad68b6 100644
--- a/content/en/admin/optional/object-storage-proxy.md
+++ b/content/en/admin/optional/object-storage-proxy.md
@@ -19,6 +19,9 @@ server {
   server_name files.example.com;
   root /var/www/html;
 
+  ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+  ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+
   keepalive_timeout 30;
 
   location = / {
diff --git a/content/zh-cn/admin/install.md b/content/zh-cn/admin/install.md
index 669408e5..6e9f7dc7 100644
--- a/content/zh-cn/admin/install.md
+++ b/content/zh-cn/admin/install.md
@@ -179,7 +179,17 @@ cp /home/mastodon/live/dist/nginx.conf /etc/nginx/sites-available/mastodon
 ln -s /etc/nginx/sites-available/mastodon /etc/nginx/sites-enabled/mastodon
 ```
 
-编辑 `/etc/nginx/sites-available/mastodon`，替换 `example.com` 为你自己的域名，你可以根据自己的需求做出其它的一些调整。
+编辑 `/etc/nginx/sites-available/mastodon`
+
+1. 替换 `example.com` 为你自己的域名
+2. 启用 `ssl_certificate` 和 `ssl_certificate_key` 这两行，并把它们替换成如下两行（如果你使用自己的证书的话则可以忽略这一步）
+
+```
+ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+```
+
+3. 你还可以根据自己的需求做出其它的一些调整。
 
 重载 nginx 以使变更生效：