Commit f6bfa9b6 authored by Owain Jones's avatar Owain Jones
Browse files

updated nginx configs

parent 1e1e7112
server { server {
listen 80; listen 80;
listen 8080;
server_name apc.dev.gliders.vm; server_name apc.dev.gliders.*;
root /home/gliders/code/APC-Admin; root /home/gliders/code/APC-Admin;
error_log /var/log/nginx/apc.error.log; error_log /var/log/nginx/apc.error.log;
......
server { server {
listen 80; listen 80;
listen 8080;
server_name es.dev.gliders.vm; server_name es.dev.gliders.*;
location / { location / {
proxy_pass http://127.0.0.1:9200; proxy_pass http://127.0.0.1:9200;
} }
......
...@@ -16,7 +16,7 @@ map $host $symfony_root_dev { ...@@ -16,7 +16,7 @@ map $host $symfony_root_dev {
server { server {
listen 80; listen 80;
server_name gliders.vm gliders.odj.me; server_name gliders.*;
root $symfony_root/web; root $symfony_root/web;
error_log /var/log/nginx/gliders.error.log; error_log /var/log/nginx/gliders.error.log;
...@@ -67,7 +67,7 @@ server { ...@@ -67,7 +67,7 @@ server {
# pass the PHP scripts to FastCGI server from upstream phpfcgi # pass the PHP scripts to FastCGI server from upstream phpfcgi
location ~ ^/(app|app_dev|config)\.php(/|$) { location ~ ^/(app|app_dev|config)\.php(/|$) {
fastcgi_pass phpfcgi; fastcgi_pass hhvmfcgi;
include fastcgi_params; include fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_split_path_info ^(.+\.php)(/.*)$;
fastcgi_param SCRIPT_FILENAME $symfony_root/web$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $symfony_root/web$fastcgi_script_name;
...@@ -78,7 +78,7 @@ server { ...@@ -78,7 +78,7 @@ server {
server { server {
listen 80; listen 80;
server_name dev.gliders.vm dev.gliders.odj.me; server_name dev.gliders.*;
root $symfony_root_dev/web; root $symfony_root_dev/web;
......
server {
listen 80;
server_name hhvm.dev.gliders.*;
location / {
fastcgi_pass 127.0.0.1:9001;
include fastcgi_params;
}
}
...@@ -4,7 +4,7 @@ Description=HHVM HipHop Virtual Machine (FCGI) ...@@ -4,7 +4,7 @@ Description=HHVM HipHop Virtual Machine (FCGI)
[Service] [Service]
ExecStartPre=/bin/mkdir -p /var/run/hhvm ExecStartPre=/bin/mkdir -p /var/run/hhvm
ExecStartPre=/bin/chown -R gliders:nginx /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] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
...@@ -87,7 +87,7 @@ mkdir -p /var/gliders/logs /var/gliders/www/ /var/gliders/www_dev/ ...@@ -87,7 +87,7 @@ mkdir -p /var/gliders/logs /var/gliders/www/ /var/gliders/www_dev/
chmod -R g+x /home/gliders chmod -R g+x /home/gliders
chown -R gliders:nginx /var/gliders chown -R gliders:nginx /var/gliders
cp nginx.conf /etc/nginx/ 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? chown gliders:nginx /etc/nginx/conf.d/gliders.nginx.conf # allow gliders user to edit their nginx config?
systemctl enable nginx systemctl enable nginx
...@@ -103,7 +103,7 @@ systemctl start firewalld ...@@ -103,7 +103,7 @@ systemctl start firewalld
firewall-cmd --permanent --zone=public --add-service=ssh firewall-cmd --permanent --zone=public --add-service=ssh
firewall-cmd --permanent --zone=public --add-service=http firewall-cmd --permanent --zone=public --add-service=http
firewall-cmd --permanent --zone=public --add-service=https 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 firewall-cmd --reload
# Set the system timezone to UTC # Set the system timezone to UTC
......
...@@ -6,9 +6,8 @@ ...@@ -6,9 +6,8 @@
server { server {
listen 80; listen 80;
listen 8080;
server_name phpci.dev.gliders.vm; server_name phpci.dev.gliders.*;
root /home/gliders/code/phpci/public; root /home/gliders/code/phpci/public;
error_log /var/log/nginx/phpci.error.log; error_log /var/log/nginx/phpci.error.log;
......
# Configuration for phpMyAdmin -- set it up to use php-fpm etc. # Configuration for phpMyAdmin -- set it up to use php-fpm etc.
server { server {
listen 80; listen 80;
listen 8081;
root /home/gliders/phpma; root /home/gliders/phpma;
index index.php index.html index.htm; 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 / { location / {
try_files $uri $uri/ /index.php; try_files $uri $uri/ /index.php;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment