caddy-frontend: Implement type:notebook

software/caddy-frontend/buildout.hash.cfg

@@ -91,7 +91,7 @@ md5sum = 69d65e461cd7cd5ef5b1ccd0098b50c8
 
 [template-nginx-notebook-slave-virtualhost]
 filename = templates/nginx-notebook-slave.conf.in
-md5sum = 548af159669069102ab9a1aae7b7dc25
+md5sum = 753e87647d1ed4655432393bba062d3f
 
 [template-apache-lazy-script-call]
 filename = templates/apache-lazy-script-call.sh.in

software/caddy-frontend/templates/nginx-notebook-slave.conf.in

@@ -3,102 +3,55 @@
 {% if url.startswith("http://") or url.startswith("https://") %}
 {%   set upstream = url.split("/")[2] %}
 {%   set https_upstream = https_url.split("/")[2] %}
-{%   set protocol = url.split("/")[0] %}
-{%   set https_protocol = https_url.split("/")[0] %}
-{%   set proxy_pass = '%s//%s' % (protocol, slave_parameter.get('slave_reference')) %}
-{%   set https_proxy_pass = '%s//https_%s' % (protocol, slave_parameter.get('slave_reference')) %}
-{% set ssl_configuration_list = [('ssl_certificate', 'path_to_ssl_crt'),
-                                 ('ssl_certificate_key', 'path_to_ssl_key')] %}
 
+https://{{ slave_parameter.get('custom_domain') }}:{{ nginx_https_port }} {
+  bind {{ local_ipv4 }}
+  log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  errors {{ slave_parameter.get('error_log') }}
 
