Skip to content

Commit

Permalink
tools: remove tarantoolctl utility
Browse files Browse the repository at this point in the history
tarantoolctl has been removed. Systemd, sysvinit and logrotate scripts
based on it were also removed. All this functionality is covered by the
tt utility.

Closes tarantool#9443
  • Loading branch information
0x501D committed Dec 20, 2023
1 parent dd6f094 commit 14346f4
Show file tree
Hide file tree
Showing 31 changed files with 6 additions and 3,175 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/static_build_pack_test_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,10 @@ jobs:
- name: Run tests
run: |
# Tarantool packages don't provide `tarantoolctl` since series 3.
./test-run.py \
--force \
--builddir ../build \
--executable /usr/bin/tarantool \
--exclude app-tap/tarantoolctl.test.lua
--executable /usr/bin/tarantool
working-directory: test

- name: Send VK Teams message on failure
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ extra/txt2c
extra/bin2c
extra/lemon
extra/mkkeywordhash
extra/dist/tarantoolctl
extra/dist/tarantoolctl.1
extra/dist/tarantool.logrotate
extra/dist/tarantool@.service
extra/dist/tarantool.tmpfiles.conf
Expand Down
5 changes: 0 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
path = third_party/zstd
url = https://github.com/tarantool/zstd.git
ignore = dirty
[submodule "third_party/luarocks"]
path = third_party/luarocks
url = https://github.com/tarantool/luarocks.git
branch = luarocks-3.9.2-tarantool
ignore = dirty
[submodule "third_party/decNumber"]
path = third_party/decNumber
url = https://github.com/tarantool/decNumber.git
Expand Down
1 change: 0 additions & 1 deletion .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ ignore = {

include_files = {
"**/*.lua",
"extra/dist/tarantoolctl.in",
}

exclude_files = {
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@ find_package_message(MODULE_LIBPATH "Lua package.cpath: ${MODULE_LIBPATH}"
set(BACKUP_STORAGE https://distrib.hb.vkcs.cloud)

set(EMBED_LUAZLIB ${BUILD_STATIC})
set(EMBED_LUAROCKS ${BUILD_STATIC})

#
# Since we *optionally* build bundled libs, a direct build
Expand Down
5 changes: 5 additions & 0 deletions changelogs/unreleased/gh-9443-remove-tarantoolctl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## feature/tools

* `tarantoolctl` has been removed. Systemd, sysvinit and logrotate scripts based
on it were also removed. All this functionality is covered by the `tt` utility
(gh-9443).
8 changes: 0 additions & 8 deletions debian/tarantool-common.install.systemd.in
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
/etc/default/tarantool
/usr/bin/tarantoolctl
/etc/tarantool/instances.available/example.lua
/etc/logrotate.d/tarantool
/lib/systemd/system/tarantool.service
/lib/systemd/system/tarantool@.service
/lib/systemd/system-generators/tarantool-generator
/usr/lib/tmpfiles.d/tarantool.conf
/usr/share/man/man1/tarantoolctl.1
4 changes: 0 additions & 4 deletions debian/tarantool-common.install.sysvinit.in
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
/etc/default/tarantool
/usr/bin/tarantoolctl
/etc/tarantool/instances.available/example.lua
/etc/logrotate.d/tarantool
/usr/share/man/man1/tarantoolctl.1
1 change: 0 additions & 1 deletion debian/tarantool-common.lintian-overrides

This file was deleted.

3 changes: 0 additions & 3 deletions extra/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
add_subdirectory(dist)
add_subdirectory(luarocks)

if (TARGET_OS_DARWIN)
# NOTE: need add execution 'plutil -lint org.tarantool.tarantool.plist
# to check syntax of plist file.
Expand Down
174 changes: 0 additions & 174 deletions extra/dist/CMakeLists.txt

This file was deleted.

29 changes: 0 additions & 29 deletions extra/dist/default/tarantool.in

This file was deleted.

0 comments on commit 14346f4

Please sign in to comment.