From f6bfa9b6d99a624658f6b4bbc1466ae68b013bc4 Mon Sep 17 00:00:00 2001
From: Owain Jones <owanes@noc.ac.uk>
Date: Mon, 15 Feb 2016 14:36:48 +0000
Subject: [PATCH] updated nginx configs
---
apc.nginx.conf | 3 +--
elasticsearch.nginx.conf | 3 +--
gliders.nginx.conf | 6 +++---
hhvm.nginx.conf | 9 +++++++++
hhvm.service | 2 +-
install.sh | 4 ++--
phpci.nginx.conf | 3 +--
phpmyadmin.nginx.conf | 3 +--
8 files changed, 19 insertions(+), 14 deletions(-)
create mode 100644 hhvm.nginx.conf
diff --git a/apc.nginx.conf b/apc.nginx.conf
index d2ebef4..4e2da65 100644
--- a/apc.nginx.conf
+++ b/apc.nginx.conf
@@ -1,8 +1,7 @@
server {
listen 80;
- listen 8080;
- server_name apc.dev.gliders.vm;
+ server_name apc.dev.gliders.*;
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 6deed80..c1f428c 100644
--- a/elasticsearch.nginx.conf
+++ b/elasticsearch.nginx.conf
@@ -1,8 +1,7 @@
server {
listen 80;
- listen 8080;
- server_name es.dev.gliders.vm;
+ server_name es.dev.gliders.*;
location / {
proxy_pass http://127.0.0.1:9200;
}
diff --git a/gliders.nginx.conf b/gliders.nginx.conf
index 4b1c661..25472bc 100644
--- a/gliders.nginx.conf
+++ b/gliders.nginx.conf
@@ -16,7 +16,7 @@ map $host $symfony_root_dev {
server {
listen 80;
- server_name gliders.vm gliders.odj.me;
+ server_name gliders.*;
root $symfony_root/web;
error_log /var/log/nginx/gliders.error.log;
@@ -67,7 +67,7 @@ server {
# pass the PHP scripts to FastCGI server from upstream phpfcgi
location ~ ^/(app|app_dev|config)\.php(/|$) {
- fastcgi_pass phpfcgi;
+ fastcgi_pass hhvmfcgi;
include fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
fastcgi_param SCRIPT_FILENAME $symfony_root/web$fastcgi_script_name;
@@ -78,7 +78,7 @@ server {
server {
listen 80;
- server_name dev.gliders.vm dev.gliders.odj.me;
+ server_name dev.gliders.*;
root $symfony_root_dev/web;
diff --git a/hhvm.nginx.conf b/hhvm.nginx.conf
new file mode 100644
index 0000000..d90e2f0
--- /dev/null
+++ b/hhvm.nginx.conf
@@ -0,0 +1,9 @@
+server {
+ listen 80;
+
+ server_name hhvm.dev.gliders.*;
+ location / {
+ fastcgi_pass 127.0.0.1:9001;
+ include fastcgi_params;
+ }
+}
diff --git a/hhvm.service b/hhvm.service
index 6c4a92b..619f06d 100644
--- a/hhvm.service
+++ b/hhvm.service
@@ -4,7 +4,7 @@ Description=HHVM HipHop Virtual Machine (FCGI)
[Service]
ExecStartPre=/bin/mkdir -p /var/run/hhvm
ExecStartPre=/bin/chown -R gliders:nginx /var/run/hhvm
-ExecStart=/usr/local/bin/hhvm --user gliders --mode daemon -d hhvm.server.type=fastcgi -d hhvm.server.file_socket=/var/run/hhvm/sock
+ExecStart=/usr/local/bin/hhvm --user gliders --mode daemon -d hhvm.server.type=fastcgi -d hhvm.server.file_socket=/var/run/hhvm/sock -d hhvm.admin_server.port=9001 -d hhvm.admin_server.password=gliders9876
[Install]
WantedBy=multi-user.target
diff --git a/install.sh b/install.sh
index af5fc8f..4e40eb4 100644
--- a/install.sh
+++ b/install.sh
@@ -87,7 +87,7 @@ mkdir -p /var/gliders/logs /var/gliders/www/ /var/gliders/www_dev/
chmod -R g+x /home/gliders
chown -R gliders:nginx /var/gliders
cp nginx.conf /etc/nginx/
-cp gliders.nginx.conf /etc/nginx/conf.d/
+cp *.nginx.conf /etc/nginx/conf.d/
chown gliders:nginx /etc/nginx/conf.d/gliders.nginx.conf # allow gliders user to edit their nginx config?
systemctl enable nginx
@@ -103,7 +103,7 @@ systemctl start firewalld
firewall-cmd --permanent --zone=public --add-service=ssh
firewall-cmd --permanent --zone=public --add-service=http
firewall-cmd --permanent --zone=public --add-service=https
-firewall-cmd --permanent --zone=public --add-service=8080/tcp # port 8080 for dev branch of site
+firewall-cmd --permanent --zone=public --add-service=8000/tcp # port 8080 for dev branch of site
firewall-cmd --reload
# Set the system timezone to UTC
diff --git a/phpci.nginx.conf b/phpci.nginx.conf
index a4cd0e1..f887d3e 100644
--- a/phpci.nginx.conf
+++ b/phpci.nginx.conf
@@ -6,9 +6,8 @@
server {
listen 80;
- listen 8080;
- server_name phpci.dev.gliders.vm;
+ server_name phpci.dev.gliders.*;
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 688d64e..0fc08df 100644
--- a/phpmyadmin.nginx.conf
+++ b/phpmyadmin.nginx.conf
@@ -1,10 +1,9 @@
# Configuration for phpMyAdmin -- set it up to use php-fpm etc.
server {
listen 80;
- listen 8081;
root /home/gliders/phpma;
index index.php index.html index.htm;
- server_name _; # update with actual hostname when we get it
+ server_name phpma.dev.gliders.*; # update with actual hostname when we get it
location / {
try_files $uri $uri/ /index.php;
--
GitLab