Move to frostfs-node

Signed-off-by: Pavel Karpy <p.karpy@yadro.com>
This commit is contained in:
Pavel Karpy 2022-12-23 20:35:35 +03:00 committed by Stanislav Bogatyrev
parent 42554a9298
commit 923f84722a
934 changed files with 3470 additions and 3451 deletions

11
debian/changelog vendored
View file

@ -1,10 +1,17 @@
neofs-node (0.33.0~72~g6955fe82) jammy; urgency=medium
frostfs-node (0.34.0~97-dirty~g42554a92-jammy) jammy; urgency=medium
* Please see CHANGELOG.md for code changes for v0.34.0-97-g42554a92-
dirty
-- NeoSPCC <tech@nspcc.ru> Fri, 23 Dec 2022 20:07:36 +0300
frostfs-node (0.33.0~72~g6955fe82) jammy; urgency=medium
* Please see CHANGELOG.md for code changes for v0.33.0-72-g6955fe82
-- NeoSPCC <tech@nspcc.ru> Wed, 26 Oct 2022 12:19:45 +0300
neofs-node (0.33.0) stable; urgency=medium
frostfs-node (0.33.0) stable; urgency=medium
* Initial change

14
debian/control vendored
View file

@ -1,14 +1,14 @@
Source: neofs-node
Source: frostfs-node
Section: misc
Priority: optional
Maintainer: NeoSPCC <tech@nspcc.ru>
Build-Depends: debhelper-compat (= 13), dh-sequence-bash-completion, devscripts
Standards-Version: 4.5.1
Homepage: https://fs.neo.org/
Vcs-Git: https://github.com/nspcc-dev/neofs-node.git
Vcs-Browser: https://github.com/nspcc-dev/neofs-node
Vcs-Git: https://github.com/TrueCloudLab/frostfs-node.git
Vcs-Browser: https://github.com/TrueCloudLab/frostfs-node
Package: neofs-storage
Package: frostfs-storage
Architecture: any
Depends: ${misc:Depends}
Description: NeoFS Storage node
@ -18,9 +18,9 @@ Description: NeoFS Storage node
network and get paid for providing storage resources to other users or store
their data in NeoFS and pay a competitive price for it.
Package: neofs-ir
Package: frostfs-ir
Architecture: any
Depends: ${misc:Depends}, neofs-locode-db
Depends: ${misc:Depends}, frostfs-locode-db
Description: NeoFS InnerRing node
NeoFS is a decentralized distributed object storage integrated with the NEO
Blockchain. NeoFS Nodes are organized in a peer-to-peer network that takes care
@ -28,7 +28,7 @@ Description: NeoFS InnerRing node
network and get paid for providing storage resources to other users or store
their data in NeoFS and pay a competitive price for it.
Package: neofs-cli
Package: frostfs-cli
Architecture: any
Depends: ${misc:Depends}
Description: CLI tools for NeoFS

8
debian/copyright vendored
View file

