From 53e08988e7821996686bcc12e3d7b70f2745a05a Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Mon, 14 Mar 2022 17:21:28 -0400
Subject: [PATCH] rpm: Do not replace server.yml, closes #166
---
.goreleaser.yml | 4 ++--
docs/releases.md | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 12910f7..227bc45 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -59,12 +59,12 @@ nfpms:
contents:
- src: server/server.yml
dst: /etc/ntfy/server.yml
- type: config
+ type: "config|noreplace"
- src: server/ntfy.service
dst: /lib/systemd/system/ntfy.service
- src: client/client.yml
dst: /etc/ntfy/client.yml
- type: config
+ type: "config|noreplace"
- src: client/ntfy-client.service
dst: /lib/systemd/system/ntfy-client.service
- dst: /var/cache/ntfy
diff --git a/docs/releases.md b/docs/releases.md
index 6ce95f3..2de9302 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -2,12 +2,24 @@
Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
+## ntfy server v1.18.0
+Released XXXXXXXXXXXXXXX
+
+**Bug fixes:**
+
+* rpm: do not overwrite server.yaml on package upgrade (#166, thanks @waclaw66 for reporting)
+
+**Deprecations:**
+
+* Removed the ability to run server as `ntfy serve` as per [deprecation](https://ntfy.sh/docs/deprecations)
+
## ntfy Android app v1.10.0
Released XXXXXXXXXXXXXXX
**Features:**
* Support for UnifiedPush 2.0 specification (bytes messages, #130)
+* Export/import settings and subscriptions (#115, thanks @cmeis for reporting)
**Bug fixes:**
--
GitLab