Commit 63b36943 authored by Falko Timme's avatar Falko Timme
Browse files

- Make sure the installer adds the nginx user to the ispconfig group (if nginx is installed).

parent d083f222
...@@ -581,7 +581,7 @@ class installer_dist extends installer_base { ...@@ -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_enabled_dir']);
exec('mkdir -p '.$conf['nginx']['vhost_conf_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 //* make sure that webalizer finds its config file when it is directly in /etc
if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) { if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
...@@ -854,8 +854,14 @@ class installer_dist extends installer_base { ...@@ -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 // 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. // 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! // Later this must run as own apache server or via suexec!
if($conf['apache']['installed'] == true){
$command = 'usermod -a -G ispconfig '.$conf['apache']['user']; $command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); 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 //* Make the shell scripts executable
$command = "chmod +x $install_dir/server/scripts/*.sh"; $command = "chmod +x $install_dir/server/scripts/*.sh";
......
...@@ -854,8 +854,14 @@ class installer extends installer_base ...@@ -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 // 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. // 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! // Later this must run as own apache server or via suexec!
if($conf['apache']['installed'] == true){
$command = 'usermod -a -G ispconfig '.$conf['apache']['user']; $command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); 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 //* Make the shell scripts executable
$command = "chmod +x $install_dir/server/scripts/*.sh"; $command = "chmod +x $install_dir/server/scripts/*.sh";
......
...@@ -831,8 +831,14 @@ class installer_dist extends installer_base { ...@@ -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 // 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. // 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! // Later this must run as own apache server or via suexec!
$command = 'groupmod --add-user wwwrun ispconfig'; 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"); 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 //* Make the shell scripts executable
$command = "chmod +x $install_dir/server/scripts/*.sh"; $command = "chmod +x $install_dir/server/scripts/*.sh";
......
...@@ -1732,8 +1732,14 @@ class installer_base { ...@@ -1732,8 +1732,14 @@ class installer_base {
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // 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. // 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! // Later this must run as own apache server or via suexec!
$command = 'adduser www-data ispconfig'; 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"); 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 //* Make the shell scripts executable
$command = "chmod +x $install_dir/server/scripts/*.sh"; $command = "chmod +x $install_dir/server/scripts/*.sh";
......
...@@ -55,7 +55,7 @@ server { ...@@ -55,7 +55,7 @@ server {
location ~ ^/squirrelmail/(.+\.php)$ { location ~ ^/squirrelmail/(.+\.php)$ {
try_files $uri =404; try_files $uri =404;
root /usr/share/; 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}; {ssl_comment}fastcgi_param HTTPS {fastcgi_ssl};
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param SCRIPT_FILENAME $request_filename;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment