Tarantool development patches archive
 help / color / mirror / Atom feed
* [Tarantool-patches] [PATCH v2] build: don't start example instance in postinstall
@ 2020-06-09 11:40 Olga Arkhangelskaia
  2020-06-10 12:39 ` Alexander Turenko
  2020-06-10 12:39 ` Igor Munkin
  0 siblings, 2 replies; 4+ messages in thread
From: Olga Arkhangelskaia @ 2020-06-09 11:40 UTC (permalink / raw)
  To: tarantool-patches; +Cc: alexander.turenko

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)

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-11-09  4:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-09 11:40 [Tarantool-patches] [PATCH v2] build: don't start example instance in postinstall Olga Arkhangelskaia
2020-06-10 12:39 ` Alexander Turenko
2020-11-09  4:20   ` Alexander Turenko
2020-06-10 12:39 ` Igor Munkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox