diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..d1cf5011
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [binwiederhier]
diff --git a/Makefile b/Makefile
index 932e720d..5cf44613 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
MAKEFLAGS := --jobs=1
VERSION := $(shell git describe --tag)
+COMMIT := $(shell git rev-parse --short HEAD)
.PHONY:
@@ -169,7 +170,7 @@ cli-linux-server: cli-deps-static-sites
-o dist/ntfy_linux_server/ntfy \
-tags sqlite_omit_load_extension,osusergo,netgo \
-ldflags \
- "-linkmode=external -extldflags=-static -s -w -X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)"
+ "-linkmode=external -extldflags=-static -s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
cli-darwin-server: cli-deps-static-sites
# This is a target to build the CLI (including the server) manually.
@@ -179,7 +180,7 @@ cli-darwin-server: cli-deps-static-sites
-o dist/ntfy_darwin_server/ntfy \
-tags sqlite_omit_load_extension,osusergo,netgo \
-ldflags \
- "-linkmode=external -s -w -X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)"
+ "-linkmode=external -s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
cli-client: cli-deps-static-sites
# This is a target to build the CLI (excluding the server) manually. This should work on Linux/macOS/Windows.
@@ -189,7 +190,7 @@ cli-client: cli-deps-static-sites
-o dist/ntfy_client/ntfy \
-tags noserver \
-ldflags \
- "-X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)"
+ "-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
cli-deps: cli-deps-static-sites cli-deps-all cli-deps-gcc
diff --git a/README.md b/README.md
index dbcd0c61..ee043a42 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
+---
+
+## 👶 Baby break - My baby girl was born!
+Hey folks, my daughter was born on 8/30/22, so I'll be taking some time off from working on ntfy. I'll likely return
+to working on features and bugs in a few weeks. I hope you understand. I posted some pictures in [#387](https://github.com/binwiederhier/ntfy/issues/387) 🥰
+
+---
+
# ntfy.sh | Send push notifications to your phone or desktop via PUT/POST
[](https://github.com/binwiederhier/ntfy/releases/latest)
[](https://pkg.go.dev/heckel.io/ntfy)
@@ -53,12 +61,17 @@ Or, if you'd like to help translate 🇩🇪 🇺🇸 🇧🇬, you can start im
+## Donations
+I have just very recently started accepting donations via [GitHub Sponsors](https://github.com/sponsors/binwiederhier).
+I would be humbled if you helped me carry the server and developer account costs. Even small donations are very much
+appreciated.
+
## License
Made with ❤️ by [Philipp C. Heckel](https://heckel.io).
The project is dual licensed under the [Apache License 2.0](LICENSE) and the [GPLv2 License](LICENSE.GPLv2).
Third party libraries and resources:
-* [github.com/urfave/cli/v2](https://github.com/urfave/cli/v2) (MIT) is used to drive the CLI
+* [github.com/urfave/cli](https://github.com/urfave/cli) (MIT) is used to drive the CLI
* [Mixkit sounds](https://mixkit.co/free-sound-effects/notification/) (Mixkit Free License) are used as notification sounds
* [Sounds from notificationsounds.com](https://notificationsounds.com) (Creative Commons Attribution) are used as notification sounds
* [Roboto Font](https://fonts.google.com/specimen/Roboto) (Apache 2.0) is used as a font in everything web
diff --git a/client/client.yml b/client/client.yml
index 56733a14..3cd5736c 100644
--- a/client/client.yml
+++ b/client/client.yml
@@ -5,6 +5,12 @@
#
# default-host: https://ntfy.sh
+# Defaults below will be used when a topic does not have its own settings
+#
+# default-user:
+# default-password:
+# default-command:
+
# Subscriptions to topics and their actions. This option is primarily used by the systemd service,
# or if you cann "ntfy subscribe --from-config" directly.
#
diff --git a/client/config.go b/client/config.go
index 0866cd1b..2bbe9d51 100644
--- a/client/config.go
+++ b/client/config.go
@@ -12,8 +12,11 @@ const (
// Config is the config struct for a Client
type Config struct {
- DefaultHost string `yaml:"default-host"`
- Subscribe []struct {
+ DefaultHost string `yaml:"default-host"`
+ DefaultUser string `yaml:"default-user"`
+ DefaultPassword string `yaml:"default-password"`
+ DefaultCommand string `yaml:"default-command"`
+ Subscribe []struct {
Topic string `yaml:"topic"`
User string `yaml:"user"`
Password string `yaml:"password"`
@@ -25,8 +28,11 @@ type Config struct {
// NewConfig creates a new Config struct for a Client
func NewConfig() *Config {
return &Config{
- DefaultHost: DefaultBaseURL,
- Subscribe: nil,
+ DefaultHost: DefaultBaseURL,
+ DefaultUser: "",
+ DefaultPassword: "",
+ DefaultCommand: "",
+ Subscribe: nil,
}
}
diff --git a/client/config_test.go b/client/config_test.go
index d601cdb4..240d5ac7 100644
--- a/client/config_test.go
+++ b/client/config_test.go
@@ -12,6 +12,9 @@ func TestConfig_Load(t *testing.T) {
filename := filepath.Join(t.TempDir(), "client.yml")
require.Nil(t, os.WriteFile(filename, []byte(`
default-host: http://localhost
+default-user: phil
+default-password: mypass
+default-command: 'echo "Got the message: $message"'
subscribe:
- topic: no-command-with-auth
user: phil
@@ -22,12 +25,16 @@ subscribe:
command: notify-send -i /usr/share/ntfy/logo.png "Important" "$m"
if:
priority: high,urgent
+ - topic: defaults
`), 0600))
conf, err := client.LoadConfig(filename)
require.Nil(t, err)
require.Equal(t, "http://localhost", conf.DefaultHost)
- require.Equal(t, 3, len(conf.Subscribe))
+ require.Equal(t, "phil", conf.DefaultUser)
+ require.Equal(t, "mypass", conf.DefaultPassword)
+ require.Equal(t, `echo "Got the message: $message"`, conf.DefaultCommand)
+ require.Equal(t, 4, len(conf.Subscribe))
require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
require.Equal(t, "", conf.Subscribe[0].Command)
require.Equal(t, "phil", conf.Subscribe[0].User)
@@ -37,4 +44,5 @@ subscribe:
require.Equal(t, "alerts", conf.Subscribe[2].Topic)
require.Equal(t, `notify-send -i /usr/share/ntfy/logo.png "Important" "$m"`, conf.Subscribe[2].Command)
require.Equal(t, "high,urgent", conf.Subscribe[2].If["priority"])
+ require.Equal(t, "defaults", conf.Subscribe[3].Topic)
}
diff --git a/cmd/publish_linux.go b/cmd/publish_linux.go
deleted file mode 100644
index 2ff32cc6..00000000
--- a/cmd/publish_linux.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package cmd
-
-import "syscall"
-
-func processExists(pid int) bool {
- err := syscall.Kill(pid, syscall.Signal(0))
- return err == nil
-}
diff --git a/cmd/publish_darwin.go b/cmd/publish_unix.go
similarity index 50%
rename from cmd/publish_darwin.go
rename to cmd/publish_unix.go
index 2ff32cc6..3ce22ffc 100644
--- a/cmd/publish_darwin.go
+++ b/cmd/publish_unix.go
@@ -1,3 +1,6 @@
+//go:build darwin || linux || dragonfly || freebsd || netbsd || openbsd
+// +build darwin linux dragonfly freebsd netbsd openbsd
+
package cmd
import "syscall"
diff --git a/cmd/subscribe.go b/cmd/subscribe.go
index 94c11b4d..51d9de82 100644
--- a/cmd/subscribe.go
+++ b/cmd/subscribe.go
@@ -175,11 +175,28 @@ func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic,
for filter, value := range s.If {
topicOptions = append(topicOptions, client.WithFilter(filter, value))
}
- if s.User != "" && s.Password != "" {
- topicOptions = append(topicOptions, client.WithBasicAuth(s.User, s.Password))
+ var user, password string
+ if s.User != "" {
+ user = s.User
+ } else if conf.DefaultUser != "" {
+ user = conf.DefaultUser
+ }
+ if s.Password != "" {
+ password = s.Password
+ } else if conf.DefaultPassword != "" {
+ password = conf.DefaultPassword
+ }
+ if user != "" && password != "" {
+ topicOptions = append(topicOptions, client.WithBasicAuth(user, password))
}
subscriptionID := cl.Subscribe(s.Topic, topicOptions...)
- cmds[subscriptionID] = s.Command
+ if s.Command != "" {
+ cmds[subscriptionID] = s.Command
+ } else if conf.DefaultCommand != "" {
+ cmds[subscriptionID] = conf.DefaultCommand
+ } else {
+ cmds[subscriptionID] = ""
+ }
}
if topic != "" {
subscriptionID := cl.Subscribe(topic, options...)
diff --git a/cmd/subscribe_linux.go b/cmd/subscribe_unix.go
similarity index 78%
rename from cmd/subscribe_linux.go
rename to cmd/subscribe_unix.go
index 346606bd..6e5128dc 100644
--- a/cmd/subscribe_linux.go
+++ b/cmd/subscribe_unix.go
@@ -1,3 +1,6 @@
+//go:build linux || dragonfly || freebsd || netbsd || openbsd
+// +build linux dragonfly freebsd netbsd openbsd
+
package cmd
const (
diff --git a/docs/examples.md b/docs/examples.md
index cc52ebd5..3f58d943 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -449,6 +449,43 @@ You can now test the notifications and apply them to monitors:
+## UptimeRobot
+Go to your [UptimeRobot](https://github.com/uptimerobot) My Settings > Alert Contacts > Add Alert Contact
+Select **Alert Contact Type** = Webhook. Then set your desired **Friendly Name** (e.g. "ntfy-sh-UP"), **URL to Notify**, **POST value** and select checkbox **Send as JSON (application/json)**. Make sure to send the JSON POST request to ntfy.domain.com without the topic name in the url and include the "topic" name in the JSON body.
+
+
+
+
+
+