From 272aecd1e82a90340afc03ac6feff42bde774be5 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 29 Sep 2011 07:16:12 -0400
Subject: [PATCH] - Added a check to see if the group "ispapps" exists.
---
install/dist/lib/fedora.lib.php | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 66cddd8..6cb4718 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -857,17 +857,23 @@
if($conf['apache']['installed'] == true){
$command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- $command = 'usermod -a -G ispapps '.$conf['apache']['user'];
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ if(is_group('ispapps')){
+ $command = 'usermod -a -G ispapps '.$conf['apache']['user'];
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ }
}
if($conf['nginx']['installed'] == true){
$command = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- // Allow the ispapps vhost access to /etc/squirrelmail
- $command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- $command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ if(is_user('ispapps')){
+ // Allow the ispapps vhost access to /etc/squirrelmail
+ $command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ }
+ if(is_group('ispapps')){
+ $command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ }
}
//* Make the shell scripts executable
--
Gitblit v1.9.1