From 3728f035e3db8eb43461f81d3c6335c01191e8d2 Mon Sep 17 00:00:00 2001
From: Gliders User <gliders@wheel.noc.soton.ac.uk>
Date: Mon, 15 Feb 2016 15:43:35 +0000
Subject: [PATCH] removed gliders. constraint on development virtual host
domain names
---
apc.nginx.conf | 2 +-
elasticsearch.nginx.conf | 2 +-
hhvm.nginx.conf | 2 +-
install.sh | 2 +-
phpci.nginx.conf | 2 +-
phpmyadmin.nginx.conf | 5 +++--
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/apc.nginx.conf b/apc.nginx.conf
index 4e2da65..09302b4 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 c1f428c..ad74966 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 d90e2f0..a10deda 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 4e40eb4..5300244 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 f887d3e..6aed388 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 0fc08df..7b9dc17 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;
--
GitLab