mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-02-11 14:52:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

dont always include bucket in cdn url

Browse Source
This commit is contained in:
MiniDigger | Martin 2022-10-19 19:39:51 +02:00
parent b499f125d6
commit 09a9d090f1
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/papermc/hangar/config/hangar/StorageConfig.java
View File

@ -27,6 +27,7 @@ public class StorageConfig {
private String bucket;
private String objectStorageEndpoint;
private String cdnEndpoint;
private boolean cdnIncludeBucket = true;
@Bean
public StaticCredentialsProvider credProvider() {
@ -100,4 +101,12 @@ public class StorageConfig {
public void setCdnEndpoint(String cdnEndpoint) {
this.cdnEndpoint = cdnEndpoint;
}
public boolean isCdnIncludeBucket() {
return cdnIncludeBucket;
}
public void setCdnIncludeBucket(boolean cdnIncludeBucket) {
this.cdnIncludeBucket = cdnIncludeBucket;
}
}

2
backend/src/main/java/io/papermc/hangar/service/internal/file/S3FileService.java
View File

@ -91,6 +91,6 @@ public class S3FileService implements FileService {
@Override
public String getDownloadUrl(String user, String project, String version, Platform platform, String fileName) {
return config.getCdnEndpoint() + "/" + config.getBucket() + "/plugins/" + user + "/" + project + "/versions/" + version + "/" + platform.name() + "/" + fileName;
return config.getCdnEndpoint() + (config.isCdnIncludeBucket() ? "/" + config.getBucket() : "") + "/plugins/" + user + "/" + project + "/versions/" + version + "/" + platform.name() + "/" + fileName;
}
}

1
backend/src/main/resources/application.yml
View File

@ -197,6 +197,7 @@ hangar:
bucket: "test"
object-storage-endpoint: "http://127.0.0.1:9000"
cdn-endpoint: "http://127.0.0.1:9000"
cdn-include-bucket: true
#################
# Debug Logging #