From 18fb134de8f4a99abd2b2f32c8d717bdebc4f08b Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 24 Jan 2015 14:23:56 +0100 Subject: [PATCH 01/20] 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 7e7f33c..3bcca12 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.7 +4.3.8 From 7ab38ce09bfbe5c4557568fb5ebc1e12c50b7383 Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 7 Feb 2015 11:20:47 +0100 Subject: [PATCH 02/20] 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 3bcca12..7de8a1d 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.8 +4.3.9 From b1cc4bb8390ce3ef857adb4517eca48ef80795fc Mon Sep 17 00:00:00 2001 From: matlink Date: Wed, 4 Mar 2015 19:23:06 +0100 Subject: [PATCH 03/20] [upd] to last version --- conf/config.inc.php | 1 + scripts/upstream_version | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index 8d2ad29..df7b67f 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -71,6 +71,7 @@ $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; $cfg['Servers'][$i]['favorite'] = 'pma__favorite'; $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; +$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; /* Contrib / Swekey authentication */ // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; diff --git a/scripts/upstream_version b/scripts/upstream_version index 7de8a1d..4d827cd 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.9 +4.3.11 From b47e5d825f8fbd2076bb2b1aa93735239e6a2c6a Mon Sep 17 00:00:00 2001 From: matlink Date: Wed, 4 Mar 2015 19:25:06 +0100 Subject: [PATCH 04/20] [upd] last version, remove useless folder --- malik/.gitignore | 1 - malik/conf/config.inc.php | 163 --------------------------------- malik/conf/create_db.sql | 27 ------ malik/conf/nginx.conf | 20 ---- malik/manifest.json | 46 ---------- malik/scripts/install | 74 --------------- malik/scripts/remove | 13 --- malik/scripts/upgrade | 68 -------------- malik/scripts/upstream_version | 1 - scripts/upstream_version | 2 +- 10 files changed, 1 insertion(+), 414 deletions(-) delete mode 100644 malik/.gitignore delete mode 100644 malik/conf/config.inc.php delete mode 100644 malik/conf/create_db.sql delete mode 100644 malik/conf/nginx.conf delete mode 100644 malik/manifest.json delete mode 100755 malik/scripts/install delete mode 100755 malik/scripts/remove delete mode 100644 malik/scripts/upgrade delete mode 100644 malik/scripts/upstream_version diff --git a/malik/.gitignore b/malik/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/malik/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/malik/conf/config.inc.php b/malik/conf/config.inc.php deleted file mode 100644 index df7b67f..0000000 --- a/malik/conf/config.inc.php +++ /dev/null @@ -1,163 +0,0 @@ -. - * - * @package PhpMyAdmin - */ - -/* - * 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! */ - -/* - * Servers configuration - */ -$i = 0; - -/* - * First server - */ -$i++; -/* Authentication type */ -$cfg['Servers'][$i]['auth_type'] = 'config'; -$cfg['Servers'][$i]['user'] = 'root'; -$cfg['Servers'][$i]['password'] = 'YNH_MYSQL_ROOT_PASSWORD'; -/* Server parameters */ - -/* -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -*/ - -/* Select mysql if your server does not have mysqli */ -$cfg['Servers'][$i]['extension'] = 'mysqli'; -$cfg['Servers'][$i]['AllowNoPassword'] = false; - -/* - * phpMyAdmin configuration storage settings. - */ - -/* User used to manipulate with storage */ -// $cfg['Servers'][$i]['controlhost'] = ''; -// $cfg['Servers'][$i]['controlport'] = ''; -$cfg['Servers'][$i]['controluser'] = 'YNH_PMA_USER'; -$cfg['Servers'][$i]['controlpass'] = 'YNH_PMA_PASSWORD'; - -/* Storage database and tables */ -$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; -$cfg['Servers'][$i]['relation'] = 'pma__relation'; -$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; -$cfg['Servers'][$i]['table_coords'] = 'pma__table_coords'; -$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; -$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; -$cfg['Servers'][$i]['history'] = 'pma__history'; -$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; -$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; -$cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; -$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; -$cfg['Servers'][$i]['recent'] = 'pma__recent'; -$cfg['Servers'][$i]['users'] = 'pma__users'; -$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; -$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; -$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; -$cfg['Servers'][$i]['favorite'] = 'pma__favorite'; -$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; -$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; - -/* Contrib / Swekey authentication */ -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; - -/* - * End of servers configuration - */ - -/* - * Directories for saving/loading files from server - */ -$cfg['UploadDir'] = ''; -$cfg['SaveDir'] = ''; - -/** - * Defines whether a user should be displayed a "show all (records)" - * button in browse mode or not. - * default = false - */ -//$cfg['ShowAll'] = true; - -/** - * Number of rows displayed when browsing a result set. If the result - * set contains more rows, "Previous" and "Next". - * default = 30 - */ -//$cfg['MaxRows'] = 50; - -/** - * disallow editing of binary fields - * valid values are: - * false allow editing - * 'blob' allow editing except for BLOB fields - * 'noblob' disallow editing except for BLOB fields - * 'all' disallow editing - * default = blob - */ -//$cfg['ProtectBinary'] = 'false'; - -/** - * Default language to use, if not browser-defined or user-defined - * (you find all languages in the locale folder) - * uncomment the desired line: - * default = 'en' - */ -//$cfg['DefaultLang'] = 'en'; -//$cfg['DefaultLang'] = 'de'; - -/** - * default display direction (horizontal|vertical|horizontalflipped) - */ -//$cfg['DefaultDisplay'] = 'vertical'; - - -/** - * How many columns should be used for table display of a database? - * (a value larger than 1 results in some information being hidden) - * default = 1 - */ -//$cfg['PropertiesNumColumns'] = 2; - -/** - * Set to true if you want DB-based query history.If false, this utilizes - * JS-routines to display query history (lost by window close) - * - * This requires configuration storage enabled, see above. - * default = false - */ -//$cfg['QueryHistoryDB'] = true; - -/** - * When using DB-based query history, how many entries should be kept? - * - * default = 25 - */ -//$cfg['QueryHistoryMax'] = 100; - -/** - * Should error reporting be enabled for JavaScript errors - * - * default = 'ask' - */ -//$cfg['SendErrorReports'] = 'ask'; - -/* - * You can find more configuration options in the documentation - * in the doc/ folder or at . - */ -?> diff --git a/malik/conf/create_db.sql b/malik/conf/create_db.sql deleted file mode 100644 index aaf4d14..0000000 --- a/malik/conf/create_db.sql +++ /dev/null @@ -1,27 +0,0 @@ --- -------------------------------------------------------- --- SQL Commands to set up the pmadb as described in the documentation. --- --- This file is meant for use with MySQL 5 and above! --- --- This script expects the user pma to already be existing. If we would put a --- line here to create him too many users might just use this script and end --- up with having the same password for the controluser. --- --- This user "pma" must be defined in config.inc.php (controluser/controlpass) --- --- Please don't forget to set up the tablenames in config.inc.php --- - --- -------------------------------------------------------- - -DROP DATABASE `phpmyadmin`; - --- --- Database : `phpmyadmin` --- -CREATE DATABASE IF NOT EXISTS `phpmyadmin` - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -USE phpmyadmin; - -GRANT SELECT, INSERT, DELETE, UPDATE ON `phpmyadmin`.* TO - 'YNH_PMA_USER'@localhost; diff --git a/malik/conf/nginx.conf b/malik/conf/nginx.conf deleted file mode 100644 index c5870f3..0000000 --- a/malik/conf/nginx.conf +++ /dev/null @@ -1,20 +0,0 @@ -location YNH_WWW_PATH { - alias YNH_WWW_ALIAS ; - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; - try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; -} diff --git a/malik/manifest.json b/malik/manifest.json deleted file mode 100644 index efaa7ac..0000000 --- a/malik/manifest.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "phpMyAdmin", - "id": "phpmyadmin", - "description": { - "en": "Manage MySQL databases over the web", - "fr": "Application web de gestion des bases de données MySQL" - }, - "url": "http://www.phpmyadmin.net", - "maintainer": { - "name": "julien", - "email": "julien.malik@paraiso.me" - }, - "multi_instance": "false", - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain", - "ask": { - "en": "Choose a domain for phpMyAdmin", - "fr": "Choisissez un domaine pour phpMyAdmin" - }, - "example": "domain.org" - }, - { - "name": "path", - "type": "path", - "ask": { - "en": "Choose a path for phpMyAdmin", - "fr": "Choisissez un chemin pour phpMyAdmin" - }, - "example": "/phpmyadmin", - "default": "/phpmyadmin" - }, - { - "name": "admin", - "type": "user", - "ask": { - "en": "Choose the only allowed admin user", - "fr": "Choisissez l'unique utilisateur autorisé" - }, - "example": "johndoe" - } - ] - } -} diff --git a/malik/scripts/install b/malik/scripts/install deleted file mode 100755 index 73afc81..0000000 --- a/malik/scripts/install +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -# Retrieve arguments -domain=$1 -path=$2 -admin=$3 - -# Check domain/path availability -sudo yunohost app checkurl $domain$path -a phpmyadmin -if [[ ! $? -eq 0 ]]; then - exit 1 -fi - -# Check that admin user is an existing account -sudo yunohost user list --json | grep -q "\"username\": \"$admin\"" -if [[ ! $? -eq 0 ]]; then - echo "Error : the chosen admin user does not exist" - exit 1 -fi - -# Copy files to the right place -version=$(cat upstream_version) -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 -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 - -# Create db -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 -mysql -u $db_user -p$db_pwd < $final_path/examples/create_tables.sql -sudo yunohost app setting phpmyadmin mysqlpwd -v $db_pwd - -# Configuration -echo "Configuring application..." -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 -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 -# 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 - -# Modify Nginx configuration file and copy it to Nginx conf directory -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 -nginxconf=/etc/nginx/conf.d/$domain.d/phpmyadmin.conf -sudo cp ../conf/nginx.conf $nginxconf -sudo chown root: $nginxconf -sudo chmod 600 $nginxconf - -sudo service nginx reload -sudo yunohost app ssowatconf diff --git a/malik/scripts/remove b/malik/scripts/remove deleted file mode 100755 index e43e1a9..0000000 --- a/malik/scripts/remove +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -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 service nginx reload - -db_user=phpmyadmin -db_name=phpmyadmin -root_pwd=$(sudo cat /etc/yunohost/mysql) -mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;" diff --git a/malik/scripts/upgrade b/malik/scripts/upgrade deleted file mode 100644 index 0a83cad..0000000 --- a/malik/scripts/upgrade +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -# Retrieve arguments -domain=$(sudo yunohost app setting phpmyadmin domain) -path=$(sudo yunohost app setting phpmyadmin path) -admin=$(sudo yunohost app setting phpmyadmin admin) - -# Remove trailing "/" for next commands -path=${path%/} - -# In older version, the admin setting was admin_user -if [[ -z "$admin" ]]; then - admin=$(sudo yunohost app setting phpmyadmin admin_user) - sudo yunohost app setting phpmyadmin admin_user -d - sudo yunohost app setting phpmyadmin admin -v $admin -fi - -# Copy files to the right place -final_path=/var/www/phpmyadmin -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 -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 - -# Database settings -echo "Setting up database..." -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 - -# Configuration -echo "Configuring application..." -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 -sudo cp ../conf/config.inc.php $final_path - -sudo yunohost app addaccess phpmyadmin -u $admin -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 -# 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 - -# Modify Nginx configuration file and copy it to Nginx conf directory -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 -nginxconf=/etc/nginx/conf.d/$domain.d/phpmyadmin.conf -sudo cp ../conf/nginx.conf $nginxconf -sudo chown root: $nginxconf -sudo chmod 600 $nginxconf - -sudo service nginx reload -sudo yunohost app ssowatconf diff --git a/malik/scripts/upstream_version b/malik/scripts/upstream_version deleted file mode 100644 index 5d72fe4..0000000 --- a/malik/scripts/upstream_version +++ /dev/null @@ -1 +0,0 @@ -4.3.10 diff --git a/scripts/upstream_version b/scripts/upstream_version index 4d827cd..f709903 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.11 +4.3.11.1 From cd4296ac88a09f65a85b03d2b7ac9b853def3217 Mon Sep 17 00:00:00 2001 From: Matlink Date: Sun, 15 Mar 2015 16:29:22 +0100 Subject: [PATCH 05/20] [upd] new version --- scripts/upstream_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upstream_version b/scripts/upstream_version index f709903..e85d0f4 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.11.1 +4.3.12 From 5acd2e9e57d49897bd1a05ad1d4fae674b0537a0 Mon Sep 17 00:00:00 2001 From: Matlink Date: Sun, 29 Mar 2015 15:54:54 +0200 Subject: [PATCH 06/20] 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 e85d0f4..dc23cec 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.12 +4.3.13 From 0728d30ff08689a5272e4f45d0f3a3d7128df257 Mon Sep 17 00:00:00 2001 From: Matlink Date: Sun, 5 Apr 2015 14:33:56 +0200 Subject: [PATCH 07/20] 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 dc23cec..fdc6698 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.3.13 +4.4.0 From 970daa4de096534d2f491bd43cbf51cd140d93a3 Mon Sep 17 00:00:00 2001 From: Matlink Date: Fri, 10 Apr 2015 23:49:29 +0200 Subject: [PATCH 08/20] 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 fdc6698..5f57f9f 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.0 +4.4.1.1 From ca8262cfdef528f0dc0bb780979f104ca4048272 Mon Sep 17 00:00:00 2001 From: Matlink Date: Sun, 26 Apr 2015 20:30:52 +0200 Subject: [PATCH 09/20] 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 5f57f9f..cbe06cd 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.1.1 +4.4.4 From 9462218dd6a6f36a4e5456a3231f61dabf68f3bc Mon Sep 17 00:00:00 2001 From: Matlink Date: Fri, 8 May 2015 00:33:30 +0200 Subject: [PATCH 10/20] 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 cbe06cd..b98ff4c 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.4 +4.4.6 From de132a34c5f9c31783d623fda27e5440d425d55b Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 16 May 2015 14:07:33 +0200 Subject: [PATCH 11/20] 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 b98ff4c..c966188 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.6 +4.4.7 From e6d785393fe32fcda9de994b33eccd29354044c1 Mon Sep 17 00:00:00 2001 From: Matlink Date: Mon, 1 Jun 2015 22:34:29 +0200 Subject: [PATCH 12/20] 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 c966188..f12d1f2 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.7 +4.4.8 From 359bda6c3dd0750c0b48b8d217436118e085b84b Mon Sep 17 00:00:00 2001 From: Matlink Date: Thu, 4 Jun 2015 19:37:27 +0200 Subject: [PATCH 13/20] 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 f12d1f2..615a86c 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.8 +4.4.9 From 26838eac2f07ede1c99b79959f9b50f6607f047a Mon Sep 17 00:00:00 2001 From: Matlink Date: Wed, 17 Jun 2015 19:02:34 +0200 Subject: [PATCH 14/20] 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 615a86c..97b0809 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.9 +4.4.10 From e72d33729dec6fbc3b189b30d2a6f1893d58a86a Mon Sep 17 00:00:00 2001 From: Matlink Date: Mon, 6 Jul 2015 21:23:36 +0200 Subject: [PATCH 15/20] 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 801efe22e656f113637d9d7288ffaeadc41334dc Mon Sep 17 00:00:00 2001 From: Matlink Date: Mon, 3 Aug 2015 22:49:50 +0200 Subject: [PATCH 16/20] 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 7a023f1..64d67ff 100644 --- a/scripts/upstream_version +++ b/scripts/upstream_version @@ -1 +1 @@ -4.4.11 \ No newline at end of file +4.4.12 From 2adba4afc0b01d0f197b8435628e268202df6fbb Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 8 Aug 2015 12:25:37 +0200 Subject: [PATCH 17/20] 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 64d67ff..0208476 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.12 +4.4.13 From 6bdeeb7a53c824e5a57f0ee23056da2613c7c1f9 Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 8 Aug 2015 23:37:06 +0200 Subject: [PATCH 18/20] 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 0208476..d4d4e31 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.13 +4.4.13.1 From 1b19eb0e4f366002c99e66a8200344dcb45d9a20 Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 8 Aug 2015 23:39:41 +0200 Subject: [PATCH 19/20] 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 8009a8a5fb46835a717b6031bbddf6874cd8904e Mon Sep 17 00:00:00 2001 From: Matlink Date: Sat, 22 Aug 2015 11:55:49 +0200 Subject: [PATCH 20/20] 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 d4d4e31..f6d64ee 100644 --- a/conf/upstream_version +++ b/conf/upstream_version @@ -1 +1 @@ -4.4.13.1 +4.4.14