scores/envdev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://git@192.168.78.240:22/envdev.git

Browse Source 
Conflicts:
	lamp-trusty64/bootstrap.sh
This commit is contained in:
Michael RICOIS 2015-12-14 12:19:15 +01:00
commit 6247b7dc41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lamp-trusty64/bootstrap.sh
View File

@ -4,8 +4,8 @@ VARGANTDEV=1
DIR=/vagrant
DIRDATA=$DIR/data
MYSQL_PASS=scores
MARIADB_VERSION="10.0"
PHPMYADMIN_VERSION="4.5.2"
MARIADB_VERSION="10.0"
PHPMYADMIN_VERSION="4.5.2"
# --- Add a file action.upgrade to perfom a system upgrade
if [ -f $DIR/action.upgrade ]