From 92c495af760354e7f1f1efd88428480d9ab20582 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 11 Apr 2021 22:07:23 +0300
Subject: [PATCH] Simplify debian packages

---
 debian/clickhouse-server.config    | 16 ----------------
 debian/clickhouse-server.postinst  |  8 ++++----
 debian/clickhouse-server.preinst   |  8 --------
 debian/clickhouse-server.prerm     |  6 ------
 debian/clickhouse-server.templates |  3 ---
 debian/clickhouse.limits           |  2 --
 debian/watch                       |  2 +-
 programs/install/Install.cpp       |  1 -
 8 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 debian/clickhouse-server.config
 delete mode 100644 debian/clickhouse-server.preinst
 delete mode 100644 debian/clickhouse-server.prerm
 delete mode 100644 debian/clickhouse-server.templates
 delete mode 100644 debian/clickhouse.limits

diff --git a/debian/clickhouse-server.config b/debian/clickhouse-server.config
deleted file mode 100644
index 636ff7f4da7..00000000000
--- a/debian/clickhouse-server.config
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-test -f /usr/share/debconf/confmodule && . /usr/share/debconf/confmodule
-
-db_fget clickhouse-server/default-password seen || true
-password_seen="$RET"
-
-if [ "$1" = "reconfigure" ]; then
-    password_seen=false
-fi
-
-if [ "$password_seen" != "true" ]; then
-    db_input high clickhouse-server/default-password || true
-    db_go || true
-fi
-db_go || true
diff --git a/debian/clickhouse-server.postinst b/debian/clickhouse-server.postinst
index dc876f45954..419c13e3daf 100644
--- a/debian/clickhouse-server.postinst
+++ b/debian/clickhouse-server.postinst
@@ -23,11 +23,13 @@ if [ ! -f "/etc/debian_version" ]; then
 fi
 
 if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
+
+    ${CLICKHOUSE_GENERIC_PROGRAM} install --user "${CLICKHOUSE_USER}" --group "${CLICKHOUSE_GROUP}" --pid-path "${CLICKHOUSE_PIDDIR}" --config-path "${CLICKHOUSE_CONFDIR}" --binary-path "${CLICKHOUSE_BINDIR}" --log-path "${CLICKHOUSE_LOGDIR}" --data-path "${CLICKHOUSE_DATADIR}"
+
     if [ -x "/bin/systemctl" ] && [ -f /etc/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then
         # if old rc.d service present - remove it
         if [ -x "/etc/init.d/clickhouse-server" ] && [ -x "/usr/sbin/update-rc.d" ]; then
             /usr/sbin/update-rc.d clickhouse-server remove
-            echo "ClickHouse init script has migrated to systemd. Please manually stop old server and restart the service: sudo killall clickhouse-server && sleep 5 && sudo service clickhouse-server restart"
         fi
 
         /bin/systemctl daemon-reload
@@ -38,10 +40,8 @@ if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
             if [ -x "/usr/sbin/update-rc.d" ]; then
                 /usr/sbin/update-rc.d clickhouse-server defaults 19 19 >/dev/null || exit $?
             else
-                echo # TODO [ "$OS" = "rhel" ] || [ "$OS" = "centos" ] || [ "$OS" = "fedora" ]
+                echo # Other OS
             fi
         fi
     fi
-
-    ${CLICKHOUSE_GENERIC_PROGRAM} install --user "${CLICKHOUSE_USER}" --group "${CLICKHOUSE_GROUP}" --pid-path "${CLICKHOUSE_PIDDIR}" --config-path "${CLICKHOUSE_CONFDIR}" --binary-path "${CLICKHOUSE_BINDIR}" --log-path "${CLICKHOUSE_LOGDIR}" --data-path "${CLICKHOUSE_DATADIR}"
 fi
diff --git a/debian/clickhouse-server.preinst b/debian/clickhouse-server.preinst
deleted file mode 100644
index 3529aefa7da..00000000000
--- a/debian/clickhouse-server.preinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "upgrade" ]; then
-    # Return etc/cron.d/clickhouse-server to original state
-    service clickhouse-server disable_cron ||:
-fi
-
-#DEBHELPER#
diff --git a/debian/clickhouse-server.prerm b/debian/clickhouse-server.prerm
deleted file mode 100644
index 02e855a7125..00000000000
--- a/debian/clickhouse-server.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "upgrade" ] || [ "$1" = "remove" ]; then
-    # Return etc/cron.d/clickhouse-server to original state
-    service clickhouse-server disable_cron ||:
-fi
diff --git a/debian/clickhouse-server.templates b/debian/clickhouse-server.templates
deleted file mode 100644
index dd55824e15c..00000000000
--- a/debian/clickhouse-server.templates
+++ /dev/null
@@ -1,3 +0,0 @@
-Template: clickhouse-server/default-password
-Type: password
-Description: Enter password for default user:
diff --git a/debian/clickhouse.limits b/debian/clickhouse.limits
deleted file mode 100644
index aca44082c4e..00000000000
--- a/debian/clickhouse.limits
+++ /dev/null
@@ -1,2 +0,0 @@
-clickhouse	soft	nofile	262144
-clickhouse	hard	nofile	262144
diff --git a/debian/watch b/debian/watch
index 7ad4cedf713..ed3cab97ade 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
 version=4
 
 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)-stable\.tar\.gz%clickhouse-$1.tar.gz%" \
-   https://github.com/yandex/clickhouse/tags \
+   https://github.com/ClickHouse/ClickHouse/tags \
    (?:.*?/)?v?(\d[\d.]*)-stable\.tar\.gz debian uupdate
 
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index ef72624e7ab..c40495d702a 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -641,7 +641,6 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                 " This is optional. Taskstats accounting will be disabled."
                 " To enable taskstats accounting you may add the required capability later manually.\"",
             "/tmp/test_setcap.sh", fs::canonical(main_bin_path).string());
-        fmt::print(" {}\n", command);
         executeScript(command);
 #endif