versia-pub/activitypub
2
0
Fork 0
mirror of https://github.com/versia-pub/activitypub.git synced 2025-12-06 14:48:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Update API domain variable name

Browse source 
The commit updates the variable name for the API domain from `FEDERATED_DOMAIN` to `API_DOMAIN` in the `src/main.rs` file. This change improves clarity and consistency in the codebase.
This commit is contained in:
aprilthepink 2024-05-17 11:30:10 +02:00
parent c7798ac5e4
commit 14322c961f
3 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Dockerfile
View file

@ -1,13 +0,0 @@
FROM rust:slim as builder
RUN apt-get update && apt-get install -y libpq-dev libssl-dev pkg-config musl-tools perl make && rm -rf /var/lib/apt/lists/*
RUN rustup target add x86_64-unknown-linux-musl
WORKDIR /app
COPY . /app
RUN cargo build --release --target x86_64-unknown-linux-musl
RUN strip /app/target/x86_64-unknown-linux-musl/release/microservice
FROM scratch
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/microservice /microservice
WORKDIR /
CMD ["/microservice"]

2
docker-compose.yml
View file

@ -6,4 +6,4 @@ services:
- LISTEN=0.0.0.0:8080 - LISTEN=0.0.0.0:8080
ports: ports:
- 8080:8080 - 8080:8080
image: ghcr.io/lysand-org/activitypub:latest image: ghcr.io/lysand-org/activitypub:main

7
src/main.rs
View file

@ -139,7 +139,8 @@ lazy_static! {
static ref DATABASE_URL: String = env::var("DATABASE_URL").expect("DATABASE_URL must be set"); static ref DATABASE_URL: String = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
static ref USERNAME: String = static ref USERNAME: String =
env::var("LOCAL_USER_NAME").unwrap_or(LOCAL_USER_NAME.to_string()); env::var("LOCAL_USER_NAME").unwrap_or(LOCAL_USER_NAME.to_string());
static ref DOMAIN: String = env::var("FEDERATED_DOMAIN").unwrap_or(DOMAIN_DEF.to_string()); static ref API_DOMAIN: String = env::var("API_DOMAIN").unwrap_or(DOMAIN_DEF.to_string());
static ref FEDERATED_DOMAIN: String = env::var("FEDERATED_DOMAIN").unwrap_or(DOMAIN_DEF.to_string());
} }
static DB: OnceLock<DatabaseConnection> = OnceLock::new(); static DB: OnceLock<DatabaseConnection> = OnceLock::new();
@ -155,12 +156,12 @@ async fn main() -> actix_web::Result<(), anyhow::Error> {
let ap_id = Url::parse(&format!( let ap_id = Url::parse(&format!(
"https://{}/{}", "https://{}/{}",
DOMAIN.to_string(), API_DOMAIN.to_string(),
&USERNAME.to_string() &USERNAME.to_string()
))?; ))?;
let inbox = Url::parse(&format!( let inbox = Url::parse(&format!(
"https://{}/{}/inbox", "https://{}/{}/inbox",
DOMAIN.to_string(), API_DOMAIN.to_string(),
&USERNAME.to_string() &USERNAME.to_string()
))?; ))?;
let keypair = generate_actor_keypair()?; let keypair = generate_actor_keypair()?;