Update public server config.

[config] / systemfiles / nginx.conf

diff --git a/systemfiles/nginx.conf b/systemfiles/nginx.conf
index 5b9b028cd4085fe292f95fd0899e0556307ab0e4..4bb06e5fd7902ea731b6b136af38d2c19dd27708 100644 (file)
--- a/systemfiles/nginx.conf
+++ b/systemfiles/nginx.conf
@@ -15,6 +15,9 @@ http {
             text/plain                            txt;
             text/plain                            sh;
             application/xhtml+xml                 xhtml;
+            application/pdf                       pdf;
+            image/jpeg                            jpg jpeg;
+            image/png                             png;
         }
         default_type application/octet_stream;
         charset utf-8;
@@ -23,18 +26,58 @@ http {
        access_log /var/log/nginx/access.log;
        error_log /var/log/nginx/error.log;
 
-        # file server
+        # enforce https
         server {
-                location / {
+                listen 80;
+                return 301 https://$host$request_uri;
+        }
+
+        # IRC logs
+        server {
+                listen 443 ssl;
+                server_name dump.plomlompom.com;
+                ssl_certificate /etc/letsencrypt/live/dump.plomlompom.com/fullchain.pem;
+                ssl_certificate_key /etc/letsencrypt/live/dump.plomlompom.com/privkey.pem;
+                root /var/www/html/;
+                location /lifelog/ {
+                        autoindex on;
+                }
+                location /dump/ {
+                        autoindex on;
+                }
+                location /geheim/ {
+                        auth_basic "geheim geheim";
+                        auth_basic_user_file /var/www/password_geheim;
+                        autoindex on;
+                }
+                location /irclogs/zrolaps/ {
+                        auth_basic "#zrolaps logs";
+                        auth_basic_user_file /var/www/password_irclogs_zrolaps;
+                        autoindex on;
+                }
+                location /irclogs/nodrama.de/ {
+                        auth_basic "#nodrama.de logs";
+                        auth_basic_user_file /var/www/password_irclogs_nodrama_de;
+                        autoindex on;
+                }
+                location /irclogs/freakazoid/ {
+                        auth_basic "#freakazoid logs";
+                        auth_basic_user_file /var/www/password_irclogs_freakazoid;
+                        autoindex on;
+                }
+                location /lesekreis/ {
+                        auth_basic "Quellen Lesekreis";
+                        auth_basic_user_file /var/www/password_lesekreis;
                         autoindex on;
-                        root /data/www;
                 }
         }
 
         # htwtxt
         server {
-                listen 8080;
-                #server_name htwtxt.plomlompom.com;
+                listen 443 ssl;
+                server_name htwtxt.plomlompom.com;
+                ssl_certificate /etc/letsencrypt/live/htwtxt.plomlompom.com/fullchain.pem;
+                ssl_certificate_key /etc/letsencrypt/live/htwtxt.plomlompom.com/privkey.pem;
                 location / {
                         proxy_pass http://127.0.0.1:8000;
                 }