added config files for elasticsearch and phpCI

elasticsearch.nginx.conf

+server {
+    listen 80;
+    listen 8080;
+
+    server_name es.dev.gliders.vm;
+    location / {
+        proxy_pass http://127.0.0.1:9200;
+    }
+}

elasticsearch.repo

+[elasticsearch-2.x]
+name=Elasticsearch repository for 2.x packages
+baseurl=http://packages.elastic.co/elasticsearch/2.x/centos
+gpgcheck=1
+gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
+enabled=1

gliders.nginx.conf

@@ -8,15 +8,11 @@ map $host $symfony_root {
     default /home/gliders/code/gliders-website;
 }
 
-upstream phpfcgi {
-    server unix:/var/run/php5-fpm.sock; #for PHP-FPM running on UNIX socket
-}
-
 server {
     listen 80;
     listen 8080;
 
-    server_name gliders.vm *.gliders.vm;
+    server_name gliders.vm dev.gliders.vm;
     root $symfony_root/web;
 
     error_log /var/log/nginx/gliders.error.log;
@@ -26,12 +22,12 @@ server {
     rewrite ^/app\.php/?(.*)$ /$1 permanent;
 
     location / {
-        index app.php;
+        index app_dev.php;
         try_files $uri @rewriteapp;
     }
 
     location @rewriteapp {
-        rewrite ^(.*)$ /app.php/$1 last;
+        rewrite ^(.*)$ /app_dev.php/$1 last;
     }
 
     # pass the PHP scripts to FastCGI server from upstream phpfcgi
@@ -78,4 +74,4 @@ server {
 #         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 #         fastcgi_param HTTPS on;
 #     }
-# }
\ No newline at end of file
+# }

install.sh

@@ -30,6 +30,7 @@ yum install python-inotify numpy python-matplotlib python-virtualenv
 python -m easy_install pip
 pip install pandas
 pip install css-html-js-minify
+pip install bcrypt
 
 # Install (& configure) sendmail
 yum install sendmail sendmail-cf m4
@@ -94,4 +95,4 @@ git clone git@gitlab.noc.soton.ac.uk:owanes/gliders-testwebsite.git
 
 # Restart (needed to get firewall to open ports for web, kernel might be
 # updated etc.)
-reboot
\ No newline at end of file
+reboot

nginx.conf

@@ -33,6 +33,11 @@ http {
     
     include             /etc/nginx/mime.types;
     default_type        application/octet-stream;
+    charset             utf-8;
+
+    upstream phpfcgi {
+        server unix:/var/run/php5-fpm.sock; #for PHP-FPM running on UNIX socket
+    }
 
     # Load modular configuration files from the /etc/nginx/conf.d directory.
     # See http://nginx.org/en/docs/ngx_core_module.html#include

phpci.nginx.conf

+# https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/
+# NOTE: This makes any .php file other than app, app_dev and config.php
+# downloadable. If you want one to run, add it to the "pass the PHP scripts to
+# upstream FCGI" location section below. Be careful adding PHP files with
+# sensitive data like passwords inside them.
+
+server {
+    listen 80;
+    listen 8080;
+
+    server_name phpci.dev.gliders.vm;
+    root /home/gliders/code/phpci/public;
+
+    error_log /var/log/nginx/phpci.error.log;
+    access_log /var/log/nginx/phpci.access.log;
+
+    location / {
+        try_files $uri @phpci;
+    }
+
+    # pass the PHP scripts to FastCGI server from upstream phpfcgi
+    location @phpci {
+        fastcgi_pass phpfcgi;
+        fastcgi_index index.php;
+        fastcgi_buffers 256 4k;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root/index.php;
+        fastcgi_param SCRIPT_NAME index.php;
+        fastcgi_param HTTPS off;
+    }
+}
+
+# We don't yet have an SSL cert (not like a VM on my own machine needs one...)
+# server {
+#     listen 443;
+# 
+#     server_name gliders.vm *.gliders.vm;
+#     root /home/gliders/code/gliders-website/web;
+# 
+#     ssl on;
+#     ssl_certificate /etc/ssl/certs/symfony2.crt;
+#     ssl_certificate_key /etc/ssl/private/symfony2.key;
+# 
+#     error_log /var/log/nginx/symfony2.error.log;
+#     access_log /var/log/nginx/symfony2.access.log;
+# 
+#     # strip app.php/ prefix if it is present
+#     rewrite ^/app\.php/?(.*)$ /$1 permanent;
+# 
+#     location / {
+#         index app.php;
+#         try_files $uri @rewriteapp;
+#     }
+# 
+#     location @rewriteapp {
+#         rewrite ^(.*)$ /app.php/$1 last;
+#     }
+# 
+#     # pass the PHP scripts to FastCGI server from upstream phpfcgi
+#     location ~ ^/(app|app_dev|config)\.php(/|$) {
+#         fastcgi_pass phpfcgi;
+#         fastcgi_split_path_info ^(.+\.php)(/.*)$;
+#         include fastcgi_params;
+#         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+#         fastcgi_param HTTPS on;
+#     }
+# }