thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debian: Rename packages (#678)

Browse Source 
* Debian: rename packages

* wip

* wip

* wip

* move limits.d/clickhouse.conf to common

* wip

* fix

* bad clang

* update changelog

* more Provides: Conflicts:

* clickhouse-zookeeper-cli [#CLICKHOUSE-2947]

* fix utils desc

* Fix docs

* use cmake links

* fix doc

* Fix test install

* Test me

* Test me

* Test me.

* Dont use pre-depends

* fix

* Minimize control changes

* del

* debian/clickhouse-common.install -> debian/clickhouse-common-static.install

* debian/clickhouse-common.install -> debian/clickhouse-common-static.install
This commit is contained in:
proller 2018-04-01 05:33:39 -07:00 committed by alexey-milovidov
parent 412edac650
commit 802cac725f
21 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
copy_headers.sh
View File

@ -8,7 +8,7 @@
# Требуется clang, желательно наиболее свежий (trunk).
#
# Используется при сборке пакетов.
# Заголовочные файлы записываются в пакет clickhouse-server-base, в директорию /usr/share/clickhouse/headers.
# Заголовочные файлы записываются в пакет clickhouse-common, в директорию /usr/share/clickhouse/headers.
#
# Если вы хотите установить их самостоятельно, без сборки пакета,
# чтобы clickhouse-server видел их там, где ожидается, выполните:

12
debian/clickhouse-client.install vendored
View File

@ -1,6 +1,6 @@
/usr/bin/clickhouse-client
/usr/bin/clickhouse-local
/usr/bin/clickhouse-compressor
/usr/bin/clickhouse-benchmark
/etc/clickhouse-client/config.xml
/usr/bin/clickhouse-extract-from-config
usr/bin/clickhouse-client
usr/bin/clickhouse-local
usr/bin/clickhouse-compressor
usr/bin/clickhouse-benchmark
etc/clickhouse-client/config.xml
usr/bin/clickhouse-extract-from-config

3
debian/clickhouse-common-static.install vendored Normal file
View File

@ -0,0 +1,3 @@
usr/bin/clickhouse
etc/security/limits.d/clickhouse.conf
usr/share/clickhouse/*

11
debian/clickhouse-server-base.install vendored
View File

@ -1,11 +0,0 @@
/usr/bin/clickhouse
/usr/bin/clickhouse-server
/usr/bin/clickhouse-clang
/usr/bin/clickhouse-lld
/usr/bin/clickhouse-copier
/usr/bin/clickhouse-report
/etc/systemd/system/clickhouse-server.service
/etc/init.d/clickhouse-server
/etc/cron.d/clickhouse-server
/usr/share/clickhouse/*
/etc/security/limits.d/clickhouse.conf

2
debian/clickhouse-server-common.install vendored
View File

@ -1,2 +0,0 @@
etc/clickhouse-server/config.xml etc/clickhouse-server
etc/clickhouse-server/users.xml etc/clickhouse-server

1
debian/clickhouse-server-metrika.links vendored Normal file
View File

@ -0,0 +1 @@
usr/bin/clickhouse usr/bin/clickhouse-server

0
debian/clickhouse-server-base.docs → debian/clickhouse-server.docs vendored
View File

8
debian/clickhouse-server.install vendored Normal file
View File

@ -0,0 +1,8 @@
usr/bin/clickhouse-server
usr/bin/clickhouse-clang
usr/bin/clickhouse-lld
usr/bin/clickhouse-copier
usr/bin/clickhouse-report
etc/clickhouse-server/config.xml
etc/clickhouse-server/users.xml
etc/systemd/system/clickhouse-server.service

0
debian/clickhouse-server-base.postinst → debian/clickhouse-server.postinst vendored
View File

0
debian/clickhouse-server-base.preinst → debian/clickhouse-server.preinst vendored
View File

0
debian/clickhouse-server-base.prerm → debian/clickhouse-server.prerm vendored
View File

35
debian/control vendored
View File

@ -13,11 +13,11 @@ Build-Depends: debhelper (>= 9),
libreadline-dev,
libssl-dev,
unixodbc-dev
Standards-Version: 3.8.0
Standards-Version: 3.9.8
Package: clickhouse-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-server-base (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-common-static (= ${binary:Version})
Replaces: clickhouse-compressor
Conflicts: clickhouse-compressor
Description: Client binary for clickhouse
@ -26,28 +26,37 @@ Description: Client binary for clickhouse
.
This package provides clickhouse-client , clickhouse-local and clickhouse-benchmark
Package: clickhouse-server-base
Package: clickhouse-common-static
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, tzdata
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: clickhouse-server-base
Provides: clickhouse-server-base
Conflicts: clickhouse-server-base
Description: Common files for clickhouse
Yandex ClickHouse is a column-oriented database management system
that allows generating analytical data reports in real time.
.
This package provides common files for both clickhouse server and client
Package: clickhouse-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-common-static (= ${binary:Version}), adduser, tzdata
Replaces: clickhouse-server-common
Provides: clickhouse-server-common
Conflicts: clickhouse-server-common
Description: Server binary for clickhouse
Yandex ClickHouse is a column-oriented database management system
that allows generating analytical data reports in real time.
.
This package provides clickhouse common configuration files
Package: clickhouse-server-common
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-server-base (= ${binary:Version})
Description: clickhouse-server-common
Common configuration files for clickhouse-server-base package
Package: clickhouse-common-dbg
Architecture: any
Section: debug
Priority: extra
Depends: ${misc:Depends}, clickhouse-server-base (= ${binary:Version})
Description: debugging symbols for clickhouse-server-base
This package contains the debugging symbols for clickhouse-server-base.
Depends: ${misc:Depends}, clickhouse-common-static (= ${binary:Version})
Description: debugging symbols for clickhouse-common-static
This package contains the debugging symbols for clickhouse-common.
Package: clickhouse-test
Priority: extra

14
debian/rules vendored
View File

@ -66,32 +66,26 @@ override_dh_auto_test:
override_dh_clean:
rm -rf $(BUILDDIR)
rm -rf $(DESTDIR)
rm -rf debian/copyright debian/clickhouse-server-common.docs debian/clickhouse-client.docs
rm -rf debian/copyright debian/clickhouse-client.docs debian/clickhouse-common-static.docs
dh_clean
override_dh_strip:
dh_strip -pclickhouse-server-base --dbg-package=clickhouse-common-dbg
dh_strip -pclickhouse-common-static --dbg-package=clickhouse-common-dbg
override_dh_install:
# Making docs
cp LICENSE debian/copyright
ln -sf clickhouse-server-base.docs debian/clickhouse-client.docs
ln -sf clickhouse-server-base.docs debian/clickhouse-server-common.docs
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
# todo: remove after renaming package:
mkdir -p $(DESTDIR)/etc/init.d
cp debian/clickhouse-server.init $(DESTDIR)/etc/init.d/clickhouse-server
# systemd compatibility
mkdir -p $(DESTDIR)/etc/systemd/system/
cp debian/clickhouse-server.service $(DESTDIR)/etc/systemd/system/
mkdir -p $(DESTDIR)/etc/cron.d
cp debian/clickhouse-server.cron.d $(DESTDIR)/etc/cron.d/clickhouse-server
# In case building clickhouse-server, adding to package binary of clang, ld and header files - for dynamic compilation.
mkdir -p $(DESTDIR)/usr/share/clickhouse/headers

4
debian/source/options vendored
View File

@ -1,6 +1,6 @@
tar-ignore
tar-ignore="build"
tar-ignore="build_*"
tar-ignore="build/*"
tar-ignore="build_*/*"
tar-ignore="contrib/poco/openssl/*"
tar-ignore="contrib/poco/gradle/*"
tar-ignore="contrib/poco/Data/SQLite/*"

2
docker/server/Dockerfile
View File

@ -8,7 +8,7 @@ RUN apt-get update && \
mkdir -p /etc/apt/sources.list.d && \
echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \
apt-get update && \
apt-get install --allow-unauthenticated -y clickhouse-server-common=$version clickhouse-server-base=$version && \
apt-get install --allow-unauthenticated -y clickhouse-server=$version && \
rm -rf /var/lib/apt/lists/* /var/cache/debconf && \
apt-get clean

2
docs/en/getting_started/index.md
View File

@ -31,7 +31,7 @@ Then run:
```bash
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional
sudo apt-get update
sudo apt-get install clickhouse-client clickhouse-server-common
sudo apt-get install clickhouse-client clickhouse-server
```
You can also download and install packages manually from here:

2
docs/ru/getting_started/index.md
View File

@ -31,7 +31,7 @@ deb http://repo.yandex.ru/clickhouse/deb/stable/ main/
```bash
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional
sudo apt-get update
sudo apt-get install clickhouse-client clickhouse-server-common
sudo apt-get install clickhouse-client clickhouse-server
```
Также можно скачать и установить пакеты вручную, отсюда: <https://repo.yandex.ru/clickhouse/deb/stable/main/>.

4
website/deprecated/reference_en.html
View File

@ -439,7 +439,7 @@ Then run:
%%
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional
sudo apt-get update
sudo apt-get install clickhouse-client clickhouse-server-common
sudo apt-get install -y clickhouse-client clickhouse-server
%%
You can also download and install packages manually from here:
@ -709,7 +709,7 @@ echo &#39;DROP TABLE t&#39; | POST &#39;http://localhost:8123/&#39;
For successful requests that don&#39;t return a data table, an empty response body is returned.
You can use compression when transmitting data. The compressed data has a non-standard format, and you will need to use a special compressor program to work with it (%%sudo apt-get install clickhouse-compressor%%).
You can use compression when transmitting data. The compressed data has a non-standard format, and you will need to use a special clickhouse-compressor program to work with it (%%sudo apt-get install clickhouse-utils%%).
If you specified &#39;compress=1&#39; in the URL, the server will compress the data it sends you.
If you specified &#39;decompress=1&#39; in the URL, the server will decompress the same data that you pass in the POST method.

4
website/deprecated/reference_ru.html
View File

@ -449,7 +449,7 @@ deb http://repo.yandex.ru/clickhouse/trusty stable main
%%
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional
sudo apt-get update
sudo apt-get install clickhouse-client clickhouse-server-common
sudo apt-get install -y clickhouse-client clickhouse-server
%%
Также можно скачать и установить пакеты вручную, отсюда:
@ -725,7 +725,7 @@ echo 'DROP TABLE t' | POST 'http://localhost:8123/'
Для запросов, которые не возвращают таблицу с данными, в случае успеха, выдаётся пустое тело ответа.
Вы можете использовать сжатие при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу compressor (%%sudo apt-get install clickhouse-compressor%%).
Вы можете использовать сжатие при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу clickhouse-compressor (%%sudo apt-get install clickhouse-utils%%).
Если вы указали в URL compress=1, то сервер будет сжимать отправляемые вам данные.
Если вы указали в URL decompress=1, то сервер будет разжимать те данные, которые вы передаёте ему POST-ом.

2
website/index.html
View File

@ -393,7 +393,7 @@ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional
sudo apt-add-repository "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
sudo apt-get update
sudo apt-get install clickhouse-server-common clickhouse-client -y
sudo apt-get install -y clickhouse-server clickhouse-client
sudo service clickhouse-server start
clickhouse-client

2
website/tutorial.html
View File

@ -51,7 +51,7 @@
<p><b>clickhouse-client</b> package contains <a
href="docs/en/interfaces/cli/">clickhouse-client</a> application —
interactive ClickHouse client. <b>clickhouse-server-base</b> contains a clickhouse-server binary file. <b>clickhouse-server-common</b>
interactive ClickHouse client. <b>clickhouse-common</b> contains a clickhouse-server binary file. <b>clickhouse-server</b>
— contains config files for the clickhouse-server.</p>
<p>Server config files are located in /etc/clickhouse-server/. Before getting to work please notice the <b>path</b>