From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D869C469710 for ; Tue, 9 Jun 2020 14:40:49 +0300 (MSK) From: Olga Arkhangelskaia Date: Tue, 9 Jun 2020 14:40:36 +0300 Message-Id: <20200609114036.89486-1-arkholga@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2] build: don't start example instance in postinstall List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: alexander.turenko@tarantool.org After tarantool installation on Debian/Ubuntu from repo, example instance was automatically started on 3301 port. At the same time example instance on RHEL/CentOS is started manually. Patch does the same for Debian/Ubuntu. If tarantool is installed not for the first time, do "apt-get purge tarantool-common" before installation to get rid of link in /etc/tarantool/instances.enabled. Closes #4507 --- Brabch: gh-4507-disable-start-example-instance-full-ci @ChangeLog: - disabled start of example instance after installing from Debian/Ubuntu repo. If there is no installed version of tarantool-common, one should do "apt-get install tarantool-common". If tarantool-common was installed before, and even removed, installation or upgrade won't take effect, because the link to example instance still present in /etc/tarantool/instances.enabled. Do following steps to get rid from example instance starting every time: "apt-get purge tarantool-common" "apt-get install tarantool-common" debian/tarantool-common.postinst | 8 -------- extra/dist/tarantool-generator.in | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/debian/tarantool-common.postinst b/debian/tarantool-common.postinst index e2eda3415..03e4b2215 100644 --- a/debian/tarantool-common.postinst +++ b/debian/tarantool-common.postinst @@ -22,14 +22,6 @@ case "$1" in install -d -o$SYSUSER -gadm -m2750 /var/log/tarantool install -d -o$SYSUSER -g$SYSUSER -m750 /var/run/tarantool install -d -o$SYSUSER -g$SYSUSER -m750 /var/lib/tarantool - - # Enable example.lua by default - if [ -z $2 ] && [ ! -e /etc/tarantool/instances.enabled/example.lua ] && - [ -d /etc/tarantool/instances.enabled ] && - [ -d /etc/tarantool/instances.available/ ]; then - ln -s /etc/tarantool/instances.available/example.lua \ - /etc/tarantool/instances.enabled/example.lua - fi ;; esac diff --git a/extra/dist/tarantool-generator.in b/extra/dist/tarantool-generator.in index f6a6a2540..2048b7517 100755 --- a/extra/dist/tarantool-generator.in +++ b/extra/dist/tarantool-generator.in @@ -13,6 +13,7 @@ mkdir -p "$wantdir" for file in @TARANTOOL_ENABLEDDIR@/*.lua; do instance=`basename $file .lua` + [ "${instance}" = "*" ] && break # skip empty directory ln -s "$service" "$wantdir/tarantool@$instance.service" done -- 2.20.1 (Apple Git-117)