Merge pull request #294 from devsli/ubuntify

Do not overwrite default sudoers config (Ubuntu installer)

install/ubuntu/sudoers.conf

@@ -1,31 +0,0 @@
-#
-# This file MUST be edited with the 'visudo' command as root.
-#
-# Please consider adding local content in /etc/sudoers.d/ instead of
-# directly modifying this file.
-#
-# See the man page for details on how to write a sudoers file.
-#
-Defaults	env_reset
-Defaults	mail_badpass
-Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-Defaults	env_keep="VESTA"
-
-# Host alias specification
-
-# User alias specification
-
-# Cmnd alias specification
-
-# User privilege specification
-root	ALL=(ALL:ALL) ALL
-
-# Members of the admin group may gain root privileges
-%admin ALL=(ALL) ALL
-
-# Allow members of group sudo to execute any command
-%sudo	ALL=(ALL:ALL) ALL
-
-# See sudoers(5) for more information on "#include" directives:
-
-#includedir /etc/sudoers.d

install/ubuntu/sudoers.vestacp.conf

@@ -0,0 +1 @@
+Defaults	env_keep="VESTA"

install/vst-install-ubuntu.sh

@@ -300,11 +300,6 @@ mkdir -p $vst_backups/bind
 mkdir -p $vst_backups/vesta
 mkdir -p $vst_backups/home
 
-# Backup sudoers
-if [ -e '/etc/sudoers' ]; then
-    cp /etc/sudoers $vst_backups/
-fi
-
 # Backup nginx
 service nginx stop > /dev/null 2>&1
 if [ -e '/etc/nginx/nginx.conf' ]; then
@@ -535,9 +530,9 @@ echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile
 echo "/sbin/nologin" >> /etc/shells
 
 # Sudo configuration
-wget $CHOST/$VERSION/sudoers.conf -O /etc/sudoers
+wget $CHOST/$VERSION/sudoers.vestacp.conf -O /etc/sudoers.d/vestacp
 wget $CHOST/$VERSION/sudoers.admin.conf -O /etc/sudoers.d/admin
-chmod 440 /etc/sudoers
+chmod 440 /etc/sudoers.d/vestacp
 chmod 440 /etc/sudoers.d/admin
 
 # NTP Synchronization