Skip to content

Commit 4f1e24c

Browse files
committed
Add acl and sysstat dependency to deb package
Remove acl pkg instalation from upgrade script
1 parent 7c1b0bc commit 4f1e24c

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

install/upgrade/0.10.0-190430.sh

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/bin/bash
22

33
# Define vars
4-
HESTIA="/usr/local/hestia"
4+
if [ -z "$HESTIA" ]; then
5+
export HESTIA="/usr/local/hestia"
6+
fi
57
HESTIA_BACKUP="/root/hst_upgrade/$(date +%d%m%Y%H%M)"
68
hestiacp="$HESTIA/install/deb"
79
pma_v='4.9.0.1'
@@ -172,29 +174,8 @@ if [ -d "/etc/roundcube" ]; then
172174
chown root:www-data /etc/roundcube/debian-db*
173175
fi
174176

175-
# Check if acl package is installed
176-
echo "(*) Verifying ACLs and hardening user permissions..."
177-
if [ ! -e '/usr/bin/setfacl' ]; then
178-
# Disable apt package lock
179-
mv /var/lib/dpkg/lock-frontend /var/lib/dpkg/lock-frontend.bak
180-
mv /var/lib/dpkg/lock /var/lib/dpkg/lock.bak
181-
mv /var/cache/apt/archives/lock /var/cache/apt/archives/lock.bak
182-
mv /var/lib/dpkg/updates/ /var/lib/dpkg/updates.bak/
183-
mkdir -p /var/lib/dpkg/updates/
184-
185-
# Install missing acl package
186-
apt-get -qq update > /dev/null 2>&1
187-
apt-get -qq -y install acl > /dev/null 2>&1
188-
189-
# Enable apt package lock
190-
mv /var/lib/dpkg/lock-frontend.bak /var/lib/dpkg/lock-frontend
191-
mv /var/lib/dpkg/lock.bak /var/lib/dpkg/lock
192-
mv /var/cache/apt/archives/lock.bak /var/cache/apt/archives/lock
193-
rm -rf /var/lib/dpkg/updates/
194-
mv /var/lib/dpkg/updates.bak/ /var/lib/dpkg/updates/
195-
fi
196-
197177
# Add a general group for normal users created by Hestia
178+
echo "(*) Verifying ACLs and hardening user permissions..."
198179
if [ -z "$(grep ^hestia-users: /etc/group)" ]; then
199180
groupadd --system "hestia-users"
200181
fi

src/deb/hestia/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Section: admin
66
Maintainer: HestiaCP <info@hestiacp.com>
77
Homepage: https://www.hestiacp.com
88
Architecture: amd64
9-
Depends: bash, awk, sed
9+
Depends: bash, awk, sed, acl, sysstat
1010
Description: hestia
1111
hestia is an open source hosting control panel.
1212
hestia has a clean and focused interface without the clutter.

0 commit comments

Comments
 (0)