Merge pull request #22976 from ClickHouse/fix-debian

Simplify debian packages.

debian/clickhouse-common-static.install

@@ -3,4 +3,3 @@ usr/bin/clickhouse-odbc-bridge
 usr/bin/clickhouse-library-bridge
 usr/bin/clickhouse-extract-from-config
 usr/share/bash-completion/completions
-etc/security/limits.d/clickhouse.conf

debian/clickhouse-server.config

@@ -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

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

debian/clickhouse-server.preinst

@@ -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#

debian/clickhouse-server.prerm

@@ -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

debian/clickhouse-server.templates

@@ -1,3 +0,0 @@
-Template: clickhouse-server/default-password
-Type: password
-Description: Enter password for default user:

debian/clickhouse.limits

@@ -1,2 +0,0 @@
-clickhouse	soft	nofile	262144
-clickhouse	hard	nofile	262144

debian/rules

@@ -113,9 +113,6 @@ override_dh_install:
 	ln -sf clickhouse-server.docs debian/clickhouse-client.docs
 	ln -sf clickhouse-server.docs debian/clickhouse-common-static.docs
 
-	mkdir -p $(DESTDIR)/etc/security/limits.d
-	cp debian/clickhouse.limits $(DESTDIR)/etc/security/limits.d/clickhouse.conf
-
 	# systemd compatibility
 	mkdir -p $(DESTDIR)/etc/systemd/system/
 	cp debian/clickhouse-server.service $(DESTDIR)/etc/systemd/system/

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
 

programs/install/Install.cpp

@@ -562,20 +562,32 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
         bool stdin_is_a_tty = isatty(STDIN_FILENO);
         bool stdout_is_a_tty = isatty(STDOUT_FILENO);
-        bool is_interactive = stdin_is_a_tty && stdout_is_a_tty;
+
+        /// dpkg or apt installers can ask for non-interactive work explicitly.
+
+        const char * debian_frontend_var = getenv("DEBIAN_FRONTEND");
+        bool noninteractive = debian_frontend_var && debian_frontend_var == std::string_view("noninteractive");
+
+        bool is_interactive = !noninteractive && stdin_is_a_tty && stdout_is_a_tty;
+
+        /// We can ask password even if stdin is closed/redirected but /dev/tty is available.
+        bool can_ask_password = !noninteractive && stdout_is_a_tty;
 
         if (has_password_for_default_user)
         {
-            fmt::print(HILITE "Password for default user is already specified. To remind or reset, see {} and {}." END_HILITE,
+            fmt::print(HILITE "Password for default user is already specified. To remind or reset, see {} and {}." END_HILITE "\n",
                        users_config_file.string(), users_d.string());
         }
-        else if (!is_interactive)
+        else if (!can_ask_password)
         {
-            fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE,
+            fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
                        users_config_file.string(), users_d.string());
         }
         else
         {
+            /// NOTE: When installing debian package with dpkg -i, stdin is not a terminal but we are still being able to enter password.
+            /// More sophisticated method with /dev/tty is used inside the `readpassphrase` function.
+
             char buf[1000] = {};
             std::string password;
             if (auto * result = readpassphrase("Enter password for default user: ", buf, sizeof(buf), 0))
@@ -603,7 +615,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</yandex>\n";
                 out.sync();
                 out.finalize();
-                fmt::print("Password for default user is saved in file {}.\n", password_file);
+                fmt::print(HILITE "Password for default user is saved in file {}." END_HILITE "\n", password_file);
 #else
                 out << "<yandex>\n"
                     "    <users>\n"
@@ -614,12 +626,12 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</yandex>\n";
                 out.sync();
                 out.finalize();
-                fmt::print("Password for default user is saved in plaintext in file {}.\n", password_file);
+                fmt::print(HILITE "Password for default user is saved in plaintext in file {}." END_HILITE "\n", password_file);
 #endif
                 has_password_for_default_user = true;
             }
             else
-                fmt::print("Password for default user is empty string. See {} and {} to change it.\n",
+                fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
                            users_config_file.string(), users_d.string());
         }
 
@@ -644,7 +656,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