Browse Source

Merge pull request #327 from Lupul/Bugfix-0531

Bugfix 0531
Raphael Schneeberger 6 năm trước cách đây
mục cha
commit
538f6472a4

+ 1 - 1
bin/v-add-user

@@ -63,7 +63,7 @@ echo "$user:$password" | /usr/sbin/chpasswd
 
 # Add a general group for normal users created by Hestia
 if [ -z "$(grep ^hestia-users: /etc/group)" ]; then
-    groupadd "hestia-users"
+    groupadd --system "hestia-users"
 fi
 
 # Add membership to hestia-users group to non-admin users

+ 1 - 1
install/hst-install-debian.sh

@@ -723,7 +723,7 @@ fi
 # Excluding packages
 software=$(echo "$software" | sed -e "s/apache2.2-common//")
 if [ "$nginx" = 'no'  ]; then
-    software=$(echo "$software" | sed -e "s/^nginx//")
+    software=$(echo "$software" | sed -e "s/\bnginx\b/ /")
 fi
 if [ "$apache" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/apache2 //")

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -685,7 +685,7 @@ fi
 # Excluding packages
 software=$(echo "$software" | sed -e "s/apache2.2-common//")
 if [ "$nginx" = 'no'  ]; then
-    software=$(echo "$software" | sed -e "s/^nginx//")
+    software=$(echo "$software" | sed -e "s/\bnginx\b/ /")
 fi
 if [ "$apache" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/apache2 //")

+ 1 - 1
install/upgrade/0.10.0-190430.sh

@@ -182,7 +182,7 @@ fi
 
 # Add a general group for normal users created by Hestia
 if [ -z "$(grep ^hestia-users: /etc/group)" ]; then
-    groupadd "hestia-users"
+    groupadd --system "hestia-users"
 fi
 
 # Make sure non-admin users belong to correct Hestia group