From 63b3694383462096a47747132e24d1c5c6ac0cdb Mon Sep 17 00:00:00 2001 From: ftimme Date: Sun, 25 Sep 2011 20:46:07 +0000 Subject: [PATCH] - Make sure the installer adds the nginx user to the ispconfig group (if nginx is installed). --- install/dist/lib/fedora.lib.php | 12 +++++++++--- install/dist/lib/gentoo.lib.php | 10 ++++++++-- install/dist/lib/opensuse.lib.php | 10 ++++++++-- install/lib/installer_base.lib.php | 10 ++++++++-- install/tpl/nginx_ispconfig.vhost.master | 2 +- 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 7f082a1d9..0b6aab806 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -581,7 +581,7 @@ class installer_dist extends installer_base { exec('mkdir -p '.$conf['nginx']['vhost_conf_enabled_dir']); exec('mkdir -p '.$conf['nginx']['vhost_conf_dir']); - wf('/etc/nginx/conf.d/ispconfig_vhosts.conf',"include /etc/nginx/sites-enabled/*.conf;"); + wf('/etc/nginx/conf.d/ispconfig_vhosts.conf',"include /etc/nginx/sites-enabled/*;"); //* make sure that webalizer finds its config file when it is directly in /etc if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) { @@ -854,8 +854,14 @@ class installer_dist extends installer_base { // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // and must be fixed as this will allow the apache user to read the ispconfig files. // Later this must run as own apache server or via suexec! - $command = 'usermod -a -G ispconfig '.$conf['apache']['user']; - caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + 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"); + } + 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"); + } //* Make the shell scripts executable $command = "chmod +x $install_dir/server/scripts/*.sh"; diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 0b8e5fe97..03165e67f 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -854,8 +854,14 @@ class installer extends installer_base // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // and must be fixed as this will allow the apache user to read the ispconfig files. // Later this must run as own apache server or via suexec! - $command = 'usermod -a -G ispconfig '.$conf['apache']['user']; - caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + 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"); + } + 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"); + } //* Make the shell scripts executable $command = "chmod +x $install_dir/server/scripts/*.sh"; diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 2e4375069..a36ebcd41 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -831,8 +831,14 @@ class installer_dist extends installer_base { // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // and must be fixed as this will allow the apache user to read the ispconfig files. // Later this must run as own apache server or via suexec! - $command = 'groupmod --add-user wwwrun ispconfig'; - caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + if($conf['apache']['installed'] == true){ + $command = 'groupmod --add-user '.$conf['apache']['user'].' ispconfig'; + caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + } + if($conf['nginx']['installed'] == true){ + $command = 'groupmod --add-user '.$conf['nginx']['user'].' ispconfig'; + caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + } //* Make the shell scripts executable $command = "chmod +x $install_dir/server/scripts/*.sh"; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index a39d7ed46..c929b43bf 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1732,8 +1732,14 @@ class installer_base { // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // and must be fixed as this will allow the apache user to read the ispconfig files. // Later this must run as own apache server or via suexec! - $command = 'adduser www-data ispconfig'; - caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + if($conf['apache']['installed'] == true){ + $command = 'adduser '.$conf['apache']['user'].' ispconfig'; + caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + } + if($conf['nginx']['installed'] == true){ + $command = 'adduser '.$conf['nginx']['user'].' ispconfig'; + caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + } //* Make the shell scripts executable $command = "chmod +x $install_dir/server/scripts/*.sh"; diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master index e820f5a9f..c7274fb45 100644 --- a/install/tpl/nginx_ispconfig.vhost.master +++ b/install/tpl/nginx_ispconfig.vhost.master @@ -55,7 +55,7 @@ server { location ~ ^/squirrelmail/(.+\.php)$ { try_files $uri =404; root /usr/share/; - fastcgi_pass 127.0.0.1:9000; + fastcgi_pass 127.0.0.1:{fpm_port}; {ssl_comment}fastcgi_param HTTPS {fastcgi_ssl}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $request_filename; -- GitLab