From aa15227f0add6cae5eecbc526e45deb38ccc3a17 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 8 Mar 2021 09:33:30 +0100
Subject: [PATCH] Mark configuration files in debian package (#1574)

Mark server-config.xml, logging.xml and defaults explicit as
configuration files.
Due too a bug in gradle-ospackage-plugin it is not enough to mark them via fileType.

https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/118
---
 gradle/changelog/debian_conffiles.yaml | 2 ++
 scm-packaging/deb/build.gradle         | 7 ++++++-
 scm-packaging/rpm/build.gradle         | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 gradle/changelog/debian_conffiles.yaml

diff --git a/gradle/changelog/debian_conffiles.yaml b/gradle/changelog/debian_conffiles.yaml
new file mode 100644
index 0000000000..38594011fe
--- /dev/null
+++ b/gradle/changelog/debian_conffiles.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Mark configuration files in debian package ([#1574](https://github.com/scm-manager/scm-manager/issues/1574))
diff --git a/scm-packaging/deb/build.gradle b/scm-packaging/deb/build.gradle
index 12913d6a62..3c0dc035d2 100644
--- a/scm-packaging/deb/build.gradle
+++ b/scm-packaging/deb/build.gradle
@@ -24,7 +24,7 @@
 import org.gradle.util.VersionNumber
 
 plugins {
-  id 'nebula.ospackage' version '8.4.1'
+  id 'nebula.ospackage' version '8.5.6'
   id 'org.scm-manager.packaging'
   id 'com.github.hierynomus.license-base' version '0.15.0'
 }
@@ -94,6 +94,8 @@ task deb(type: Deb) {
     permissionGroup 'scm'
     fileMode 0640
   }
+  // https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/118
+  configurationFile('/etc/default/scm-server')
 
   from('src/main/fs/etc/scm') {
     fileType CONFIG | NOREPLACE
@@ -103,6 +105,9 @@ task deb(type: Deb) {
     fileMode 0640
     expand([version: version])
   }
+  // https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/118
+  configurationFile('/etc/scm/server-config.xml')
+  configurationFile('/etc/scm/logging.xml')
 
   from('src/main/fs/etc/systemd') {
     into '/etc/systemd'
diff --git a/scm-packaging/rpm/build.gradle b/scm-packaging/rpm/build.gradle
index 65b86f8981..679fff9e64 100644
--- a/scm-packaging/rpm/build.gradle
+++ b/scm-packaging/rpm/build.gradle
@@ -46,7 +46,7 @@ buildscript {
 }
 
 plugins {
-  id 'nebula.ospackage' version '8.4.1'
+  id 'nebula.ospackage' version '8.5.6'
   id 'org.scm-manager.packaging'
   id 'com.github.hierynomus.license-base' version '0.15.0'
 }