mirror of
https://github.com/billz/raspap-webgui.git
synced 2023-10-10 13:37:24 +02:00
Use sed regular expressions to deal with changing php configuration.
Don't try turn on not existing Zend Opcache under php 5<= Turn on session.use_strict_mode if off. Don't change decreated expose_php. Signed-off-by: D9ping <D9ping@users.noreply.github.com>
This commit is contained in:
parent
19f123b0c4
commit
8355c1cbfe
@ -269,7 +269,7 @@ function patch_system_files() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Change configuration of php cgi.
|
# Change configuration of php-cgi.
|
||||||
function configure_php() {
|
function configure_php() {
|
||||||
phpcgiconf=""
|
phpcgiconf=""
|
||||||
if [ "$php_package" = "php7.0-cgi" ]; then
|
if [ "$php_package" = "php7.0-cgi" ]; then
|
||||||
@ -281,27 +281,25 @@ function configure_php() {
|
|||||||
if [ -f "$phpcgiconf" ]; then
|
if [ -f "$phpcgiconf" ]; then
|
||||||
# Set the httpOnly flag on session cookies.
|
# Set the httpOnly flag on session cookies.
|
||||||
# So they cannot be read by javascript, if cookie flag supported by useragent.
|
# So they cannot be read by javascript, if cookie flag supported by useragent.
|
||||||
sudo sed -i 's/^session.cookie_httponly\s*=\s*([O|o]ff|0)\s*$/session.cookie_httponly = 1/' "$phpcgiconf"
|
sudo sed -i -E 's/^session\.cookie_httponly\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/session.cookie_httponly = 1/' "$phpcgiconf"
|
||||||
# Enable PHP Zend Opcache if off.
|
# Don't accept uninitialized session ID's.
|
||||||
sudo sed -i 's/;opcache.enable\s*=\s*([O|o]ff|0)\s*$/opcache.enable=1/' "$phpcgiconf"
|
sudo sed -i -E 's/^session\.use_strict_mode\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/session.use_strict_mode = 1/' "$phpcgiconf"
|
||||||
# Turn off unused assert function for unit test support.
|
|
||||||
#sudo sed -i 's/;assert.active\s*=\s*([O|o]n|1)\s*$/assert.active = 0/' "$phpcgiconf"
|
|
||||||
# Turn off file upload support if on.
|
# Turn off file upload support if on.
|
||||||
#sudo sed -i 's/file_uploads\s*=\s*([O|o]n|1)\s*$/file_uploads = 0/' "$phpcgiconf"
|
sudo sed -i -E 's/^file_uploads\s*=\s*(1|([O|o]n)|([T|t]rue)|([Y|y]es))\s*$/file_uploads = 0/' "$phpcgiconf"
|
||||||
# Use sha1 instead of md5 for sessionid.
|
if [ "$php_package" = "php7.0-cgi" ]; then
|
||||||
sudo sed -i 's/^session.hash_function\s*=\s*0\s*$/session.hash_function = 1/' "$phpcgiconf"
|
# Enable PHP Zend Opcache.
|
||||||
# Disable the X-Powered-By header and magic logo uri(if enabled php5).
|
sudo sed -i -E 's/^;?opcache\.enable\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/opcache.enable = 1/' "$phpcgiconf"
|
||||||
sudo sed -i 's/^expose_php\s*=\s*([O|o]n|1)\s*$/expose_php = 0/' "$phpcgiconf"
|
# Make sure opcache extension is turned on.
|
||||||
|
if [ -f "/usr/sbin/phpenmod" ]; then
|
||||||
|
sudo phpenmod opcache
|
||||||
|
else
|
||||||
|
install_warning "phpenmod not found."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
install_warning "Php configuration could not be found."
|
install_warning "PHP configuration could not be found."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Make sure opcache extension is turned on.
|
|
||||||
if [ -f "/usr/sbin/phpenmod" ]; then
|
|
||||||
sudo phpenmod opcache
|
|
||||||
else
|
|
||||||
install_warning "phpenmod not installed."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Disable unused php extensions to safe memory use and for hardening.
|
# Disable unused php extensions to safe memory use and for hardening.
|
||||||
if [ -f "/usr/sbin/phpdismod" ]; then
|
if [ -f "/usr/sbin/phpdismod" ]; then
|
||||||
@ -314,8 +312,11 @@ function configure_php() {
|
|||||||
sudo phpdismod sysvshm
|
sudo phpdismod sysvshm
|
||||||
sudo phpdismod tokenizer
|
sudo phpdismod tokenizer
|
||||||
else
|
else
|
||||||
install_warning "phpdismmod not installed or not in path."
|
install_warning "phpdismmod not found."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Apply new php configuration.
|
||||||
|
sudo service lighttpd reload
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_complete() {
|
function install_complete() {
|
||||||
@ -324,7 +325,7 @@ function install_complete() {
|
|||||||
echo -n "The system needs to be rebooted as a final step. Reboot now? [y/N]: "
|
echo -n "The system needs to be rebooted as a final step. Reboot now? [y/N]: "
|
||||||
read answer
|
read answer
|
||||||
if [[ $answer != "y" ]]; then
|
if [[ $answer != "y" ]]; then
|
||||||
echo "Reboot aborted."
|
echo "Installation reboot aborted."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
sudo shutdown -r now || install_error "Unable to execute shutdown"
|
sudo shutdown -r now || install_error "Unable to execute shutdown"
|
||||||
|
Loading…
Reference in New Issue
Block a user