Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
isp
ISPConfig 3
Commits
126bdacc
Commit
126bdacc
authored
Nov 20, 2012
by
mcramer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented: FS#2546 - Update all custom php.ini files for webs on main php.ini change
parent
68ec4374
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
248 additions
and
0 deletions
+248
-0
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+89
-0
server/plugins-available/webserver_plugin.inc.php
server/plugins-available/webserver_plugin.inc.php
+156
-0
server/server.php
server/server.php
+3
-0
No files found.
server/plugins-available/apache2_plugin.inc.php
View file @
126bdacc
...
...
@@ -88,8 +88,97 @@ class apache2_plugin {
$app
->
plugins
->
registerEvent
(
'ftp_user_delete'
,
$this
->
plugin_name
,
'ftp_user_delete'
);
$app
->
plugins
->
registerAction
(
'php_ini_changed'
,
$this
->
plugin_name
,
'php_ini_changed'
);
}
// check for php.ini changes
// Handle php.ini changes
function
php_ini_changed
(
$event_name
,
$data
)
{
global
$app
,
$conf
;
$app
->
uses
(
'getconf'
);
$web_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'web'
);
$fastcgi_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'fastcgi'
);
/* $data contains an array with these keys:
* file -> full path of changed php_ini
* mode -> web_domain php modes to change (mod, fast-cgi, php-fpm or '' for all except 'mod')
* php_version -> php ini path that changed (additional php versions)
*/
$qrystr
=
"SELECT * FROM web_domain WHERE custom_php_ini != ''"
;
if
(
$data
[
'mode'
]
==
'mod'
)
{
$qrystr
.
=
" AND php = 'mod'"
;
}
elseif
(
$data
[
'mode'
]
==
'fast-cgi'
)
{
$qrystr
.
=
" AND php = 'fast-cgi'"
;
if
(
$data
[
'php_version'
])
{
$qrystr
.
=
" AND fastcgi_php_version LIKE '%:"
.
$app
->
db
->
quote
(
$data
[
'php_version'
])
.
"'"
;
}
}
elseif
(
$data
[
'mode'
]
==
'php-fpm'
)
{
$qrystr
.
=
" AND php = 'php-fpm'"
;
if
(
$data
[
'php_version'
])
{
$qrystr
.
=
" AND fastcgi_php_version LIKE '%:"
.
$app
->
db
->
quote
(
$data
[
'php_version'
])
.
":%'"
;
}
}
else
{
$qrystr
.
=
" AND php != 'mod' AND php != 'fast-cgi'"
;
}
//** Get all the webs
$web_domains
=
$app
->
db
->
queryAllRecords
(
$qrystr
);
foreach
(
$web_domains
as
$web_data
)
{
$custom_php_ini_dir
=
$web_config
[
'website_basedir'
]
.
'/conf/'
.
$web_data
[
'system_user'
];
$web_folder
=
'web'
;
if
(
$web_data
[
'type'
]
==
'vhostsubdomain'
)
{
$web_folder
=
$web_data
[
'web_folder'
];
$custom_php_ini_dir
.
=
'_'
.
$web_folder
;
}
if
(
!
is_dir
(
$web_config
[
'website_basedir'
]
.
'/conf'
))
$app
->
system
->
mkdir
(
$web_config
[
'website_basedir'
]
.
'/conf'
);
if
(
!
is_dir
(
$custom_php_ini_dir
))
$app
->
system
->
mkdir
(
$custom_php_ini_dir
);
$php_ini_content
=
''
;
if
(
$web_data
[
'php'
]
==
'mod'
)
{
$master_php_ini_path
=
$web_config
[
'php_ini_path_apache'
];
}
else
{
if
(
$web_data
[
'php'
]
==
'fast-cgi'
&&
file_exists
(
$fastcgi_config
[
"fastcgi_phpini_path"
]))
{
$master_php_ini_path
=
$fastcgi_config
[
"fastcgi_phpini_path"
];
}
else
{
$master_php_ini_path
=
$web_config
[
'php_ini_path_cgi'
];
}
}
if
(
$master_php_ini_path
!=
''
&&
substr
(
$master_php_ini_path
,
-
7
)
==
'php.ini'
&&
is_file
(
$master_php_ini_path
))
{
$php_ini_content
.
=
$app
->
system
->
file_get_contents
(
$master_php_ini_path
)
.
"
\n
"
;
}
$php_ini_content
.
=
str_replace
(
"
\r
"
,
''
,
trim
(
$web_data
[
'custom_php_ini'
]));
$app
->
system
->
file_put_contents
(
$custom_php_ini_dir
.
'/php.ini'
,
$php_ini_content
);
$app
->
log
(
'Info: rewrote custom php.ini for web '
.
$web_data
[
'domain_id'
]
.
' ('
.
$web_data
[
'domain'
]
.
').'
,
LOGLEVEL_DEBUG
);
}
if
(
count
(
$web_domains
)
>
0
)
{
//* We do not check the apache config here - we only changed the php.ini
//* Check if this is a chrooted setup
if
(
$web_config
[
'website_basedir'
]
!=
''
&&
@
is_file
(
$web_config
[
'website_basedir'
]
.
'/etc/passwd'
))
{
$apache_chrooted
=
true
;
$app
->
log
(
'Info: Apache is chrooted.'
,
LOGLEVEL_DEBUG
);
}
else
{
$apache_chrooted
=
false
;
}
$app
->
log
(
'Info: rewrote all php.ini and reloading apache now.'
,
LOGLEVEL_DEBUG
);
if
(
$apache_chrooted
)
{
$app
->
services
->
restartServiceDelayed
(
'httpd'
,
'restart'
);
}
else
{
// request a httpd reload when all records have been processed
$app
->
services
->
restartServiceDelayed
(
'httpd'
,
'reload'
);
}
}
else
{
$app
->
log
(
'Info: No webs affected by php.ini change.'
,
LOGLEVEL_DEBUG
);
}
}
// Handle the creation of SSL certificates
function
ssl
(
$event_name
,
$data
)
{
global
$app
,
$conf
;
...
...
server/plugins-available/webserver_plugin.inc.php
0 → 100644
View file @
126bdacc
<?php
/*
Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
class
webserver_plugin
{
var
$plugin_name
=
'webserver_plugin'
;
var
$class_name
=
'webserver_plugin'
;
/**
* This function is called during ispconfig installation to determine
* if a symlink shall be created for this plugin.
*/
public
function
onInstall
()
{
global
$conf
;
if
(
$conf
[
'services'
][
'web'
]
==
true
)
{
return
true
;
}
else
{
return
false
;
}
}
/**
* This function is called when the module is loaded
*/
public
function
onLoad
()
{
global
$app
;
$app
->
plugins
->
registerAction
(
'server_plugins_loaded'
,
$this
->
plugin_name
,
'check_phpini_changes'
);
}
/**
* This function is called when a change in one of the registered tables is detected.
* The function then raises the events for the plugins.
*/
public
function
process
(
$tablename
,
$action
,
$data
)
{
// not needed
}
/**
* The method checks for a change of a php.ini file
*/
public
function
check_phpini_changes
()
{
global
$app
,
$conf
;
//** check if the main php.ini of the system changed so we need to regenerate all custom php.inis
$app
->
uses
(
'getconf'
);
//** files to check
$check_files
=
array
();
$web_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'web'
);
$fastcgi_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'fastcgi'
);
//** add default php.ini files to check
$check_files
[]
=
array
(
'file'
=>
$web_config
[
'php_ini_path_apache'
],
'mode'
=>
'mod'
,
'php_version'
=>
''
);
// default;
$check_files
[]
=
array
(
'file'
=>
$web_config
[
'php_ini_path_cgi'
],
'mode'
=>
''
,
// all but 'mod' and 'fast-cgi'
'php_version'
=>
''
);
// default;
if
(
$fastcgi_config
[
"fastcgi_phpini_path"
]
&&
$fastcgi_config
[
"fastcgi_phpini_path"
]
!=
$web_config
[
'php_ini_path_cgi'
])
{
$check_files
[]
=
array
(
'file'
=>
$fastcgi_config
[
"fastcgi_phpini_path"
],
'mode'
=>
'fast-cgi'
,
'php_version'
=>
''
);
// default;
}
else
{
$check_files
[]
=
array
(
'file'
=>
$web_config
[
'php_ini_path_cgi'
],
'mode'
=>
'fast-cgi'
,
// all but 'mod'
'php_version'
=>
''
);
// default;
}
//** read additional php versions of this server
$php_versions
=
$app
->
db
->
queryAllRecords
(
'SELECT server_php_id, php_fastcgi_ini_dir, php_fpm_ini_dir FROM server_php WHERE server_id = '
.
intval
(
$conf
[
'server_id'
]));
foreach
(
$php_versions
as
$php
)
{
if
(
$php
[
'php_fastcgi_ini_dir'
]
&&
$php
[
'php_fastcgi_ini_dir'
]
.
'/php.ini'
!=
$web_config
[
'php_ini_path_cgi'
])
{
$check_files
[]
=
array
(
'file'
=>
$php
[
'php_fastcgi_ini_dir'
]
.
'/php.ini'
,
'mode'
=>
'fast-cgi'
,
'php_version'
=>
$php
[
'php_fastcgi_ini_dir'
]);
}
elseif
(
$php
[
'php_fpm_ini_dir'
]
&&
$php
[
'php_fpm_ini_dir'
]
.
'/php.ini'
!=
$web_config
[
'php_ini_path_cgi'
])
{
$check_files
[]
=
array
(
'file'
=>
$php
[
'php_fpm_ini_dir'
]
.
'/php.ini'
,
'mode'
=>
'php-fpm'
,
'php_version'
=>
$php
[
'php_fpm_ini_dir'
]);
}
}
unset
(
$php_versions
);
//** read md5sum status file
$new_php_ini_md5
=
array
();
$php_ini_md5
=
array
();
$php_ini_changed
=
false
;
if
(
file_exists
(
SCRIPT_PATH
.
'/php.ini.md5sum'
))
$php_ini_md5
=
unserialize
(
base64_decode
(
trim
(
$app
->
system
->
file_get_contents
(
SCRIPT_PATH
.
'/php.ini.md5sum'
))));
if
(
!
is_array
(
$php_ini_md5
))
$php_ini_md5
=
array
();
$processed
=
array
();
foreach
(
$check_files
as
$file
)
{
$file_path
=
$file
[
'file'
];
if
(
substr
(
$file_path
,
-
8
)
!==
'/php.ini'
)
$file_path
.
=
(
substr
(
$file_path
,
-
1
)
!==
'/'
?
'/'
:
''
)
.
'php.ini'
;
if
(
!
file_exists
(
$file_path
))
continue
;
//** check if this php.ini file was already processed (if additional php version uses same php.ini)
$ident
=
$file_path
.
'::'
.
$file
[
'mode'
]
.
'::'
.
$file
[
'php_version'
];
if
(
in_array
(
$ident
,
$processed
)
==
true
)
continue
;
$processed
[]
=
$ident
;
//** check if md5sum of file changed
$file_md5
=
md5_file
(
$file_path
);
if
(
array_key_exists
(
$file_path
,
$php_ini_md5
)
==
false
||
$php_ini_md5
[
$file_path
]
!=
$file_md5
)
{
$php_ini_changed
=
true
;
$app
->
log
(
'Info: PHP.ini changed: '
.
$file_path
.
', mode '
.
$file
[
'mode'
]
.
' vers '
.
$file
[
'php_version'
]
.
'.'
,
LOGLEVEL_DEBUG
);
// raise action for this file
$app
->
plugins
->
raiseAction
(
'php_ini_changed'
,
$file
);
}
$new_php_ini_md5
[
$file_path
]
=
$file_md5
;
}
//** write new md5 sums if something changed
if
(
$php_ini_changed
==
true
)
$app
->
system
->
file_put_contents
(
SCRIPT_PATH
.
'/php.ini.md5sum'
,
base64_encode
(
serialize
(
$new_php_ini_md5
)));
unset
(
$new_php_ini_md5
);
unset
(
$php_ini_md5
);
unset
(
$processed
);
}
}
?>
\ No newline at end of file
server/server.php
View file @
126bdacc
...
...
@@ -153,6 +153,9 @@ if ($app->db->connect_error == NULL && $app->dbmaster->connect_error == NULL) {
$app
->
modules
->
loadModules
(
'all'
);
//** Load the plugins that are in the plugins-enabled folder
$app
->
plugins
->
loadPlugins
(
'all'
);
$app
->
plugins
->
raiseAction
(
'server_plugins_loaded'
,
''
);
if
(
$tmp_num_records
>
0
)
{
$app
->
log
(
"Found
$tmp_num_records
changes, starting update process."
,
LOGLEVEL_DEBUG
);
//** Go through the sys_datalog table and call the processing functions
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment