From 4e92de26e696904554ba58d9925ce1af3dab416d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 31 Mar 2020 02:03:44 +0200 Subject: [PATCH] try to update source to 0.9.5 --- conf/php-fpm.conf | 30 +++++++++++++++--------------- manifest.json | 2 +- scripts/backup | 6 +++--- scripts/install | 4 ++-- scripts/restore | 14 +++++++------- scripts/upgrade | 4 ++-- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 8affbc2..9f3942f 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -30,7 +30,7 @@ group = __USER__ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php5-fpm-__NAMETOCHANGE__.sock +listen = /var/run/php7.2-fpm-__NAMETOCHANGE__.sock ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) @@ -38,13 +38,13 @@ listen = /var/run/php5-fpm-__NAMETOCHANGE__.sock ; Set permissions for unix socket, if one is used. In Linux, read/write ; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. +; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0660 listen.owner = www-data listen.group = www-data ;listen.mode = 0660 - + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original ; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address @@ -117,7 +117,7 @@ pm.max_spare_servers = 3 ; Note: Used only when pm is set to 'ondemand' ; Default Value: 10s ;pm.process_idle_timeout = 10s; - + ; The number of requests each child process should execute before respawning. ; This can be useful to work around memory leaks in 3rd party libraries. For ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. @@ -170,7 +170,7 @@ pm.max_requests = 500 ; ; By default the status page only outputs short status. Passing 'full' in the ; query string will also return status for each pool process. -; Example: +; Example: ; http://www.foo.bar/status?full ; http://www.foo.bar/status?json&full ; http://www.foo.bar/status?html&full @@ -283,7 +283,7 @@ pm.max_requests = 500 ; - .... ; %p: PID of the child that serviced the request ; %P: PID of the parent of the child that serviced the request -; %q: the query string +; %q: the query string ; %Q: the '?' character if query string exists ; %r: the request URI (without the query string, see %q and %Q) ; %R: remote IP address @@ -298,40 +298,40 @@ pm.max_requests = 500 ; ; Default: "%R - %u %t \"%m %r\" %s" ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - + ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set slowlog = /var/log/nginx/__NAMETOCHANGE__.slow.log - + ; The timeout for serving a single request after which a PHP backtrace will be ; dumped to the 'slowlog' file. A value of '0s' means 'off'. ; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) ; Default Value: 0 request_slowlog_timeout = 5s - + ; The timeout for serving a single request after which the worker process will ; be killed. This option should be used when the 'max_execution_time' ini option ; does not stop script execution for some reason. A value of '0' means 'off'. ; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) ; Default Value: 0 request_terminate_timeout = 1d - + ; Set open file descriptor rlimit. ; Default Value: system defined value ;rlimit_files = 1024 - + ; Set max core size rlimit. ; Possible Values: 'unlimited' or an integer greater or equal to 0 ; Default Value: system defined value ;rlimit_core = 0 - + ; Chroot to this directory at the start. This value must be defined as an ; absolute path. When this value is not set, chroot is not used. ; Note: you can prefix with '$prefix' to chroot to the pool prefix or one ; of its subdirectories. If the pool prefix is not set, the global prefix ; will be used instead. -; Note: chrooting is a great security feature and should be used whenever +; Note: chrooting is a great security feature and should be used whenever ; possible. However, all PHP paths will be relative to the chroot ; (error_log, sessions.save_path, ...). ; Default Value: not set @@ -356,7 +356,7 @@ catch_workers_output = yes ; Note: set an empty value to allow all extensions. ; Default Value: .php ;security.limit_extensions = .php .php3 .php4 .php5 - + ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from ; the current environment. ; Default Value: clean env @@ -370,7 +370,7 @@ catch_workers_output = yes ; overwrite the values previously defined in the php.ini. The directives are the ; same as the PHP SAPI: ; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. +; be overwritten from PHP call 'ini_set'. ; php_admin_value/php_admin_flag - these directives won't be overwritten by ; PHP call 'ini_set' ; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. diff --git a/manifest.json b/manifest.json index c4b3781..9912a59 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm" + "php7.2-fpm" ], "arguments": { "install" : [ diff --git a/scripts/backup b/scripts/backup index 7b2dac6..63031a1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -48,10 +48,10 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_backup "/etc/php5/fpm/pool.d/$app.conf" -ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini" +ynh_backup "/etc/php7.2/fpm/pool.d/$app.conf" +ynh_backup "/etc/php7.2/fpm/conf.d/20-$app.ini" -# Backup directory location for the app from where the script is executed and +# Backup directory location for the app from where the script is executed and # which will be compressed afterward backup_dir=$YNH_APP_BACKUP_DIR diff --git a/scripts/install b/scripts/install index 908093e..379791b 100644 --- a/scripts/install +++ b/scripts/install @@ -53,9 +53,9 @@ ynh_app_setting_set $app is_public $is_public # Install dependency to convert tracks to a readable format for the browser #================================================= -if [ "$(lsb_release --codename --short)" != "jessie" ] +if [ "$(lsb_release --codename --short)" != "jessie" ] then - ynh_install_app_dependencies php-sqlite3 + ynh_install_app_dependencies php7.2-sqlite3 else ynh_install_app_dependencies php5-sqlite fi diff --git a/scripts/restore b/scripts/restore index 043dfe2..68bdcf8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -71,10 +71,10 @@ chown -R $app:$app $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -if [ "$(lsb_release --codename --short)" != "jessie" ] +if [ "$(lsb_release --codename --short)" != "jessie" ] then - ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf" - ynh_restore_file "/etc/php/7.0/fpm/conf.d/20-$app.ini" + ynh_restore_file "/etc/php/7.2/fpm/pool.d/$app.conf" + ynh_restore_file "/etc/php/7.2/fpm/conf.d/20-$app.ini" else ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf" ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" @@ -86,9 +86,9 @@ fi # REINSTALL DEPENDENCIES #================================================= -if [ "$(lsb_release --codename --short)" != "jessie" ] +if [ "$(lsb_release --codename --short)" != "jessie" ] then - ynh_install_app_dependencies php7.0-sqlite3 + ynh_install_app_dependencies php7.2-sqlite3 else ynh_install_app_dependencies php5-sqlite fi @@ -98,9 +98,9 @@ fi #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -if [ "$(lsb_release --codename --short)" != "jessie" ] +if [ "$(lsb_release --codename --short)" != "jessie" ] then - systemctl reload php7.0-fpm + systemctl reload php7.2-fpm else systemctl reload php5-fpm fi diff --git a/scripts/upgrade b/scripts/upgrade index 8490bf5..f9c7584 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,9 +55,9 @@ ynh_abort_if_errors # Install dependency to convert tracks to a readable format for the browser #================================================= -if [ "$(lsb_release --codename --short)" != "jessie" ] +if [ "$(lsb_release --codename --short)" != "jessie" ] then - ynh_install_app_dependencies php-sqlite3 + ynh_install_app_dependencies php7.2-sqlite3 else ynh_install_app_dependencies php5-sqlite fi