diff --git a/apc.nginx.conf b/apc.nginx.conf index 4e2da657a6ae12aae936c123654f2f690367214a..09302b418ac66a86c5db578b11ecc71bcbd3e382 100644 --- a/apc.nginx.conf +++ b/apc.nginx.conf @@ -1,7 +1,7 @@ server { listen 80; - server_name apc.dev.gliders.*; + server_name apc.dev.*; root /home/gliders/code/APC-Admin; error_log /var/log/nginx/apc.error.log; diff --git a/elasticsearch.nginx.conf b/elasticsearch.nginx.conf index c1f428c88c0cae5bd77e6de93ac65efaee3900e7..ad7496689a6d4523a51ccd78989a469e52ee5e95 100644 --- a/elasticsearch.nginx.conf +++ b/elasticsearch.nginx.conf @@ -1,7 +1,7 @@ server { listen 80; - server_name es.dev.gliders.*; + server_name es.dev.*; location / { proxy_pass http://127.0.0.1:9200; } diff --git a/hhvm.nginx.conf b/hhvm.nginx.conf index d90e2f0ff2900d07179d9c4b49ac567bf655019a..a10deda3fe8a3f01ee0291b08da6bf6919241bdb 100644 --- a/hhvm.nginx.conf +++ b/hhvm.nginx.conf @@ -1,7 +1,7 @@ server { listen 80; - server_name hhvm.dev.gliders.*; + server_name hhvm.dev.*; location / { fastcgi_pass 127.0.0.1:9001; include fastcgi_params; diff --git a/install.sh b/install.sh index 4e40eb469a25f479f9617ef34fbc1a2eaa5c462c..53002440c6fcff561c7902e9811cd1ae5f1fced7 100644 --- a/install.sh +++ b/install.sh @@ -56,7 +56,7 @@ systemctl enable elasticsearch yum install -y MySQL-python python-sqlalchemy # Install PHP -yum install -y php php-fpm php-apc php-pdo php-mcrypt php-mbstring php-pecl-runkit +yum install -y php php-fpm php-apc php-pdo php-mcrypt php-mbstring php-pecl-runkit phpmyadmin cp php.ini /etc/php.ini cp php-d-fpm.ini /etc/php.d/fpm.ini cp php-fpm-www.conf /etc/php-fpm.d/www.conf diff --git a/phpci.nginx.conf b/phpci.nginx.conf index f887d3e54e243db533418282806898779038d314..6aed3885d0191935c54cdd1eee881f525ee17cf3 100644 --- a/phpci.nginx.conf +++ b/phpci.nginx.conf @@ -7,7 +7,7 @@ server { listen 80; - server_name phpci.dev.gliders.*; + server_name phpci.dev.*; root /home/gliders/code/phpci/public; error_log /var/log/nginx/phpci.error.log; diff --git a/phpmyadmin.nginx.conf b/phpmyadmin.nginx.conf index 0fc08df0549f2b69144d52ec6055fffd5e1a38e9..7b9dc171cc8dc0a97dce080087efbda1f9a422b8 100644 --- a/phpmyadmin.nginx.conf +++ b/phpmyadmin.nginx.conf @@ -1,9 +1,10 @@ # Configuration for phpMyAdmin -- set it up to use php-fpm etc. server { listen 80; - root /home/gliders/phpma; + # root /home/gliders/phpma; + root /usr/share/phpMyAdmin; index index.php index.html index.htm; - server_name phpma.dev.gliders.*; # update with actual hostname when we get it + server_name phpma.dev.*; # update with actual hostname when we get it location / { try_files $uri $uri/ /index.php;