Skip to content

Commit 642db37

Browse files
committed
Merge pull request hestiacp#294 from devsli/ubuntify
Do not overwrite default sudoers config (Ubuntu installer)
2 parents 11c5d02 + 57b9104 commit 642db37

File tree

3 files changed

+3
-38
lines changed

3 files changed

+3
-38
lines changed

install/ubuntu/sudoers.conf

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Defaults env_keep="VESTA"

install/vst-install-ubuntu.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,6 @@ mkdir -p $vst_backups/bind
300300
mkdir -p $vst_backups/vesta
301301
mkdir -p $vst_backups/home
302302

303-
# Backup sudoers
304-
if [ -e '/etc/sudoers' ]; then
305-
cp /etc/sudoers $vst_backups/
306-
fi
307-
308303
# Backup nginx
309304
service nginx stop > /dev/null 2>&1
310305
if [ -e '/etc/nginx/nginx.conf' ]; then
@@ -535,9 +530,9 @@ echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile
535530
echo "/sbin/nologin" >> /etc/shells
536531

537532
# Sudo configuration
538-
wget $CHOST/$VERSION/sudoers.conf -O /etc/sudoers
533+
wget $CHOST/$VERSION/sudoers.vestacp.conf -O /etc/sudoers.d/vestacp
539534
wget $CHOST/$VERSION/sudoers.admin.conf -O /etc/sudoers.d/admin
540-
chmod 440 /etc/sudoers
535+
chmod 440 /etc/sudoers.d/vestacp
541536
chmod 440 /etc/sudoers.d/admin
542537

543538
# NTP Synchronization

0 commit comments

Comments
 (0)