Skip to content

Commit 080beba

Browse files
Olga ArkhangelskaiaTotktonada
Olga Arkhangelskaia
authored andcommitted
build: don't start example instance in postinstall
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. Closes tarantool#4507 Reviewed-by: Igor Munkin <[email protected]> Reviewed-by: Alexander Turenko <[email protected]>
1 parent 67ac8df commit 080beba

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

debian/tarantool-common.postinst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ case "$1" in
2222
install -d -o$SYSUSER -gadm -m2750 /var/log/tarantool
2323
install -d -o$SYSUSER -g$SYSUSER -m750 /var/run/tarantool
2424
install -d -o$SYSUSER -g$SYSUSER -m750 /var/lib/tarantool
25-
26-
# Enable example.lua by default
27-
if [ -z $2 ] && [ ! -e /etc/tarantool/instances.enabled/example.lua ] &&
28-
[ -d /etc/tarantool/instances.enabled ] &&
29-
[ -d /etc/tarantool/instances.available/ ]; then
30-
ln -s /etc/tarantool/instances.available/example.lua \
31-
/etc/tarantool/instances.enabled/example.lua
32-
fi
3325
;;
3426
esac
3527

extra/dist/tarantool-generator.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ mkdir -p "$wantdir"
1313

1414
for file in @TARANTOOL_ENABLEDDIR@/*.lua; do
1515
instance=`basename $file .lua`
16+
[ "${instance}" = "*" ] && break # skip empty directory
1617
ln -s "$service" "$wantdir/tarantool@$instance.service"
1718
done
1819

0 commit comments

Comments
 (0)