Preserve/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2025-07-20 10:04:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename web-push-subscriptions-file to web-push-file

Browse source
This commit is contained in:
binwiederhier 2023-06-17 21:57:47 -04:00
parent 020996ea04
commit 88c6b4adae
8 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/config.go
View file

@ -155,7 +155,7 @@ type Config struct {
Version string // injected by App
WebPushPrivateKey string
WebPushPublicKey string
WebPushSubscriptionsFile string
WebPushFile string
WebPushEmailAddress string
WebPushExpiryDuration time.Duration
WebPushExpiryWarningDuration time.Duration
@ -242,7 +242,7 @@ func NewConfig() *Config {
Version: "",
WebPushPrivateKey: "",
WebPushPublicKey: "",
WebPushSubscriptionsFile: "",
WebPushFile: "",
WebPushEmailAddress: "",
WebPushExpiryDuration: DefaultWebPushExpiryDuration,
WebPushExpiryWarningDuration: DefaultWebPushExpiryWarningDuration,

2
server/server.go
View file

@ -158,7 +158,7 @@ func New(conf *Config) (*Server, error) {
}
var webPush *webPushStore
if conf.WebPushPublicKey != "" {
webPush, err = newWebPushStore(conf.WebPushSubscriptionsFile)
webPush, err = newWebPushStore(conf.WebPushFile)
if err != nil {
return nil, err
}

4
server/server.yml
View file

@ -155,12 +155,12 @@
#
# - web-push-public-key is the generated VAPID public key, e.g. AA1234BBCCddvveekaabcdfqwertyuiopasdfghjklzxcvbnm1234567890
# - web-push-private-key is the generated VAPID private key, e.g. AA2BB1234567890abcdefzxcvbnm1234567890
# - web-push-subscriptions-file is a database file to keep track of browser subscription endpoints, e.g. `/var/cache/ntfy/webpush.db`
# - web-push-file is a database file to keep track of browser subscription endpoints, e.g. `/var/cache/ntfy/webpush.db`
# - web-push-email-address is the admin email address send to the push provider, e.g. `sysadmin@example.com`
#
# web-push-public-key:
# web-push-private-key:
# web-push-subscriptions-file:
# web-push-file:
# web-push-email-address:
# If enabled, ntfy can perform voice calls via Twilio via the "X-Call" header.

2
server/server_test.go
View file

@ -2622,7 +2622,7 @@ func newTestConfigWithWebPush(t *testing.T) *Config {
conf := newTestConfig(t)
privateKey, publicKey, err := webpush.GenerateVAPIDKeys()
require.Nil(t, err)
conf.WebPushSubscriptionsFile = filepath.Join(t.TempDir(), "webpush.db")
conf.WebPushFile = filepath.Join(t.TempDir(), "webpush.db")
conf.WebPushEmailAddress = "testing@example.com"
conf.WebPushPrivateKey = privateKey
conf.WebPushPublicKey = publicKey