|
1 | 1 | #!/bin/bash |
2 | 2 |
|
3 | 3 | # Define vars |
4 | | -HESTIA="/usr/local/hestia" |
| 4 | +if [ -z "$HESTIA" ]; then |
| 5 | + export HESTIA="/usr/local/hestia" |
| 6 | +fi |
5 | 7 | HESTIA_BACKUP="/root/hst_upgrade/$(date +%d%m%Y%H%M)" |
6 | 8 | hestiacp="$HESTIA/install/deb" |
7 | 9 | pma_v='4.9.0.1' |
@@ -172,29 +174,8 @@ if [ -d "/etc/roundcube" ]; then |
172 | 174 | chown root:www-data /etc/roundcube/debian-db* |
173 | 175 | fi |
174 | 176 |
|
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 | | - |
197 | 177 | # Add a general group for normal users created by Hestia |
| 178 | +echo "(*) Verifying ACLs and hardening user permissions..." |
198 | 179 | if [ -z "$(grep ^hestia-users: /etc/group)" ]; then |
199 | 180 | groupadd --system "hestia-users" |
200 | 181 | fi |
|
0 commit comments