diff --git a/frontend/src/version.json b/frontend/src/version.json index 7421b230..75a1ec37 100644 --- a/frontend/src/version.json +++ b/frontend/src/version.json @@ -1 +1 @@ -{"version":"1.7.0","build_id":61,"total_build":131} \ No newline at end of file +{"version":"1.7.0","build_id":62,"total_build":132} \ No newline at end of file diff --git a/frontend/src/views/preference/Preference.vue b/frontend/src/views/preference/Preference.vue index 84527174..66db4310 100644 --- a/frontend/src/views/preference/Preference.vue +++ b/frontend/src/views/preference/Preference.vue @@ -13,7 +13,6 @@ const data = reactive({ theme: settingsStore.theme }) - function save() { settingsStore.set_theme(data.theme) settingsStore.set_preference_theme(data.theme) diff --git a/frontend/version.json b/frontend/version.json index 7421b230..75a1ec37 100644 --- a/frontend/version.json +++ b/frontend/version.json @@ -1 +1 @@ -{"version":"1.7.0","build_id":61,"total_build":131} \ No newline at end of file +{"version":"1.7.0","build_id":62,"total_build":132} \ No newline at end of file diff --git a/server/pkg/cert/cert.go b/server/pkg/cert/cert.go index 710c5b99..8dc260c2 100644 --- a/server/pkg/cert/cert.go +++ b/server/pkg/cert/cert.go @@ -63,6 +63,10 @@ func IssueCert(domain []string, logChan chan string, errChan chan error) { config.CADirURL = "https://acme-staging-v02.api.letsencrypt.org/directory" } + if settings.ServerSettings.CADir != "" { + config.CADirURL = settings.ServerSettings.CADir + } + config.Certificate.KeyType = certcrypto.RSA2048 logChan <- "Creating client facilitates communication with the CA server" diff --git a/server/settings/settings.go b/server/settings/settings.go index cc182b02..aaa24348 100644 --- a/server/settings/settings.go +++ b/server/settings/settings.go @@ -24,6 +24,7 @@ type Server struct { Email string Database string StartCmd string + CADir string Demo bool PageSize int } @@ -41,6 +42,7 @@ var ServerSettings = &Server{ StartCmd: "login", Demo: false, PageSize: 10, + CADir: "", } var NginxLogSettings = &NginxLog{