From 1f10a08489d809142b74ebbd3a774dc2c1fcabf4 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Sat, 4 Jul 2015 21:23:14 +0100 Subject: [PATCH 01/26] version 4.4.10 Update to version 4.4.10 --- scripts/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upstream_version b/scripts/upstream_version index e85d0f4..97b0809 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.12 +4.4.10 From d43172d1ff81799c1ebd03eb4007298f3ce2a9ad Mon Sep 17 00:00:00 2001 From: polytan02 Date: Sat, 4 Jul 2015 21:29:11 +0100 Subject: [PATCH 02/26] new download server Phpmyadmin has stopped using sourceforge servers hence this update. --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 73afc81..b3431d2 100755 --- a/scripts/install +++ b/scripts/install @@ -24,7 +24,7 @@ final_path=/var/www/phpmyadmin sudo rm -rf $final_path sudo mkdir -p $final_path echo "Downloading phpMyAdmin $version..." -sudo wget -O ../phpMyAdmin.tar.gz http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz/download > /dev/null 2>&1 +sudo wget -O ../phpMyAdmin.tar.gz https://files.phpmyadmin.net/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz > /dev/null 2>&1 echo "Extracting to $final_path..." sudo tar xvzf ../phpMyAdmin.tar.gz -C .. > /dev/null 2>&1 sudo cp -r ../phpMyAdmin-$version-all-languages/* $final_path From 729a9bd73a675ed66d5531d2693c168c397b7fcd Mon Sep 17 00:00:00 2001 From: polytan02 Date: Sat, 4 Jul 2015 21:35:24 +0100 Subject: [PATCH 03/26] update to new download server Phpmyadmin has changed download servers. They left sourceforge. --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0a83cad..b3850e1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ version=$(cat upstream_version) sudo rm -rf $final_path sudo mkdir -p $final_path echo "Downloading phpMyAdmin $version..." -sudo wget -O ../phpMyAdmin.tar.gz http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz/download > /dev/null 2>&1 +sudo wget -O ../phpMyAdmin.tar.gz https://files.phpmyadmin.net/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz > /dev/null 2>&1 echo "Extracting to $final_path..." sudo tar xvzf ../phpMyAdmin.tar.gz -C .. > /dev/null 2>&1 sudo cp -r ../phpMyAdmin-$version-all-languages/* $final_path From 042572d3108d3abbd2fd088d583968e932624fd9 Mon Sep 17 00:00:00 2001 From: Matlink Date: Mon, 6 Jul 2015 21:26:58 +0200 Subject: [PATCH 04/26] 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 05/26] 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 06/26] 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 07/26] 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 08/26] 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 09/26] 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 10/26] 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 From 6579761b8c9cf2358e23f47111924e98d740dcf4 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Mon, 10 Aug 2015 00:19:25 +0100 Subject: [PATCH 11/26] Release 4.4.13.1 Release 4.4.13.1 --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index 64d67ff..d4d4e31 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.12 +4.4.13.1 From 9c825c5d3f64572df6ca8025c974881e4946ea0d Mon Sep 17 00:00:00 2001 From: polytan02 Date: Fri, 21 Aug 2015 23:52:21 +0100 Subject: [PATCH 12/26] Release 4.4.14 --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index d4d4e31..f6d64ee 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.13.1 +4.4.14 From 2ce21b626964bdee299297618b85f04c437aaa1a Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 8 Aug 2015 23:39:41 +0200 Subject: [PATCH 13/26] SQL fies have moved --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6e61be3..a905fb2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,8 +32,8 @@ db_user=phpmyadmin db_pwd=$(sudo yunohost app setting phpmyadmin mysqlpwd) # Update tables -mysql -u $db_user -p$db_pwd < $final_path/examples/upgrade_column_info_4_3_0+.sql -mysql -u $db_user -p$db_pwd < $final_path/examples/create_tables.sql +mysql -u $db_user -p$db_pwd < $final_path/sql/upgrade_column_info_4_3_0+.sql +mysql -u $db_user -p$db_pwd < $final_path/sql/create_tables.sql # Configuration echo "Configuring application..." From ecc81216e73cff28105f8c74082c041c5152a121 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Thu, 27 Aug 2015 00:25:43 +0200 Subject: [PATCH 14/26] Remove executable permissions --- scripts/install | 0 scripts/remove | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 scripts/install mode change 100755 => 100644 scripts/remove diff --git a/scripts/install b/scripts/install old mode 100755 new mode 100644 diff --git a/scripts/remove b/scripts/remove old mode 100755 new mode 100644 From 867e8933756a9524eee7e5613a1dfd9d9ab5746f Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 22 Nov 2015 16:17:33 +0100 Subject: [PATCH 15/26] [enh] Add services list in manifest --- manifest.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifest.json b/manifest.json index efaa7ac..5ebbd61 100644 --- a/manifest.json +++ b/manifest.json @@ -11,6 +11,11 @@ "email": "julien.malik@paraiso.me" }, "multi_instance": "false", + "services": [ + "nginx", + "php5-fpm", + "mysql" + ], "arguments": { "install" : [ { From 37381ba48f50b5b9a50d90515a4ff958c1ad39f9 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Sat, 28 Nov 2015 14:04:04 +0000 Subject: [PATCH 16/26] Release 4.5.2 Release 4.5.2 --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index f6d64ee..6cedcff 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.14 +4.5.2 From 78df89ad275eb52f2f0f80a210f8cc34de04c95d Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 5 Jan 2016 08:58:32 +0000 Subject: [PATCH 17/26] Update upstream_version --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index 6cedcff..6a8d4e6 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.5.2 +4.5.3.1 From 717c95b37035f837ca0b1880270baed5135fedab Mon Sep 17 00:00:00 2001 From: Matlink Date: Thu, 14 Jan 2016 12:36:07 +0100 Subject: [PATCH 18/26] Add 4.5.3.1 tables in conf file --- conf/config.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/config.inc.php b/conf/config.inc.php index df7b67f..f940bcc 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -73,6 +73,10 @@ $cfg['Servers'][$i]['favorite'] = 'pma__favorite'; $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; $cfg['Servers'][$i]['tracking'] = 'pma__tracking'; +// 4.5.3.1 update +$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings'; +$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; + /* Contrib / Swekey authentication */ // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; From bce62fc73f441e18736c99b31583856e45b62699 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Mon, 8 Feb 2016 10:06:11 +0000 Subject: [PATCH 19/26] Update to release 4.5.4.1 --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index 6a8d4e6..05c3897 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.5.3.1 +4.5.4.1 From b96002dada44409cd4ae7207f8677bff30fb101d Mon Sep 17 00:00:00 2001 From: Josue-T Date: Wed, 2 Mar 2016 11:39:08 +0100 Subject: [PATCH 20/26] SQL files have moved --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1e2145d..38cd234 100644 --- a/scripts/install +++ b/scripts/install @@ -37,7 +37,7 @@ cookie_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0- sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/create_db.sql sudo yunohost app initdb $db_user -p $db_pwd mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_db.sql -mysql -u $db_user -p$db_pwd < $final_path/examples/create_tables.sql +mysql -u $db_user -p$db_pwd < $final_path/sql/create_tables.sql sudo yunohost app setting phpmyadmin mysqlpwd -v $db_pwd # Configuration From 45377235a9110fe4a1e9e5ac723f8fdc7b58361a Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Mon, 28 Mar 2016 18:47:53 +0200 Subject: [PATCH 21/26] add "packaging_format" key to manifest.json Following the decision taken during last meeting. See "## Format version (packaging_version)" here http://pv.yunohost.org/meeting/63-yunohost-3-2016/ --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index 5ebbd61..9f215fd 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,7 @@ { "name": "phpMyAdmin", "id": "phpmyadmin", + "packaging_format": 1, "description": { "en": "Manage MySQL databases over the web", "fr": "Application web de gestion des bases de données MySQL" From fd083edc12e1fb9aa408e01bcd364132f21a15e9 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Sun, 3 Apr 2016 13:04:33 +0200 Subject: [PATCH 22/26] [enh] remove cookie-auth-mode specific setting that we don't use (fix #36) --- conf/config.inc.php | 7 ++++++- scripts/install | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index f940bcc..58d8bed 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -14,7 +14,12 @@ * This is needed for cookie based authentication to encrypt password in * cookie */ -$cfg['blowfish_secret'] = 'YNH_COOKIE_PASSWD'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +/* [YunoHost] + * We use the 'config' auth mode, so we don't care about settings + * specific to the 'cookie' auth mode + */ +$cfg['blowfish_secret'] = 'NOT_USED'; + /* * Servers configuration diff --git a/scripts/install b/scripts/install index 38cd234..9a86ac4 100644 --- a/scripts/install +++ b/scripts/install @@ -33,7 +33,6 @@ sudo cp -r ../phpMyAdmin-$version-all-languages/* $final_path echo "Setting up database..." db_user=phpmyadmin db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p') -cookie_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p') sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/create_db.sql sudo yunohost app initdb $db_user -p $db_pwd mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_db.sql @@ -46,7 +45,6 @@ sed -i "s@YNH_DOMAIN@$domain@g" ../conf/config.inc.php sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/config.inc.php sed -i "s@YNH_PMA_PASSWORD@$db_pwd@g" ../conf/config.inc.php sed -i "s@YNH_MYSQL_ROOT_PASSWORD@$(sudo cat /etc/yunohost/mysql)@g" ../conf/config.inc.php -sed -i "s@YNH_COOKIE_PASSWD@$cookie_pwd@g" ../conf/config.inc.php sudo cp ../conf/config.inc.php $final_path sudo yunohost app addaccess phpmyadmin -u $admin From c704cf03b73afaab0445f2fad45ace13c7e007e7 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Sun, 3 Apr 2016 23:45:08 +0200 Subject: [PATCH 23/26] Update to upstream 4.6.0 --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index 05c3897..6016e8a 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.5.4.1 +4.6.0 From 5cc733fa0771fa55c4f561e6c09bab563367a9a8 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Sun, 3 Apr 2016 23:46:13 +0200 Subject: [PATCH 24/26] Fix permissions update, otherwise getting command line too long for chmod --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 9a86ac4..31cba03 100644 --- a/scripts/install +++ b/scripts/install @@ -53,8 +53,8 @@ sudo yunohost app setting phpmyadmin admin -v $admin # Files owned by root, www-data can just read echo "Setting permission..." sudo chown -R root: $final_path -sudo find $final_path -type f | xargs sudo chmod 644 -sudo find $final_path -type d | xargs sudo chmod 755 +sudo find $final_path -type f -exec chmod 644 {} \; +sudo find $final_path -type d -exec chmod 755 {} \; # config.inc.php contains sensitive data, restrict its access sudo chown root:www-data $final_path/config.inc.php sudo chmod 640 $final_path/config.inc.php diff --git a/scripts/upgrade b/scripts/upgrade index a905fb2..0d61af0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,8 +49,8 @@ sudo yunohost app setting phpmyadmin admin -v $admin # Files owned by root, www-data can just read echo "Setting permission..." sudo chown -R root: $final_path -sudo find $final_path -type f | xargs sudo chmod 644 -sudo find $final_path -type d | xargs sudo chmod 755 +sudo find $final_path -type f -exec chmod 644 {} \; +sudo find $final_path -type d -exec chmod 755 {} \; # config.inc.php contains sensitive data, restrict its access sudo chown root:www-data $final_path/config.inc.php sudo chmod 640 $final_path/config.inc.php From 7b6a0959fa2d7b4ddb48a76c45f598cf0cea6ef9 Mon Sep 17 00:00:00 2001 From: opi Date: Tue, 14 Jun 2016 10:14:30 +0200 Subject: [PATCH 25/26] [up] PhpMyAdmin 4.6.2 Contain some security fixes. - Install tested on YunoHost 2.4, Jessie on ARM board - Upgrade from current stable release (4.6.0) tested on YunoHost 2.4, Jessie on ARM board --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index 6016e8a..c78c496 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.6.0 +4.6.2 From 5708b27de9643311a4135a4279fbcaadaf218ef8 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Tue, 28 Jun 2016 14:05:34 +0100 Subject: [PATCH 26/26] Update the latst sources Update to version 4.6.3 --- conf/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/upstream_version b/conf/upstream_version index c78c496..83da99b 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.6.2 +4.6.3