From 0586167418ec53a6aec136a4675e88e4742aec29 Mon Sep 17 00:00:00 2001 From: Joep Meindertsma Date: Wed, 8 Feb 2023 22:26:17 +0100 Subject: [PATCH] #192 https setup docs --- server/default.env | 15 +++++++++------ server/src/https.rs | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/server/default.env b/server/default.env index c135aeca1..29c9e21dc 100644 --- a/server/default.env +++ b/server/default.env @@ -6,6 +6,15 @@ # domain name where the server is hosted, including subdoman, without schema (http) and port # ATOMIC_DOMAIN=localhost +# Port where it's running. Make sure you have the rights to run at this port. +# Both an HTTPS and an HTTP port can be specified. + +# Set this to 80 if you're running this publicly +# ATOMIC_PORT=9883 + +# Set this to 443 if you're running this publicly +# ATOMIC_PORT_HTTPS=9884 + # Whether you want to enable HTTPS. If set to true, the server will initialize Certification process on start using Let'sEncrypt. You'll need to set ATOMIC_EMAIL for this. # ATOMIC_HTTPS=false @@ -24,12 +33,6 @@ # Path to where your config will be stored. # ATOMIC_CONFIG_FILE_PATH="/Users/your_home_folder/.config/atomic/config.toml" -# Port where it's running. Make sure you have the rights to run at this port. -# Both an HTTPS and an HTTP port can be specified. -# Both are necesssary during CERT_INIT -# ATOMIC_PORT=9883 -# ATOMIC_PORT_HTTPS=9884 - # Local IP where it's running. Use :: if you want it to be public. # ATOMIC_IP=:: diff --git a/server/src/https.rs b/server/src/https.rs index 68d22eb14..c9eb7a978 100644 --- a/server/src/https.rs +++ b/server/src/https.rs @@ -151,7 +151,7 @@ pub async fn cert_init_server(config: &crate::config::Config) -> AtomicServerRes request_cert(config) .await .map_err(|e| format!("Certification init failed: {}", e))?; - tracing::warn!("HTTPS TLS Cert init sucesful! Stopping HTTP server, starting HTTPS..."); + tracing::warn!("HTTPS TLS Cert init successful! Stopping HTTP server, starting HTTPS..."); handle.stop(true).await; Ok(()) }