-# TODO-Caddy upstream {{ slave_parameter.get('slave_reference') }} {
-# TODO-Caddy   server {{ upstream }};
-# TODO-Caddy }
-
-# TODO-Caddy upstream https_{{ slave_parameter.get('slave_reference') }} {
-# TODO-Caddy   server {{ https_upstream }};
-# TODO-Caddy }
-
-
-# TODO-Caddy server {
-# TODO-Caddy   listen {{ local_ipv4 }}:{{ nginx_http_port }};
-# TODO-Caddy 
-# TODO-Caddy   server_name {{ slave_parameter.get('custom_domain') }};
-# TODO-Caddy 
-# TODO-Caddy   error_log {{ slave_parameter.get('error_log') }} error; 
-# TODO-Caddy   access_log {{ slave_parameter.get('access_log') }} custom;
-# TODO-Caddy 
-# TODO-Caddy   location / {
-# TODO-Caddy         proxy_pass            {{ proxy_pass }};
-# TODO-Caddy         proxy_set_header      Host $host;
-# TODO-Caddy   }
-# TODO-Caddy 
-# TODO-Caddy   location ~ /api/kernels/ {
-# TODO-Caddy         proxy_pass            {{ proxy_pass }};
-# TODO-Caddy         proxy_set_header      Host $host;
-# TODO-Caddy         # websocket support
-# TODO-Caddy         proxy_http_version    1.1;
-# TODO-Caddy         proxy_set_header      Upgrade "websocket";
-# TODO-Caddy         proxy_set_header      Connection "Upgrade";
-# TODO-Caddy         proxy_read_timeout    86400;
-# TODO-Caddy    }
-# TODO-Caddy 
-# TODO-Caddy   location ~ /terminals/ {
-# TODO-Caddy         proxy_pass            {{ proxy_pass }};
-# TODO-Caddy         proxy_set_header      Host $host;
-# TODO-Caddy         # websocket support
-# TODO-Caddy         proxy_http_version    1.1;
-# TODO-Caddy         proxy_set_header      Upgrade "websocket";
-# TODO-Caddy         proxy_set_header      Connection "Upgrade";
-# TODO-Caddy         proxy_read_timeout    86400;
-# TODO-Caddy   }
-# TODO-Caddy }
-
-# TODO-Caddy server {
-# TODO-Caddy   listen {{ local_ipv4 }}:{{ nginx_https_port }} ssl;
-# TODO-Caddy 
-# TODO-Caddy   server_name {{ slave_parameter.get('custom_domain') }};
-# TODO-Caddy 
-# TODO-Caddy   error_log {{ slave_parameter.get('error_log') }} error;
-# TODO-Caddy   access_log {{ slave_parameter.get('access_log') }} custom;
-# TODO-Caddy 
-# TODO-Caddy   ssl on;
-# TODO-Caddy   
-# TODO-Caddy   ssl_session_timeout 5m;
-# TODO-Caddy   ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-# TODO-Caddy   ssl_ciphers 'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5';
-# TODO-Caddy   ssl_prefer_server_ciphers on;
-# TODO-Caddy   ssl_session_cache shared:SSL:10m;
-
-{% for key, value in ssl_configuration_list %}
-{%   if value in slave_parameter %}
-# TODO-Caddy {{ '  %s' % key }} {{ slave_parameter.get(value) }};
+  tls {{ slave_parameter.get('path_to_ssl_crt', slave_parameter.get('login_certificate')) }} {{ slave_parameter.get('path_to_ssl_key', slave_parameter.get('login_key')) }} {
+{% if slave_parameter.get('path_to_ssl_ca_crt') %}
+    clients {{ slave_parameter.get('path_to_ssl_ca_crt') }}
 {% endif %}
-{% endfor %}
-
-# TODO-Caddy   location / {
-# TODO-Caddy         proxy_pass            {{ https_proxy_pass }};
-# TODO-Caddy         proxy_set_header      Host $host;
-# TODO-Caddy   }
-# TODO-Caddy 
-# TODO-Caddy   location ~ /api/kernels/ {
-# TODO-Caddy         proxy_pass            {{ https_proxy_pass }};
-# TODO-Caddy         proxy_set_header      Host $host;
-# TODO-Caddy         # websocket support
-# TODO-Caddy         proxy_http_version    1.1;
-# TODO-Caddy         proxy_set_header      Upgrade "websocket";
-# TODO-Caddy         proxy_set_header      Connection "Upgrade";
-# TODO-Caddy         proxy_read_timeout    86400;
-# TODO-Caddy    }
-# TODO-Caddy 
-# TODO-Caddy   location ~ /terminals/ {
-# TODO-Caddy         proxy_pass            {{ https_proxy_pass }};
-# TODO-Caddy         proxy_set_header      Host $host;
-# TODO-Caddy         # websocket support
-# TODO-Caddy         proxy_http_version    1.1;
-# TODO-Caddy         proxy_set_header      Upgrade "websocket";
-# TODO-Caddy         proxy_set_header      Connection "Upgrade";
-# TODO-Caddy         proxy_read_timeout    86400;
-# TODO-Caddy   }
-# TODO-Caddy }
+    alpn http/1.1
+  }
+
+  proxy / {{ https_upstream }} {
+    transparent
+    insecure_skip_verify
+  }
+  rewrite {
+    regexp "/(api/kernels/[^/]+/(channels|iopub|shell|stdin)|terminals/websocket)/?"
+    to /proxy/{1}
+  }
+  proxy /proxy/ {{ https_upstream }} {
+    header_upstream X-Real-IP {remote}
+    header_upstream Host {host}
+    websocket
+    without /proxy/
+    insecure_skip_verify
+  }
+}
+
+http://{{ slave_parameter.get('custom_domain') }}:{{ nginx_http_port }} {
+  bind {{ local_ipv4 }}
+  log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  errors {{ slave_parameter.get('error_log') }}
+
+  proxy / {{ upstream }} {
+    transparent
+    insecure_skip_verify
+  }
+  rewrite {
+    regexp "/(api/kernels/[^/]+/(channels|iopub|shell|stdin)|terminals/websocket)/?"
+    to /proxy/{1}
+  }
+  proxy /proxy/ {{ upstream }} {
+    header_upstream X-Real-IP {remote}
+    header_upstream Host {host}
+    websocket
+    without /proxy/
+    insecure_skip_verify
+  }
+}
 {% endif %}