summary refs log tree commit diff
path: root/nginx/conf
diff options
context:
space:
mode:
Diffstat (limited to 'nginx/conf')
-rw-r--r--nginx/conf/http.conf54
-rw-r--r--nginx/conf/main.conf64
-rw-r--r--nginx/conf/stream.conf12
3 files changed, 0 insertions, 130 deletions
diff --git a/nginx/conf/http.conf b/nginx/conf/http.conf
deleted file mode 100644
index ad03bec1ba63..000000000000
--- a/nginx/conf/http.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# Default TLS redirect
-server {
-    listen       80;
-    server_name  *.tazj.in tazj.in;
-    return       301 https://$server_name$request_uri;
-}
-
-# Simple IP echo thing
-server {
-    listen 80;
-    listen 443 ssl http2;
-    server_name ip.tazj.in;
-    access_log off;
-    add_header "Content-Type" "text/plain";
-    return 200 "$remote_addr\n";
-}
-
-# Redirect for oslo.pub
-server {
-    listen 80;
-    listen 443 ssl;
-    server_name oslo.pub *.oslo.pub;
-    return 302 https://www.google.com/maps/d/viewer?mid=1pJIYY9cuEdt9DuMTbb4etBVq7hs;
-}
-
-# Gogs web interface
-server {
-    listen 443 ssl http2;
-    server_name git.tazj.in;
-
-    location / {
-        proxy_pass http://gogs-priv.default.svc.cluster.local:3000;
-    }
-}
-
-# tazj.in -> www.tazj.in
-server {
-    listen 443 ssl http2;
-    server_name tazj.in;
-
-    location / {
-        return 301 https://www.tazj.in$request_uri;
-    }
-}
-
-# TazBlog
-server {
-    listen      443 ssl http2 default_server;
-    server_name www.tazj.in default;
-
-    location / {
-        proxy_pass http://tazblog-priv.default.svc.cluster.local/;
-    }
-}
diff --git a/nginx/conf/main.conf b/nginx/conf/main.conf
deleted file mode 100644
index d5618545bd15..000000000000
--- a/nginx/conf/main.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-user  nginx;
-worker_processes  1;
-daemon off;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    sendfile        on;
-
-    keepalive_timeout  65;
-    gzip  on;
-
-    # Modern SSL config
-    ssl_protocols TLSv1.2;
-    ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
-    ssl_prefer_server_ciphers on;
-    ssl_session_timeout 1d;
-    ssl_session_cache shared:HTTPS:50m;
-    ssl_session_tickets off;
-    ssl_dhparam /etc/nginx/ssl/dhparam/tls.dhparam;
-
-    # Logstash log format
-    log_format logstash '$http_host '
-    '$remote_addr [$time_local] '
-    '"$request" $status $body_bytes_sent '
-    '"$http_referer" "$http_user_agent" '
-    '$request_time '
-    '$upstream_response_time';
-
-    access_log   /var/log/nginx/access.log  logstash;
-
-    # Default tazj.in config (certs need to be overriden for other stuff, like oslo.pub)
-    ssl_certificate /etc/nginx/ssl/tazj.in/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/tazj.in/key.pem;
-
-    # HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
-    add_header Strict-Transport-Security max-age=15768000;
-
-    include /etc/nginx/conf/http.conf;
-}
-
-stream {
-    ssl_protocols TLSv1.2;
-    ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
-    ssl_dhparam /etc/nginx/ssl/dhparam/tls.dhparam;
-    ssl_prefer_server_ciphers on;
-    ssl_session_timeout 1d;
-    ssl_session_cache shared:STREAM:50m;
-    ssl_session_tickets off;
-
-    # Default tazj.in certificate
-    ssl_certificate /etc/nginx/ssl/tazj.in/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/tazj.in/key.pem;
-
-    include /etc/nginx/conf/stream.conf;
-}
diff --git a/nginx/conf/stream.conf b/nginx/conf/stream.conf
deleted file mode 100644
index 3fa02fdcf9a7..000000000000
--- a/nginx/conf/stream.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Gogs SSH tunneling
-server {
-    listen 22;
-    proxy_pass gogs-priv.default.svc.cluster.local:22;
-}
-
-# Quassel TLS -> TCP tunneling
-server {
-    # listen 4242 ssl;
-    listen 4242;
-    proxy_pass quassel-priv.default.svc.cluster.local:4242;
-}