From 042572d3108d3abbd2fd088d583968e932624fd9 Mon Sep 17 00:00:00 2001 From: Matlink Date: Mon, 6 Jul 2015 21:26:58 +0200 Subject: [PATCH 1/7] Update upstream_version --- scripts/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upstream_version b/scripts/upstream_version index 97b0809..793ea8a 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.10 +4.4.11 From 8d3c0d3843ae55a16a1378e75bb9cbce6840a294 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 7 Jul 2015 22:00:35 +0100 Subject: [PATCH 2/7] add of dedicated php-fpm process --- conf/php-fpm.conf | 243 ++++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 8 ++ scripts/remove | 2 + scripts/upgrade | 8 ++ 4 files changed, 261 insertions(+) create mode 100644 conf/php-fpm.conf diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf new file mode 100644 index 0000000..a12bf95 --- /dev/null +++ b/conf/php-fpm.conf @@ -0,0 +1,243 @@ +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[NAMETOCHANGE] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = /var/run/php5-fpm-NAMETOCHANGE.sock + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = -1 + +; 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 +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; 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. +; Default Values: user and group are set as the running user +; mode is set to 0666 +listen.owner = www-data +listen.group = www-data +listen.mode = 0600 + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = www-data +group = www-data + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives: +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes to be created when pm is set to 'dynamic'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. +; Note: Used when pm is set to either 'static' or 'dynamic' +; Note: This value is mandatory. +pm.max_children = 6 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 3 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 3 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 5 + +; 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. +; Default Value: 0 +pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. By default, the status page shows the following +; information: +; accepted conn - the number of request accepted by the pool; +; pool - the name of the pool; +; process manager - static or dynamic; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes. +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic') +; The values of 'idle processes', 'active processes' and 'total processes' are +; updated each second. The value of 'accepted conn' is updated in real time. +; Example output: +; accepted conn: 12073 +; pool: www +; process manager: static +; idle processes: 35 +; active processes: 65 +; total processes: 100 +; max children reached: 1 +; By default the status page output is formatted as text/plain. Passing either +; 'html' or 'json' as a query string will return the corresponding output +; syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +pm.status_path = /fpm-status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; 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 = 120s + +; 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 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 + +; Set open file descriptor rlimit. +; Default Value: system defined value +rlimit_files = 4096 + +; 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 +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +chdir = /var/www/NAMETOCHANGE + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; 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'. +; 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. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M + +php_value[upload_max_filesize] = 50M +php_value[post_max_size] = 50M +php_value[mail.add_x_header] = Off diff --git a/scripts/install b/scripts/install index b3431d2..5e9a4ae 100755 --- a/scripts/install +++ b/scripts/install @@ -70,5 +70,13 @@ sudo cp ../conf/nginx.conf $nginxconf sudo chown root: $nginxconf sudo chmod 600 $nginxconf +# Add dedicated php-fpm to be able to upload bigger database +sed -i "s@NAMETOCHANGE@phpmyadmin@g" ../conf/php-fpm.conf +phpfpmconf=/etc/php5/fpm/pool.d/phpmyadmin.conf +sudo cp ../conf/php-fpm.conf $phpfpmconf +sudo chown root: $phpfpmconf +sudo chmod 644 $phpfpmconf + +sudo service php5-fpm restart sudo service nginx reload sudo yunohost app ssowatconf diff --git a/scripts/remove b/scripts/remove index e43e1a9..1a7b687 100755 --- a/scripts/remove +++ b/scripts/remove @@ -4,7 +4,9 @@ domain=$(sudo yunohost app setting phpmyadmin domain) sudo rm -rf /var/www/phpmyadmin sudo rm -f /etc/nginx/conf.d/$domain.d/phpmyadmin.conf +sudo rm -f /etc/php5/fpm/pool.d/phpmyadmin.conf +sudo service php5-fpm restart sudo service nginx reload db_user=phpmyadmin diff --git a/scripts/upgrade b/scripts/upgrade index b3850e1..7c21586 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,5 +64,13 @@ sudo cp ../conf/nginx.conf $nginxconf sudo chown root: $nginxconf sudo chmod 600 $nginxconf +# Add dedicated php-fpm to be able to upload bigger database +sed -i "s@NAMETOCHANGE@phpmyadmin@g" ../conf/php-fpm.conf +phpfpmconf=/etc/php5/fpm/pool.d/phpmyadmin.conf +sudo cp ../conf/php-fpm.conf $phpfpmconf +sudo chown root: $phpfpmconf +sudo chmod 644 $phpfpmconf + +sudo service php5-fpm restart sudo service nginx reload sudo yunohost app ssowatconf From 3e9a202c9b7f4e0099cef785f0447ed450301a8e Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 7 Jul 2015 22:02:26 +0100 Subject: [PATCH 3/7] relocation of version into correct folder cleaning --- {scripts => conf}/upstream_version | 0 scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => conf}/upstream_version (100%) diff --git a/scripts/upstream_version b/conf/upstream_version similarity index 100% rename from scripts/upstream_version rename to conf/upstream_version diff --git a/scripts/install b/scripts/install index 5e9a4ae..0997983 100755 --- a/scripts/install +++ b/scripts/install @@ -19,7 +19,7 @@ if [[ ! $? -eq 0 ]]; then fi # Copy files to the right place -version=$(cat upstream_version) +version=$(cat ../conf/upstream_version) final_path=/var/www/phpmyadmin sudo rm -rf $final_path sudo mkdir -p $final_path diff --git a/scripts/upgrade b/scripts/upgrade index 7c21586..83b76e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,7 +17,7 @@ fi # Copy files to the right place final_path=/var/www/phpmyadmin -version=$(cat upstream_version) +version=$(cat ../conf/upstream_version) sudo rm -rf $final_path sudo mkdir -p $final_path echo "Downloading phpMyAdmin $version..." From e8e0bcf10e0e08eb0eaa94e8a09b344dc38b2d6a Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 7 Jul 2015 22:03:49 +0100 Subject: [PATCH 4/7] version 4.4.11 available --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index 97b0809..793ea8a 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.10 +4.4.11 From 52b5f220c7ba6c729e6011781d435de9d28873b1 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 7 Jul 2015 22:05:55 +0100 Subject: [PATCH 5/7] initial commit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..43fbf19 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# phpmyadmin for yunohost + +* https://www.phpmyadmin.net/ + From 00233e833418b947a515b4b658d806000559c91c Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 14 Jul 2015 08:26:47 +0100 Subject: [PATCH 6/7] Use of dedicated php-fpm in nginx --- conf/nginx.conf | 3 ++- scripts/install | 1 + scripts/upgrade | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index c5870f3..eb9c385 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,10 +4,11 @@ location YNH_WWW_PATH { rewrite ^ https://$server_name$request_uri? permanent; } index index.php; + client_max_body_size 50M; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_pass unix:/var/run/php5-fpm-NAMETOCHANGE.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; diff --git a/scripts/install b/scripts/install index 0997983..1e2145d 100755 --- a/scripts/install +++ b/scripts/install @@ -65,6 +65,7 @@ sudo chmod 640 $final_path/config.inc.php echo "Setting up nginx configuration..." sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf +sed -i "s@NAMETOCHANGE@phpmyadmin@g" ../conf/nginx.conf nginxconf=/etc/nginx/conf.d/$domain.d/phpmyadmin.conf sudo cp ../conf/nginx.conf $nginxconf sudo chown root: $nginxconf diff --git a/scripts/upgrade b/scripts/upgrade index 83b76e8..6e61be3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -59,6 +59,7 @@ sudo chmod 640 $final_path/config.inc.php echo "Setting up nginx configuration..." sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf +sed -i "s@NAMETOCHANGE@phpmyadmin@g" ../conf/nginx.conf nginxconf=/etc/nginx/conf.d/$domain.d/phpmyadmin.conf sudo cp ../conf/nginx.conf $nginxconf sudo chown root: $nginxconf From 77e9fabe22afa8f194bd5e41ded3134c55b8fd7b Mon Sep 17 00:00:00 2001 From: polytan02 Date: Sun, 26 Jul 2015 22:54:08 +0100 Subject: [PATCH 7/7] Release 4.4.12 --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index 793ea8a..64d67ff 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.11 +4.4.12