Merge branch 'main' into patch-2

README.md

@@ -1,6 +1,6 @@
 # Signal TLS Proxy
 
-To run a Signal TLS proxy, you will need a host with a domain name that has ports 80 and 443 available.
+To run a Signal TLS proxy, you will need a host that has ports 80 and 443 available and a domain name that points to that host.
 
 1. Install docker and docker-compose (`apt update && apt install docker docker-compose`)
 1. Ensure your current user has access to docker (`adduser $USER docker`)
@@ -9,3 +9,13 @@ To run a Signal TLS proxy, you will need a host with a domain name that has port
 1. `docker-compose up --detach`
 
 Your proxy is now running! You can share this with the URL `https://signal.tube/#<your_host_name>`
+
+## Updating from a previous version
+
+If you've previously run a proxy, please update to the most recent version by pulling the most recent changes from `main`, then restarting your Docker containers:
+
+```shell
+git pull
+docker-compose down
+docker-compose up --detach
+```

data/nginx-relay/nginx.conf

@@ -15,6 +15,7 @@ stream {
         cdn.signal.org                          signal-cdn;
         cdn2.signal.org                         signal-cdn2;
         api.directory.signal.org                directory;
+        cdsi.signal.org                         cdsi;
         contentproxy.signal.org                 content-proxy;
         uptime.signal.org                       uptime;
         api.backup.signal.org                   backup;
@@ -44,6 +45,10 @@ stream {
         server api.directory.signal.org:443;
     }
 
+    upstream cdsi {
+        server cdsi.signal.org:443;
+    }
+
     upstream content-proxy {
         server contentproxy.signal.org:443;
     }

data/nginx-terminate/nginx.conf

@@ -10,7 +10,11 @@ http {
         listen 80;
 
         location /.well-known/acme-challenge/ {
-            root /var/www/certbot;
+            alias /var/www/certbot/;
+        }
+
+        location / {
+            return 404;
         }
     }
 }

docker-compose.yml

@@ -10,6 +10,7 @@ services:
       - ./data/certbot/www:/var/www/certbot:Z
     ports:
       - "443:443"
+      - "80:80"
   nginx-relay:
     image: nginx:alpine
     restart: unless-stopped