Skip to content

Commit

Permalink
#192 https setup docs
Browse files Browse the repository at this point in the history
  • Loading branch information
joepio committed Feb 8, 2023
1 parent b64d9b9 commit 5adb462
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/deploy_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
workflow_dispatch:
push:
branches:
- develop

- 'develop'
jobs:
uses: ./.github/workflows/deployment.yml
15 changes: 9 additions & 6 deletions server/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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=::

Expand Down
2 changes: 1 addition & 1 deletion server/src/https.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
Expand Down

0 comments on commit 5adb462

Please sign in to comment.