@ -1,11 +1,11 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: neofs-node
Upstream-Name: frostfs-node
Upstream-Contact: tech@nspcc.ru
Source: https://github.com/nspcc-dev/neofs-node
Source: https://github.com/TrueCloudLab/frostfs-node
Files: *
Copyright: 2018-2022 NeoSPCC (@nspcc-dev), contributors of neofs-node project
(https://github.com/nspcc-dev/neofs-node/blob/master/CREDITS.md)
Copyright: 2018-2022 NeoSPCC (@nspcc-dev), contributors of frostfs-node project
(https://github.com/TrueCloudLab/frostfs-node/blob/master/CREDITS.md)
License: GPL-3
This program is free software: you can redistribute it and/or modify it

View file

@ -1,4 +1,4 @@
CONTRIBUTING.md
CREDITS.md
README.md
cmd/neofs-adm/docs
cmd/frostfs-adm/docs

3
debian/frostfs-cli.install vendored Normal file
View file

@ -0,0 +1,3 @@
bin/frostfs-adm usr/bin
bin/frostfs-cli usr/bin
bin/frostfs-lens usr/bin

2
debian/frostfs-ir.dirs vendored Normal file
View file

@ -0,0 +1,2 @@
/etc/frostfs/ir
/var/lib/frostfs/ir

1
debian/frostfs-ir.install vendored Normal file
View file

@ -0,0 +1 @@
bin/frostfs-ir usr/bin

View file

@ -19,18 +19,18 @@ set -e
case "$1" in
configure)
USERNAME=ir
id -u neofs-ir >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/neofs/ir --system -M -U -c "NeoFS InnerRing node" neofs-ir
if ! dpkg-statoverride --list /etc/neofs/$USERNAME >/dev/null; then
chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME
chmod -f 0750 /etc/neofs/$USERNAME
chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/config.yml
chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/control.yml
chmod -f 0640 /etc/neofs/$USERNAME/config.yml || true
chmod -f 0640 /etc/neofs/$USERNAME/control.yml || true
id -u frostfs-ir >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/frostfs/ir --system -M -U -c "NeoFS InnerRing node" frostfs-ir
if ! dpkg-statoverride --list /etc/frostfs/$USERNAME >/dev/null; then
chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME
chmod -f 0750 /etc/frostfs/$USERNAME
chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/config.yml
chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/control.yml
chmod -f 0640 /etc/frostfs/$USERNAME/config.yml || true
chmod -f 0640 /etc/frostfs/$USERNAME/control.yml || true
fi
USERDIR=$(getent passwd "neofs-$USERNAME" | cut -d: -f6)
if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then
chown -f neofs-$USERNAME: $USERDIR
USERDIR=$(getent passwd "frostfs-$USERNAME" | cut -d: -f6)
if ! dpkg-statoverride --list frostfs-$USERDIR >/dev/null; then
chown -f frostfs-$USERNAME: $USERDIR
fi
;;

View file

@ -20,7 +20,7 @@ set -e
case "$1" in
purge)
rm -rf /var/lib/neofs/ir/*
rm -rf /var/lib/frostfs/ir/*
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

View file

@ -4,10 +4,10 @@ Requires=network.target
[Service]
Type=simple
ExecStart=/usr/bin/neofs-ir --config /etc/neofs/ir/config.yml
User=neofs-ir
Group=neofs-ir
WorkingDirectory=/var/lib/neofs/ir
ExecStart=/usr/bin/frostfs-ir --config /etc/frostfs/ir/config.yml
User=frostfs-ir
Group=frostfs-ir
WorkingDirectory=/var/lib/frostfs/ir
Restart=always
RestartSec=5
PrivateTmp=true

3
debian/frostfs-storage.dirs vendored Normal file
View file

@ -0,0 +1,3 @@
/etc/frostfs/storage
/srv/frostfs
/var/lib/frostfs/storage

1
debian/frostfs-storage.install vendored Normal file
View file

@ -0,0 +1 @@
bin/frostfs-node usr/bin

55
debian/frostfs-storage.postinst vendored Normal file
View file

@ -0,0 +1,55 @@
#!/bin/sh
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
configure)
USERNAME=storage
id -u frostfs-$USERNAME >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/frostfs/$USERNAME --system -M -U -c "NeoFS Storage node" frostfs-$USERNAME
if ! dpkg-statoverride --list /etc/frostfs/$USERNAME >/dev/null; then
chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME
chmod -f 0750 /etc/frostfs/$USERNAME
chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/config.yml
chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/control.yml
chmod -f 0640 /etc/frostfs/$USERNAME/config.yml || true
chmod -f 0640 /etc/frostfs/$USERNAME/control.yml || true
fi
USERDIR=$(getent passwd "frostfs-$USERNAME" | cut -d: -f6)
if ! dpkg-statoverride --list frostfs-$USERDIR >/dev/null; then
chown -f frostfs-$USERNAME: $USERDIR
fi
USERDIR=/srv/frostfs
if ! dpkg-statoverride --list frostfs-$USERDIR >/dev/null; then
chown -f frostfs-$USERNAME: $USERDIR
fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

View file

@ -20,7 +20,7 @@ set -e
case "$1" in
purge)
rm -rf /var/lib/neofs/storage/*
rm -rf /var/lib/frostfs/storage/*
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

View file

@ -4,10 +4,10 @@ Requires=network.target
[Service]
Type=simple
ExecStart=/usr/bin/neofs-node --config /etc/neofs/storage/config.yml
User=neofs-storage
Group=neofs-storage
WorkingDirectory=/srv/neofs
ExecStart=/usr/bin/frostfs-node --config /etc/frostfs/storage/config.yml
User=frostfs-storage
Group=frostfs-storage
WorkingDirectory=/srv/frostfs
Restart=always
RestartSec=5
PrivateTmp=true

View file

@ -1,3 +0,0 @@
bin/neofs-adm usr/bin
bin/neofs-cli usr/bin
bin/neofs-lens usr/bin

View file

@ -1,2 +0,0 @@
/etc/neofs/ir
/var/lib/neofs/ir

View file

@ -1 +0,0 @@
bin/neofs-ir usr/bin

View file

@ -1,3 +0,0 @@
/etc/neofs/storage
/srv/neofs
/var/lib/neofs/storage

View file

@ -1 +0,0 @@
bin/neofs-node usr/bin

View file

@ -1,55 +0,0 @@
#!/bin/sh
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
configure)
USERNAME=storage
id -u neofs-$USERNAME >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/neofs/$USERNAME --system -M -U -c "NeoFS Storage node" neofs-$USERNAME
if ! dpkg-statoverride --list /etc/neofs/$USERNAME >/dev/null; then
chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME
chmod -f 0750 /etc/neofs/$USERNAME
chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/config.yml
chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/control.yml
chmod -f 0640 /etc/neofs/$USERNAME/config.yml || true
chmod -f 0640 /etc/neofs/$USERNAME/control.yml || true
fi
USERDIR=$(getent passwd "neofs-$USERNAME" | cut -d: -f6)
if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then
chown -f neofs-$USERNAME: $USERDIR
fi
USERDIR=/srv/neofs
if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then
chown -f neofs-$USERNAME: $USERDIR
fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

32
debian/rules vendored
View file

@ -12,26 +12,26 @@ override_dh_auto_install:
echo $(DEB_BUILD_OPTIONS)
dh_auto_install
bin/neofs-adm gendoc -t man man/
bin/neofs-cli gendoc -t man man/
bin/frostfs-adm gendoc -t man man/
bin/frostfs-cli gendoc -t man man/
bin/neofs-adm completion bash > debian/neofs-adm.bash-completion
bin/neofs-cli completion bash > debian/neofs-cli.bash-completion
install -m 0755 -d debian/neofs-cli/usr/share/fish/completions/
install -m 0755 -d debian/neofs-cli/usr/share/zsh/vendor-completions/
bin/neofs-adm completion fish > debian/neofs-cli/usr/share/fish/completions/neofs-adm.fish
bin/neofs-adm completion zsh > debian/neofs-cli/usr/share/zsh/vendor-completions/_neofs-adm
bin/neofs-cli completion fish > debian/neofs-cli/usr/share/fish/completions/neofs-cli.fish
bin/neofs-cli completion zsh > debian/neofs-cli/usr/share/zsh/vendor-completions/_neofs-cli
bin/frostfs-adm completion bash > debian/frostfs-adm.bash-completion
bin/frostfs-cli completion bash > debian/frostfs-cli.bash-completion
install -m 0755 -d debian/frostfs-cli/usr/share/fish/completions/
install -m 0755 -d debian/frostfs-cli/usr/share/zsh/vendor-completions/
bin/frostfs-adm completion fish > debian/frostfs-cli/usr/share/fish/completions/frostfs-adm.fish
bin/frostfs-adm completion zsh > debian/frostfs-cli/usr/share/zsh/vendor-completions/_frostfs-adm
bin/frostfs-cli completion fish > debian/frostfs-cli/usr/share/fish/completions/frostfs-cli.fish
bin/frostfs-cli completion zsh > debian/frostfs-cli/usr/share/zsh/vendor-completions/_frostfs-cli
install -T -m 0640 config/example/ir.yaml debian/neofs-ir/etc/neofs/ir/config.yml
install -T -m 0640 config/example/ir-control.yaml debian/neofs-ir/etc/neofs/ir/control.yml
install -T -m 0640 config/example/node.yaml debian/neofs-storage/etc/neofs/storage/config.yml
install -T -m 0640 config/example/node-control.yaml debian/neofs-storage/etc/neofs/storage/control.yml
install -T -m 0640 config/example/ir.yaml debian/frostfs-ir/etc/frostfs/ir/config.yml
install -T -m 0640 config/example/ir-control.yaml debian/frostfs-ir/etc/frostfs/ir/control.yml
install -T -m 0640 config/example/node.yaml debian/frostfs-storage/etc/frostfs/storage/config.yml
install -T -m 0640 config/example/node-control.yaml debian/frostfs-storage/etc/frostfs/storage/control.yml
override_dh_installsystemd:
dh_installsystemd --no-enable --no-start --name=neofs-ir
dh_installsystemd --no-enable --no-start --name=neofs-storage
dh_installsystemd --no-enable --no-start --name=frostfs-ir
dh_installsystemd --no-enable --no-start --name=frostfs-storage
override_dh_installchangelogs:
dh_installchangelogs -k CHANGELOG.md