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

1 files changed, 2 insertions, 6 deletions

diff --git a/roles/webmail/files/etc/nginx/sites-available/roundcube b/roles/webmail/files/etc/nginx/sites-available/roundcube
index fe67615..1297834 100644
--- a/roles/webmail/files/etc/nginx/sites-available/roundcube
+++ b/roles/webmail/files/etc/nginx/sites-available/roundcube
@@ -2,72 +2,68 @@ server {
 
     listen      80;
     listen [::]:80;
 
     server_name  mail.fripost.org;
 
     access_log  /var/log/nginx/roundcube.access.log;
     error_log   /var/log/nginx/roundcube.error.log info;
 
     return 301 https://$host$request_uri;
 }
 
 
 server {
     listen      443;
     listen [::]:443;
 
     server_name  mail.fripost.org;
     root         /var/lib/roundcube;
 
-    include include.d/ssl;
-    # include the intermediate certificate, see
-    # - https://www.ssllabs.com/ssltest/analyze.html?d=mail.fripost.org
-    # - http://nginx.org/en/docs/http/configuring_https_servers.html
+    include snippets/ssl.conf;
     ssl_certificate     /etc/nginx/ssl/mail.fripost.org.chained.pem;
     ssl_certificate_key /etc/nginx/ssl/mail.fripost.org.key;
 
     location = /favicon.ico {
         root          /usr/share/roundcube/skins/default/images;
         log_not_found off;
         access_log    off;
         expires       max;
     }
 
     location = /robots.txt {
         allow         all;
         log_not_found off;
         access_log    off;
     }
 
     # Deny all attempts to access hidden files, or files under hidden
     # directories.
     location ~ /\. { return 404; }
 
     access_log  /var/log/nginx/roundcube.access.log;
     error_log   /var/log/nginx/roundcube.error.log info;
 
     index index.php;
     client_max_body_size 64m;
     location = /index.php {
-        include fastcgi/php;
-        include fastcgi/php-ssl;
+        include snippets/fastcgi-php-ssl.conf;
 
         # From /var/lib/roundcube/.htaccess
         fastcgi_param PHP_VALUE "upload_max_filesize=25M
                                  post_max_size=30M
                                  memory_limit=64M
                                  session.gc_maxlifetime=21600
                                  session.gc_divisor=500
                                  session.gc_probability=1";
         fastcgi_param PHP_ADMIN_VALUE "open_basedir=$document_root:/usr/share/roundcube:/etc/roundcube:/var/log/roundcube:/usr/share/php:/usr/share/javascript:/usr/share/tinymce:/usr/share/misc/magic
                                        upload_tmp_dir=$document_root/temp";
     }
 
     # Security rules
     location ~ ^/(README|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
         return 404;
     }
     location ~ ^/(bin|SQL)/ {
         return 404;
     }
 }