|
@@ -75,8 +75,13 @@ pkg_data=$(cat $HESTIA/data/packages/$package.pkg | egrep -v "TIME|DATE")
|
|
|
|
|
|
|
|
# Checking shell
|
|
# Checking shell
|
|
|
shell_conf=$(echo "$pkg_data" | grep -m1 'SHELL' | cut -f 2 -d \')
|
|
shell_conf=$(echo "$pkg_data" | grep -m1 'SHELL' | cut -f 2 -d \')
|
|
|
-resource_enaled=$(echo "$pkg_data" | grep -m1 'RESOURCES_LIMIT' | cut -f 2 -d \')
|
|
|
|
|
-disk_quota_enabled=$(echo "$pkg_data" | grep -m1 'DISK_QUOTA' | cut -f 2 -d \')
|
|
|
|
|
|
|
+resource_enabled=$(grep -m1 'RESOURCES_LIMIT' "$HESTIA"/conf/hestia.conf | cut -f 2 -d \')
|
|
|
|
|
+disk_quota_status=$(echo "$pkg_data" | grep -m1 'DISK_QUOTA' | cut -f 2 -d \')
|
|
|
|
|
+if [[ "$disk_quota_status" =~ ^[0-9]+$ ]]; then
|
|
|
|
|
+ disk_quota_enabled="yes"
|
|
|
|
|
+else
|
|
|
|
|
+ disk_quota_enabled="no"
|
|
|
|
|
+fi
|
|
|
shell=$(grep -w "$shell_conf" /etc/shells | head -n1)
|
|
shell=$(grep -w "$shell_conf" /etc/shells | head -n1)
|
|
|
|
|
|
|
|
# Adding user
|
|
# Adding user
|
|
@@ -271,7 +276,7 @@ if [ "$disk_quota_enabled" = 'yes' ]; then
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
# Update resource limitation (cgroup)
|
|
# Update resource limitation (cgroup)
|
|
|
-if [ "$resource_enaled" = 'yes' ]; then
|
|
|
|
|
|
|
+if [ "$resource_enabled" = 'yes' ]; then
|
|
|
$BIN/v-update-user-cgroup "$user"
|
|
$BIN/v-update-user-cgroup "$user"
|
|
|
fi
|
|
fi
|
|
|
|
|
|