From 43fe156f7c74446926f7cb3bb2a36a5c75c9ed8e Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Thu, 27 Oct 2022 20:21:29 +0300 Subject: [PATCH] [#409] Fix more lintian warnings Signed-off-by: Stanislav Bogatyrev --- debian/control | 43 +++++++++++++++-------------------- debian/neofs-ir.postinst | 6 ++--- debian/neofs-storage.postinst | 5 ++-- debian/rules | 10 ++++---- 4 files changed, 28 insertions(+), 36 deletions(-) diff --git a/debian/control b/debian/control index 148a39865..e5824c03a 100644 --- a/debian/control +++ b/debian/control @@ -10,37 +10,30 @@ Vcs-Browser: https://github.com/nspcc-dev/neofs-node Package: neofs-storage Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends} Description: NeoFS Storage 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 of storing - and distributing user's data. - Any Neo user may participate in the network and get paid for providing storage - resources to other users or store their data in NeoFS and pay a competitive - price for it. + 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 + of storing and distributing user's data. Any Neo user may participate in the + 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 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, neofs-locode-db +Depends: ${misc:Depends}, neofs-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 of storing - and distributing user's data. - Any Neo user may participate in the network and get paid for providing storage - resources to other users or store their data in NeoFS and pay a competitive - price for it. + 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 + of storing and distributing user's data. Any Neo user may participate in the + 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 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends} Description: CLI tools for NeoFS - 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 of storing - and distributing user's data. - Any Neo user may participate in the network and get paid for providing storage - resources to other users or store their data in NeoFS and pay a competitive - price for it. - + 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 + of storing and distributing user's data. Any Neo user may participate in the + network and get paid for providing storage resources to other users or store + their data in NeoFS and pay a competitive price for it. diff --git a/debian/neofs-ir.postinst b/debian/neofs-ir.postinst index 55418e2da..76c2f7c3f 100644 --- a/debian/neofs-ir.postinst +++ b/debian/neofs-ir.postinst @@ -21,13 +21,13 @@ case "$1" in 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 -R root:neofs-$USERNAME /etc/neofs/$USERNAME + chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/* chmod -f 0750 /etc/neofs/$USERNAME - chmod -f u=rwX,g=rX,o= /etc/neofs/$USERNAME/* || true + fi USERDIR=$(getent passwd "neofs-$USERNAME" | cut -d: -f6) if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then - chown -f -R neofs-$USERNAME: $USERDIR + chown -f neofs-$USERNAME: $USERDIR fi ;; diff --git a/debian/neofs-storage.postinst b/debian/neofs-storage.postinst index f1bf80bac..a8257e93e 100644 --- a/debian/neofs-storage.postinst +++ b/debian/neofs-storage.postinst @@ -21,13 +21,12 @@ case "$1" in USERNAME=storage id -u neofs-storage >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /srv/neofs --system -M -U -c "NeoFS Storage node" neofs-storage if ! dpkg-statoverride --list /etc/neofs/$USERNAME >/dev/null; then - chown -f -R root:neofs-$USERNAME /etc/neofs/$USERNAME + chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/* chmod -f 0750 /etc/neofs/$USERNAME - chmod -f u=rwX,g=rX,o= /etc/neofs/$USERNAME/* || true fi USERDIR=$(getent passwd "neofs-$USERNAME" | cut -d: -f6) if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then - chown -f -R neofs-$USERNAME: $USERDIR + chown -f neofs-$USERNAME: $USERDIR fi ;; diff --git a/debian/rules b/debian/rules index f9c5734ec..b1817e31c 100755 --- a/debian/rules +++ b/debian/rules @@ -17,17 +17,17 @@ override_dh_auto_install: 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/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 - install -T config/example/ir.yaml debian/neofs-ir/etc/neofs/ir/config.yml - install -T config/example/ir-control.yaml debian/neofs-ir/etc/neofs/ir/control.yml - install -T config/example/node.yaml debian/neofs-storage/etc/neofs/storage/config.yml - install -T config/example/node-control.yaml debian/neofs-storage/etc/neofs/storage/control.yml + 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 override_dh_installsystemd: dh_installsystemd --no-enable --no-start --name=neofs-ir