update phpMyAdmin

This commit is contained in:
Michael RICOIS 2015-11-18 15:24:58 +01:00
parent 28a3494786
commit 284992565d
7 changed files with 25 additions and 25 deletions

View File

@ -5,7 +5,7 @@ DIR=/vagrant
DIRDATA=$DIR/data DIRDATA=$DIR/data
MYSQL_PASS=scores MYSQL_PASS=scores
MARIADB_VERSION="10.0" MARIADB_VERSION="10.0"
PHPMYADMIN_VERSION="4.4.7" PHPMYADMIN_VERSION="4.4.14"
if [ -f $DIR/action.upgrade ] if [ -f $DIR/action.upgrade ]
then then

View File

@ -2,8 +2,8 @@
ServerName phpmyadmin.sd.dev ServerName phpmyadmin.sd.dev
UseCanonicalName On UseCanonicalName On
UseCanonicalPhysicalPort On UseCanonicalPhysicalPort On
DocumentRoot /home/vhosts/phpMyAdmin-4.3.7-all-languages DocumentRoot /home/vhosts/phpMyAdmin-4.4.10-all-languages
<Directory /home/vhosts/phpMyAdmin-4.3.7-all-languages/> <Directory /home/vhosts/phpMyAdmin-4.4.10-all-languages/>
EnableSendfile Off EnableSendfile Off
AllowOverride all AllowOverride all
Order allow,deny Order allow,deny

View File

@ -1,11 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VAGRANTDEV=1 VARGANTDEV=1
DIR=/vagrant DIR=/vagrant
DIRDATA=$DIR/data DIRDATA=$DIR/data
MYSQL_PASS=scores MYSQL_PASS=scores
MARIADB_VERSION="10.0" MARIADB_VERSION="10.0"
PHPMYADMIN_VERSION="4.4.10" PHPMYADMIN_VERSION="4.5.1"
# --- Add a file action.upgrade to perfom a system upgrade # --- Add a file action.upgrade to perfom a system upgrade
if [ -f $DIR/action.upgrade ] if [ -f $DIR/action.upgrade ]
@ -128,9 +128,24 @@ fi
# --- Disable all website # --- Disable all website
cd /etc/apache2/sites-available/ cd /etc/apache2/sites-available/
DVHOSTS='' for f in *.conf; do
for f in *.conf; do DVHOSTS+=" $f"; done; if [ $f = "000-default.conf" ]; then
sudo a2dissite $DVHOSTS continue
fi
if [ $f = "default-ssl.conf" ]; then
continue
fi
sudo a2dissite $f;
sudo rm -vf /etc/apache2/sites-available/$f;
done;
# --- phpmyadmin.sd.dev && test.sd.dev
cp -f $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
cp -f $DIRDATA/Apache/test.conf /etc/apache2/sites-available/test.conf
if [ ! -d /home/vhosts/test ]
then
sudo mkdir /home/vhosts/test
fi
# --- Copy Vhosts files # --- Copy Vhosts files
VHOSTS='000-default.conf' VHOSTS='000-default.conf'
@ -142,7 +157,6 @@ for f in *.conf; do
if [ $f = "default-ssl.conf" ]; then if [ $f = "default-ssl.conf" ]; then
continue continue
fi fi
sudo rm -vf /etc/apache2/sites-available/$f;
if [ -f $f ] if [ -f $f ]
then then
sudo cp -vf $f /etc/apache2/sites-available/; sudo cp -vf $f /etc/apache2/sites-available/;
@ -150,20 +164,6 @@ for f in *.conf; do
fi fi
done; done;
# --- PhpMyAdmin / test.sd.lan
if [ ! -f $DIR/vhosts/phpmyadmin.conf ]
then
cp $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
fi
if [ ! -f $DIR/vhosts/test.conf ]
then
cp $DIRDATA/Apache/test.conf /etc/apache2/sites-available/test.conf
if [ ! -d /home/vhosts/test ]
then
sudo mkdir /home/vhosts/test
fi
fi
sudo a2ensite $VHOSTS sudo a2ensite $VHOSTS
# --- Restart apache # --- Restart apache

View File

@ -2,8 +2,8 @@
ServerName phpmyadmin.sd.dev ServerName phpmyadmin.sd.dev
UseCanonicalName On UseCanonicalName On
UseCanonicalPhysicalPort On UseCanonicalPhysicalPort On
DocumentRoot /home/vhosts/phpMyAdmin-4.4.10-all-languages DocumentRoot /home/vhosts/phpMyAdmin-4.5.1-all-languages
<Directory /home/vhosts/phpMyAdmin-4.4.10-all-languages/> <Directory /home/vhosts/phpMyAdmin-4.5.1-all-languages/>
EnableSendfile Off EnableSendfile Off
AllowOverride all AllowOverride all
Require all granted Require all granted