Deuxfleurs/garage
41
56
Fork 73
Code Issues 99 Pull requests 14 Releases 30 Wiki Activity

Support website publishing #7

Merged
lx merged 61 commits from feature/website into master 2021-01-15 16:49:51 +00:00
Conversation 3 Commits 61 Files changed 17 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8797eed0ab - Show all commits

3
config.dev.toml
View file

@ -17,4 +17,5 @@ api_bind_addr = "[::1]:3900" # the S3 API port, HTTP without TLS. Add a reverse
s3_region = "garage" # set this to anything. S3 API calls will fail if they are not made against the region set here. s3_region = "garage" # set this to anything. S3 API calls will fail if they are not made against the region set here.
[s3_web] [s3_web]
web_bind_addr = "[::1]:3902" bind_addr = "[::1]:3902"
root_domain = ".garage.tld"

3
src/web/web_server.rs
View file

@ -20,7 +20,6 @@ pub async fn run_web_server(
let service = make_service_fn(|conn: &AddrStream| { let service = make_service_fn(|conn: &AddrStream| {
let garage = garage.clone(); let garage = garage.clone();
let client_addr = conn.remote_addr(); let client_addr = conn.remote_addr();
info!("{:?}", client_addr);
async move { async move {
Ok::<_, Error>(service_fn(move |req: Request<Body>| { Ok::<_, Error>(service_fn(move |req: Request<Body>| {
let garage = garage.clone(); let garage = garage.clone();
@ -58,7 +57,7 @@ async fn handler(
let path = req.uri().path().to_string(); let path = req.uri().path().to_string();
let key = percent_encoding::percent_decode_str(&path).decode_utf8()?; let key = percent_encoding::percent_decode_str(&path).decode_utf8()?;
info!("Selected bucket: {}, selected key: {}", bucket, key); info!("Selected bucket: \"{}\", selected key: \"{}\"", bucket, key);
Ok(Response::new(Body::from("hello world\n"))) Ok(Response::new(Body::from("hello world\n")))
} }