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-15 11:17:40 +01:00
commit a0ab54f0e9
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

@ -147,8 +147,8 @@ for f in *.conf; do
done;
# --- phpmyadmin.sd.dev
cp -f $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
sed -i -e "s/VERSION/$PHPMYADMIN_VERSION/" $DIR/vhosts/phpmyadmin.conf
cp -f $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
sed -i -e "s/VERSION/$PHPMYADMIN_VERSION/" $DIR/vhosts/phpmyadmin.conf
# --- test.sd.dev
cp -f $DIRDATA/Apache/test.conf /etc/apache2/sites-available/test.conf