@@ -34,7 +34,7 @@ debconf-set-selections <<< "mysql-server mysql-server/root_password password $BO
3434debconf-set-selections <<< " mysql-server mysql-server/root_password_again password $BOX_DBPASS"
3535
3636# @todo: apache-http2
37- # apt-add-repository ppa:ondrej/apache2 -y
37+ apt-add-repository ppa:ondrej/apache2 -y
3838apt-add-repository ppa:ondrej/php -y
3939apt-add-repository ppa:chris-lea/redis-server -y
4040apt-add-repository ppa:chris-lea/libsodium -y
@@ -61,11 +61,16 @@ php7.1-interbase firebird2.5-superclassic \
6161php7.1-imagick imagemagick \
6262redis-server libsodium-dev
6363
64- # Setup Some PHP-FPM Options
65- echo " xdebug.remote_enable = 1" >> /etc/php/7.1/mods-available/xdebug.ini
66- echo " xdebug.remote_connect_back = 1" >> /etc/php/7.1/mods-available/xdebug.ini
67- echo " xdebug.remote_port = 9000" >> /etc/php/7.1/mods-available/xdebug.ini
68- echo " xdebug.max_nesting_level = 512" >> /etc/php/7.1/mods-available/xdebug.ini
64+ # Setup Some PHP Options
65+
66+ XDEBUG_INI="
67+ xdebug.remote_enable = 1
68+ xdebug.remote_connect_back = 1
69+ xdebug.remote_port = 9000
70+ xdebug.max_nesting_level = 512
71+ "
72+ echo " ${XDEBUG_INI} " >> /etc/php/7.1/mods-available/xdebug.ini
73+
6974echo " opcache.revalidate_freq = 0" >> /etc/php/7.1/mods-available/opcache.ini
7075
7176sed -i " s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/7.1/apache2/php.ini
@@ -115,9 +120,13 @@ ln -sf /etc/php/7.1/mods-available/redis.ini /etc/php/7.1/cli/conf.d/20-redis.in
115120# APCU
116121pecl install apcu
117122
118- echo " extension=apcu.so" > /etc/php/7.1/mods-available/apcu.ini
119- echo " apc.enable=1" >> /etc/php/7.1/mods-available/apcu.ini
120- echo " apc.enable_cli=1" >> /etc/php/7.1/mods-available/apcu.ini
123+ APCU_INI="
124+ extension=apcu.so
125+ apc.enable=1
126+ apc.enable_cli=1
127+ "
128+
129+ echo " ${APCU_INI} " >> /etc/php/7.1/mods-available/apcu.ini
121130
122131ln -sf /etc/php/7.1/mods-available/apcu.ini /etc/php/7.1/apache2/conf.d/20-apcu.ini
123132ln -sf /etc/php/7.1/mods-available/apcu.ini /etc/php/7.1/cli/conf.d/20-apcu.ini
@@ -150,6 +159,8 @@ tar -xf ${MY_ODBC}.tar.gz && cd ${MY_ODBC}
150159cp bin/* /usr/local/bin && cp lib/* /usr/local/lib && myodbc-installer -d -a -n " MySQL" -t " DRIVER=/usr/local/lib/libmyodbc5w.so;"
151160cd /home/vagrant && rm -rf ${MY_ODBC} && rm ${MY_ODBC} .tar.gz
152161
162+ ln -s /var/lib/mysql/mysql.sock /tmp/mysql.sock
163+
153164# PHPMyAdmin
154165PMA=" phpMyAdmin-4.7.1-all-languages"
155166wget -nv https://files.phpmyadmin.net/phpMyAdmin/4.7.1/${PMA} .tar.gz
@@ -175,7 +186,7 @@ CONFIG_PHPMYADMIN="<?php
175186
176187"
177188
178- echo ${CONFIG_PHPMYADMIN} > " /usr/share/phpmyadmin/config.inc.php"
189+ echo " ${CONFIG_PHPMYADMIN} " > /usr/share/phpmyadmin/config.inc.php
179190
180191ALIAS_PHPMYADMIN=" Alias /phpmyadmin " /usr/share/phpmyadmin/"
181192<Directory " /usr/share/phpmyadmin/" >
@@ -185,7 +196,7 @@ ALIAS_PHPMYADMIN="Alias /phpmyadmin "/usr/share/phpmyadmin/"
185196</Directory>
186197"
187198
188- echo ${ALIAS_PHPMYADMIN} >> " /etc/apache2/conf-available/$BOX_NAME -aliases.conf"
199+ echo " ${ALIAS_PHPMYADMIN} " >> " /etc/apache2/conf-available/$BOX_NAME -aliases.conf"
189200
190201# Configure Firebird
191202CONFIG_FIREBIRD="
@@ -194,7 +205,9 @@ DatabaseAccess = Full
194205ExternalFileAccess = Full
195206UdfAccess = Full
196207"
197- echo ${CONFIG_FIREBIRD} >> " /etc/firebird/2.5/firebird.conf"
208+
209+ echo " ${CONFIG_FIREBIRD} " >> /etc/firebird/2.5/firebird.conf
210+ echo " ${CONFIG_FIREBIRD} " >> /etc/firebird/3.0/firebird.conf
198211
199212# MSSQL
200213ACCEPT_EULA=Y apt-get install -y mssql-server mssql-server-fts mssql-server-agent mssql-tools msodbcsql
@@ -215,6 +228,15 @@ ln -sf /etc/php/7.1/mods-available/sqlsrv.ini /etc/php/7.1/cli/conf.d/20-sqlsrv.
215228ln -sf /etc/php/7.1/mods-available/pdo_sqlsrv.ini /etc/php/7.1/apache2/conf.d/20-pdo_sqlsrv.ini
216229ln -sf /etc/php/7.1/mods-available/pdo_sqlsrv.ini /etc/php/7.1/cli/conf.d/20-pdo_sqlsrv.ini
217230
231+
232+ ODBC_INI="
233+ [MSSQLTest]
234+ Driver = ODBC Driver 13 for SQL Server
235+ Server = localhost,1433
236+ "
237+ echo " ${ODBC_INI} " >> /etc/odbc.ini
238+
239+
218240# Apache
219241sed -i " s/www-data/vagrant/" /etc/apache2/envvars
220242
@@ -263,6 +285,7 @@ openssl req -new -x509 -config ${PATH_CNF} -out${PATH_CRT} -days 365 2>/dev/null
263285BOX_DEFAULT_HOST=" <VirtualHost *:80>
264286 ServerAdmin webmaster@localhost
265287 DocumentRoot $BOX_DOCROOT
288+ Protocols h2c http/1.1
266289
267290 <Directory $BOX_DOCROOT >
268291 AllowOverride All
@@ -276,13 +299,14 @@ BOX_DEFAULT_HOST="<VirtualHost *:80>
276299</VirtualHost>
277300"
278301
279- echo ${BOX_DEFAULT_HOST} > " /etc/apache2/sites-available/$BOX_NAME .conf"
302+ echo " ${BOX_DEFAULT_HOST} " > " /etc/apache2/sites-available/$BOX_NAME .conf"
280303ln -fs " /etc/apache2/sites-available/$BOX_NAME .conf" " /etc/apache2/sites-enabled/$BOX_NAME .conf"
281304
282305BOX_SSL=" <IfModule mod_ssl.c>
283306 <VirtualHost *:443>
284307 ServerAdmin webmaster@localhost
285308 DocumentRoot $BOX_DOCROOT
309+ Protocols h2 http/1.1
286310
287311 <Directory $BOX_DOCROOT >
288312 AllowOverride All
@@ -309,11 +333,12 @@ BOX_SSL="<IfModule mod_ssl.c>
309333</IfModule>
310334"
311335
312- echo ${BOX_SSL} > " /etc/apache2/sites-available/$BOX_NAME -ssl.conf"
336+ echo " ${BOX_SSL} " > " /etc/apache2/sites-available/$BOX_NAME -ssl.conf"
313337ln -fs " /etc/apache2/sites-available/$BOX_NAME -ssl.conf" " /etc/apache2/sites-enabled/$BOX_NAME -ssl.conf"
314338
315339a2dissite 000-default
316340a2enmod ssl
341+ a2enmod http2
317342
318343ps auxw | grep apache2 | grep -v grep > /dev/null
319344
0 commit comments