From 02b0d8786f7c169af58c6c48c1f0a78e9ae33ac4 Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Tue, 10 Oct 2023 16:15:42 +0200
Subject: [PATCH] build: mark apm-server.yml as config|noreplace in nfpm config
 (#11808)

* build: mark apm-server.yml as config|noreplace in nfpm config

* changelog: add changelog entry
---
 changelogs/head.asciidoc | 1 +
 packaging/nfpm.yml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index 9c9b02f511..f282c74e3d 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -9,6 +9,7 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits]
 [float]
 ==== Bug fixes
 - Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729].
+- RPM package upgrade no longer overwrites the apm-server.yml config {pull}11808[11808]
 
 [float]
 ==== Deprecations
diff --git a/packaging/nfpm.yml b/packaging/nfpm.yml
index 112808b9bf..f0ce05e0e4 100644
--- a/packaging/nfpm.yml
+++ b/packaging/nfpm.yml
@@ -23,6 +23,7 @@ contents:
 
   - src: apm-server.yml
     dst: /etc/apm-server/apm-server.yml
+    type: config|noreplace
     file_info:
       mode: 0600
       owner: apm-server