change static-domain config to static-root-path

rust-lang · Oct 15, 2022 · 564f022 · 564f022
1 parent ae0a5a9
commit 564f022
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -28,7 +28,7 @@ pub struct Config {
 
     // CloudFront domain which we can access
     // public S3 files through
-    pub(crate) s3_static_domain: String,
+    pub(crate) s3_static_root_path: String,
 
     // Github authentication
     pub(crate) github_accesstoken: Option<String>,
@@ -131,7 +131,7 @@ impl Config {
             #[cfg(test)]
             s3_bucket_is_temporary: false,
 
-            s3_static_domain: env("S3_STATIC_DOMAIN", "https://static.docs.rs".to_string())?,
+            s3_static_root_path: env("S3_STATIC_ROOT_PATH", "https://static.docs.rs".to_string())?,
 
             github_accesstoken: maybe_env("DOCSRS_GITHUB_ACCESSTOKEN")?,
             github_updater_min_rate_limit: env("DOCSRS_GITHUB_UPDATER_MIN_RATE_LIMIT", 2500)?,

diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs
@@ -761,7 +761,7 @@ pub fn download_handler(req: &mut Request) -> IronResult<Response> {
 
     Ok(super::redirect(ctry!(
         req,
-        Url::parse(&format!("{}/{}", config.s3_static_domain, archive_path))
+        Url::parse(&format!("{}/{}", config.s3_static_root_path, archive_path))
     )))
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         Ok(super::redirect(ctry!(
             req,
-            Url::parse(&format!("{}/{}", config.s3_static_domain, archive_path))
+            Url::parse(&format!("{}/{}", config.s3_static_root_path, archive_path))
         )))
     }
@@ Expand Down @@