Reorder the packages configs for maintainability

2024-09-19 16:20:50 +00:00 · 2023-10-03 16:38:41 +02:00 · 2023-10-03 16:38:41 +02:00 · 2b2459b0e2
commit 2b2459b0e2
parent 70c3f31926
6 changed files with 68 additions and 55 deletions
--- a/packages/clickhouse-client.yaml
+++ b/packages/clickhouse-client.yaml
@ -1,6 +1,13 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-client"
+description: |
+  Client binary for ClickHouse
+    ClickHouse is a column-oriented database management system.
+    that allows generating analytical data reports in real time.
+    This package provides clickhouse-client, clickhouse-local and clickhouse-benchmark.
+
+# Common packages config
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
@ -9,19 +16,17 @@ homepage: "https://clickhouse.com"
 license: "Apache"
 section: "database"
 priority: "optional"
+maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+deb:
+  fields:
+    Source: clickhouse

+# Package specific content
 replaces:
 - clickhouse-compressor
 conflicts:
 - clickhouse-compressor

-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
-description: |
-  Client binary for ClickHouse
-    ClickHouse is a column-oriented database management system.
-    that allows generating analytical data reports in real time.
-    This package provides clickhouse-client, clickhouse-local and clickhouse-benchmark.
-
 overrides:
  deb:
    depends:
@ -30,10 +35,6 @@ overrides:
    depends:
    - clickhouse-common-static = ${CLICKHOUSE_VERSION_STRING}

-deb:
-  fields:
-    Source: clickhouse
-
 contents:
 - src: root/etc/clickhouse-client/config.xml
  dst: /etc/clickhouse-client/config.xml
--- a/packages/clickhouse-common-static-dbg.yaml
+++ b/packages/clickhouse-common-static-dbg.yaml
@ -1,6 +1,13 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-common-static-dbg"
+description: |
+  debugging symbols for clickhouse-common-static
+    This package contains the debugging symbols for clickhouse-common.
+
+
+#
+# Common packages config
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
@ -9,21 +16,17 @@ homepage: "https://clickhouse.com"
 license: "Apache"
 section: "database"
 priority: "optional"
+maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+deb:
+  fields:
+    Source: clickhouse

+# Package specific content
 replaces:
 - clickhouse-common-dbg
 conflicts:
 - clickhouse-common-dbg

-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
-description: |
-  debugging symbols for clickhouse-common-static
-    This package contains the debugging symbols for clickhouse-common.
-
-deb:
-  fields:
-    Source: clickhouse
-
 contents:
 - src: root/usr/lib/debug/usr/bin/clickhouse.debug
  dst: /usr/lib/debug/usr/bin/clickhouse.debug
--- a/packages/clickhouse-common-static.yaml
+++ b/packages/clickhouse-common-static.yaml
@ -1,6 +1,13 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-common-static"
+description: |
+  Common files for ClickHouse
+    ClickHouse is a column-oriented database management system
+    that allows generating analytical data reports in real time.
+    This package provides common files for both clickhouse server and client
+
+# Common packages config
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
@ -9,7 +16,12 @@ homepage: "https://clickhouse.com"
 license: "Apache"
 section: "database"
 priority: "optional"
+maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+deb:
+  fields:
+    Source: clickhouse

+# Package specific content
 replaces:
 - clickhouse-common
 - clickhouse-server-base
@ -19,17 +31,6 @@ provides:
 suggests:
 - clickhouse-common-static-dbg

-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
-description: |
-  Common files for ClickHouse
-    ClickHouse is a column-oriented database management system
-    that allows generating analytical data reports in real time.
-    This package provides common files for both clickhouse server and client
-
-deb:
-  fields:
-    Source: clickhouse
-
 contents:
 - src: root/usr/bin/clickhouse
  dst: /usr/bin/clickhouse
--- a/packages/clickhouse-keeper-dbg.yaml
+++ b/packages/clickhouse-keeper-dbg.yaml
@ -1,6 +1,13 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-keeper-dbg"
+description: |
+  debugging symbols for clickhouse-keeper
+    This package contains the debugging symbols for clickhouse-keeper.
+
+
+#
+# Common packages config
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
@ -10,14 +17,11 @@ license: "Apache"
 section: "database"
 priority: "optional"
 maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
-description: |
-  debugging symbols for clickhouse-keeper
-    This package contains the debugging symbols for clickhouse-keeper.
-
 deb:
  fields:
    Source: clickhouse

+# Package specific content
 contents:
 - src: root/usr/lib/debug/usr/bin/clickhouse-keeper.debug
  dst: /usr/lib/debug/usr/bin/clickhouse-keeper.debug
--- a/packages/clickhouse-keeper.yaml
+++ b/packages/clickhouse-keeper.yaml
@ -1,6 +1,13 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-keeper"
+description: |
+  Static clickhouse-keeper binary
+    A stand-alone clickhouse-keeper package
+
+
+#
+# Common packages config
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
@ -9,21 +16,17 @@ homepage: "https://clickhouse.com"
 license: "Apache"
 section: "database"
 priority: "optional"
+maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+deb:
+  fields:
+    Source: clickhouse

+# Package specific content
 conflicts:
 - clickhouse-server
 suggests:
 - clickhouse-keeper-dbg

-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
-description: |
-  Static clickhouse-keeper binary
-    A stand-alone clickhouse-keeper package
-
-deb:
-  fields:
-    Source: clickhouse
-
 contents:
 - src: root/etc/clickhouse-keeper/keeper_config.xml
  dst: /etc/clickhouse-keeper/keeper_config.xml
--- a/packages/clickhouse-server.yaml
+++ b/packages/clickhouse-server.yaml
@ -1,6 +1,13 @@
 # package sources should be placed in ${PWD}/root
 # nfpm should run from the same directory with a config
 name: "clickhouse-server"
+description: |
+  Server binary for ClickHouse
+    ClickHouse is a column-oriented database management system
+    that allows generating analytical data reports in real time.
+    This package provides clickhouse common configuration files
+
+# Common packages config
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
@ -9,7 +16,12 @@ homepage: "https://clickhouse.com"
 license: "Apache"
 section: "database"
 priority: "optional"
+maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+deb:
+  fields:
+    Source: clickhouse

+# Package specific content
 conflicts:
 - clickhouse-keeper
 replaces:
@ -20,13 +32,6 @@ provides:
 recommends:
 - libcap2-bin

-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
-description: |
-  Server binary for ClickHouse
-    ClickHouse is a column-oriented database management system
-    that allows generating analytical data reports in real time.
-    This package provides clickhouse common configuration files
-
 overrides:
  deb:
    depends:
@ -35,10 +40,6 @@ overrides:
    depends:
    - clickhouse-common-static = ${CLICKHOUSE_VERSION_STRING}

-deb:
-  fields:
-    Source: clickhouse
-
 contents:
 - src: root/etc/clickhouse-server/config.xml
  dst: /etc/clickhouse-server/config.xml