bofh/triton_files
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve config

Browse Source
This commit is contained in:
root
2018-03-27 01:11:56 +02:00
parent ea2aab5715
commit 62861295b0
2 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
nginx.conf
View File

@@ -1,19 +1,17 @@
# -*-nginx-*- # -*-nginx-*-
user www-data; user www-data;
worker_processes 1; worker_processes auto;
#error_log logs/error.log; error_log logs/error.log;
#error_log logs/error.log notice; #error_log logs/error.log notice;
#error_log logs/error.log info; #error_log logs/error.log info;
#pid logs/nginx.pid; #pid logs/nginx.pid;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
include mime.types; include mime.types;
default_type application/octet-stream; default_type application/octet-stream;
@@ -27,44 +25,12 @@ http {
sendfile on; sendfile on;
#tcp_nopush on; #tcp_nopush on;
#keepalive_timeout 0;
keepalive_timeout 65; keepalive_timeout 65;
#gzip on; #gzip on;
# another virtual host using mix of IP-, name-, and port-based configuration server_tokens off;
# more_clear_headers Server;
#server {
# listen 8000;
# listen somename:8080;
# server_name somename alias another.alias;
# location / {
# root html;
# index index.html index.htm;
# }
#}
# HTTPS server
#
#server {
# listen 443 ssl;
# server_name localhost;
# ssl_certificate cert.pem;
# ssl_certificate_key cert.key;
# ssl_session_cache shared:SSL:1m;
# ssl_session_timeout 5m;
# ssl_ciphers HIGH:!aNULL:!MD5;
# ssl_prefer_server_ciphers on;
# location / {
# root html;
# index index.html index.htm;
# }
#}
include /usr/local/nginx/conf/nginx_ldap.conf; include /usr/local/nginx/conf/nginx_ldap.conf;
include /usr/local/nginx/conf/sites-enabled/*.conf; include /usr/local/nginx/conf/sites-enabled/*.conf;
@@ -75,14 +41,19 @@ http {
server { server {
listen 80 default_server; listen 80 default_server;
server_name "";# 128.131.95.208; server_name "";# 128.131.95.208;
return 503; return 302 https://triton.fet.at;
} }
server { server {
listen 443 default_server; listen 443 ssl http2 default_server;
server_name "";# 128.131.95.208; server_name "";# 128.131.95.208;
ssl_certificate /etc/letsencrypt/live/triton.fet.at/fullchain.pem; ssl_certificate /etc/letsencrypt/live/triton.fet.at/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/triton.fet.at/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/triton.fet.at/privkey.pem;
return 503;# http://$host$request_uri; #444 ssl_trusted_certificate /etc/letsencrypt/live/triton.fet.at/chain.pem;
}
include snippets/ssl.conf;
# return 503;# http://$host$request_uri; #444
return 302 https://triton.fet.at;
}
} }

4
nginx_ldap.conf
View File

@@ -2,8 +2,6 @@
auth_ldap_cache_enabled on; auth_ldap_cache_enabled on;
ldap_server fet { ldap_server fet {
url ldap://192.168.86.18:389/ou=user,dc=fet,dc=htu,dc=tuwien,dc=ac,dc=at?uid?sub?(objectClass=person); # gagarin url ldap://gagarin:389/ou=user,dc=fet,dc=htu,dc=tuwien,dc=ac,dc=at?uid?sub?(objectClass=person);
binddn 'uid=pschlechter,ou=user,dc=fet,dc=htu,dc=tuwien,dc=ac,dc=at';
binddn_passwd '4vDB_JcaE7kR';
require valid_user; require valid_user;
} }