From 259d21198b3011be8af093f3c509642802beec52 Mon Sep 17 00:00:00 2001 From: Lukasz Janyst Date: Fri, 20 May 2022 17:20:44 +0200 Subject: [PATCH] settings: Change the cache location and update example config file --- config.example.yaml | 15 ++++++++------- pkg/config/settings/settings.go | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config.example.yaml b/config.example.yaml index 6372ae9..2582f25 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -4,10 +4,11 @@ # "AllowProxy": "false", # "CacheEnabled": "true", # "CacheCompression": "true", -# "CacheDir": "./run/cache", -# "X509Key": "./run/key.pem", -# "X509Cert": "./run/cert.pem", -# "CookieJar": "./run/cookies.json", -# "CredentialsStore": "./run/credentials.json", -# "ServerAddress": "[::0]" -} \ No newline at end of file +# "CacheDir": "/var/cache/peroxide/cache", +# "X509Key": "/etc/peroxide/key.pem", +# "X509Cert": "/etc/peroxide/cert.pem", +# "CookieJar": "/etc/peroxide/cookies.json", +# "CredentialsStore": "/etc/peroxide/credentials.json", +# "ServerAddress": "[::0]", +# "BCCSelf": "false" +} diff --git a/pkg/config/settings/settings.go b/pkg/config/settings/settings.go index 6dc6253..e805dc0 100644 --- a/pkg/config/settings/settings.go +++ b/pkg/config/settings/settings.go @@ -83,7 +83,7 @@ func (s *Settings) setDefaultValues() { s.setDefault(BCCSelf, "false") settingsDir := "/etc/peroxide" - s.setDefault(CacheDir, "/var/cache/peroxide") + s.setDefault(CacheDir, "/var/cache/peroxide/cache") s.setDefault(X509Key, filepath.Join(settingsDir, "key.pem")) s.setDefault(X509Cert, filepath.Join(settingsDir, "cert.pem")) s.setDefault(CookieJar, filepath.Join(settingsDir, "cookies.json"))