nginx: Move include.d/* to snippets/.

4 files changed, 73 insertions, 0 deletions

diff --git a/roles/common-web/files/etc/nginx/snippets/fastcgi-php-ssl.conf b/roles/common-web/files/etc/nginx/snippets/fastcgi-php-ssl.conf
new file mode 100644
index 0000000..ebf3aa0
--- /dev/null
+++ b/roles/common-web/files/etc/nginx/snippets/fastcgi-php-ssl.conf
@@ -0,0 +1,10 @@
+# PHP only.
+# Credits to http://claylo.com/post/7617674014/ssl-php-fpm-and-nginx
+
+include snippets/fastcgi-php.conf;
+
+fastcgi_param HTTPS					on;
+fastcgi_param SSL_PROTOCOL			$ssl_protocol;
+fastcgi_param SSL_CIPHER			$ssl_cipher;
+fastcgi_param SSL_SESSION_ID		$ssl_session_id;
+fastcgi_param SSL_CLIENT_VERIFY		$ssl_client_verify;
diff --git a/roles/common-web/files/etc/nginx/snippets/fastcgi-php.conf b/roles/common-web/files/etc/nginx/snippets/fastcgi-php.conf
new file mode 100644
index 0000000..5823909
--- /dev/null
+++ b/roles/common-web/files/etc/nginx/snippets/fastcgi-php.conf
@@ -0,0 +1,10 @@
+# cf. http://wiki.nginx.org/Pitfalls#Passing_Uncontrolled_Requests_to_PHP
+try_files $uri $uri/ =404;
+
+include 		snippets/fastcgi.conf;
+# required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param	REDIRECT_STATUS	200;
+
+fastcgi_intercept_errors 	on;
+fastcgi_read_timeout 		14400; 
+fastcgi_pass				unix:/var/run/php5-fpm.sock;
diff --git a/roles/common-web/files/etc/nginx/snippets/fastcgi.conf b/roles/common-web/files/etc/nginx/snippets/fastcgi.conf
new file mode 100644
index 0000000..80132ec
--- /dev/null
+++ b/roles/common-web/files/etc/nginx/snippets/fastcgi.conf
@@ -0,0 +1,23 @@
+fastcgi_param   QUERY_STRING        $query_string;
+fastcgi_param   REQUEST_METHOD      $request_method;
+fastcgi_param   CONTENT_TYPE        $content_type;
+fastcgi_param   CONTENT_LENGTH      $content_length;
+
+fastcgi_param   SCRIPT_FILENAME     $document_root$fastcgi_script_name;
+fastcgi_param   SCRIPT_NAME         $fastcgi_script_name;
+fastcgi_param   PATH_INFO           $fastcgi_path_info;
+fastcgi_param   REQUEST_URI         $request_uri;
+fastcgi_param   DOCUMENT_URI        $document_uri;
+fastcgi_param   DOCUMENT_ROOT       $document_root;
+fastcgi_param   SERVER_PROTOCOL     $server_protocol;
+
+fastcgi_param   GATEWAY_INTERFACE   CGI/1.1;
+fastcgi_param   SERVER_SOFTWARE     nginx/$nginx_version;
+
+fastcgi_param   REMOTE_ADDR         $remote_addr;
+fastcgi_param   REMOTE_PORT         $remote_port;
+fastcgi_param   SERVER_ADDR         $server_addr;
+fastcgi_param   SERVER_PORT         $server_port;
+fastcgi_param   SERVER_NAME         $server_name;
+
+fastcgi_param   HTTPS               $https;
diff --git a/roles/common-web/files/etc/nginx/snippets/ssl.conf b/roles/common-web/files/etc/nginx/snippets/ssl.conf
new file mode 100644
index 0000000..429b667
--- /dev/null
+++ b/roles/common-web/files/etc/nginx/snippets/ssl.conf
@@ -0,0 +1,30 @@
+# https://wiki.mozilla.org/Security/Server_Side_TLS
+# https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=nginx-1.6.2&openssl=1.0.1k&hsts=yes&profile=intermediate
+
+# certs sent to the client in SERVER HELLO are concatenated in ssl_certificate
+# ~$ cat /etc/nginx/ssl/srvcert.pem /usr/share/lets-encrypt/lets-encrypt-x1-cross-signed.pem | sudo tee /etc/nginx/ssl/srvcert.chained.pem
+
+ssl on;
+
+ssl_session_timeout 1d;
+ssl_session_cache shared:SSL:50m;
+ssl_session_tickets off;
+
+# Diffie-Hellman parameter for DHE ciphersuites, recommended 2048 bits
+ssl_dhparam /etc/ssl/private/dhparams.pem;
+
+# intermediate configuration. tweak to your needs.
+ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
+ssl_prefer_server_ciphers on;
+
+# HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
+add_header Strict-Transport-Security 'max-age=15768000; includeSubdomains';
+
+# OCSP Stapling: fetch OCSP records from URL in ssl_certificate and cache them
+# https://github.com/jsha/ocsp-stapling-examples/blob/master/nginx.conf
+ssl_stapling on;
+ssl_stapling_verify on;
+
+# verify chain of trust of OCSP response using Root CA and Intermediate certs
+ssl_trusted_certificate /usr/share/lets-encrypt/lets-encrypt-x1-cross-signed.pem;