X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpost-install;h=383ab6e334f740f6116214cf0367b3a30e6011cc;hb=44d3c1f9f0e8fc945206020c4bd7a15c5a457f55;hp=6c953a97ec8518ccfb0cccd53ac979a10dc31f52;hpb=7fe1cd7181ae5243d921fc76185d98db55366866;p=hvlinux.git

diff --git a/stage5/post-install b/stage5/post-install
index 6c953a9..383ab6e 100755
--- a/stage5/post-install
+++ b/stage5/post-install
@@ -2,9 +2,15 @@
 
 source ../functions/main
 
+update-desktop-database
+
 if [ -n "${REGUSER}" ]; then
-    hv_useradd -g users -G audio,video,cdrom,usb,shutdown,halusers \
-        -s /bin/bash -m ${REGUSER}
+    hv_useradd -g users -s /bin/bash -m ${REGUSER}
+
+    # Add user to these supplementary groups:
+    usermod -a -G \
+            audio,dialout,video,cdrom,usb,shutdown,kvm,lp,lpadmin,scanner,plugdev \
+            ${REGUSER}
 fi
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -12,45 +18,46 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     #########################################
     # Apache
     #########################################
-    READ_VALID="no"
-    
-    while [ "${READ_VALID}" = "no" ]; do
-	echo "Do you want to generate SSL self-signed"
-	echo -n "certificate for Apache? (y/n): "
-	read USE_SSL
-	
-	if [ "${USE_SSL}" = "y" -o "${USE_SSL}" = "n" ]; then
-	    READ_VALID="yes"
-	else
-	    echo "Error, answer y or n"
-	fi
-    done
-    
-    if [ "${USE_SSL}" = "y" ]; then
-	/etc/apache/generate-ssl-certs
+    if [ "x${USE_HTTPD}" = "xyes" ]; then
+        READ_VALID="no"
+
+        while [ "${READ_VALID}" = "no" ]; do
+	    echo "Do you want to generate SSL self-signed"
+	    echo -n "certificate for Apache? (y/n): "
+	    read USE_SSL
+
+	    if [ "${USE_SSL}" = "y" -o "${USE_SSL}" = "n" ]; then
+	        READ_VALID="yes"
+	    else
+	        echo "Error, answer y or n"
+	    fi
+        done
+
+        if [ "${USE_SSL}" = "y" ]; then
+	    /etc/httpd/generate-ssl-certs
+        fi
     fi
-    
+
     #########################################
     # imap
     #########################################
     READ_VALID="no"
-    
+
     while [ "${READ_VALID}" = "no" ]; do
 	echo "Do you want to generate SSL self-signed"
 	echo -n "certificate for IMAP server? (y/n): "
 	read USE_SSL
-	
+
 	if [ "${USE_SSL}" = "y" -o "${USE_SSL}" = "n" ]; then
 	    READ_VALID="yes"
 	else
 	    echo "Error, answer y or n"
 	fi
     done
-    
+
     if [ "${USE_SSL}" = "y" ]; then
 	/etc/mail/imap-ssl-certs
     fi
-    
 fi
 
 exit $?