changeset 1636:8efb10bf569a

remove duplicate files
author fffilimonov
date Wed, 15 Dec 2021 08:26:29 +0000
parents fd3d56f39450
children a65802b06b01
files host/startup/mime.types host/startup/nginx.conf.luan host/startup/nginx.default.conf.luan host/startup/nginx.ssl.conf.luan host/startup/startLuanhost.sh
diffstat 5 files changed, 0 insertions(+), 188 deletions(-) [+]
line wrap: on
line diff
diff -r fd3d56f39450 -r 8efb10bf569a host/startup/mime.types
--- a/host/startup/mime.types	Tue Dec 14 18:50:43 2021 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-
-types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
-
-    text/mathml                                      mml;
-    text/plain                                       txt luan log;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
-
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
-
-    application/font-woff                            woff;
-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
-
-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
-
-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
-
-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
-}
diff -r fd3d56f39450 -r 8efb10bf569a host/startup/nginx.conf.luan
--- a/host/startup/nginx.conf.luan	Tue Dec 14 18:50:43 2021 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-local rootDir, user, group = ...
-
-%>
-worker_processes  4;
-user <%=user%> <%=group%>;
-
-events {
-	worker_connections  4096;
-}
-
-http { 
-	include mime.types;
-	default_type application/octet-stream;
-	sendfile on;
-	keepalive_timeout 65;
-
-	proxy_cache_path <%=rootDir%>/local/nginx_cache levels=1:2 keys_zone=nginx_cache:60m max_size=10g inactive=60m use_temp_path=off;
-
-	upstream luan {
-		server 127.0.0.1:8080;
-	}
-
-	server {
-		listen 80 default_server;
-		include nginx.default.conf;
-	}
-
-	include <%=rootDir%>/sites/*/nginx.ssl.conf;
-}
-<%
diff -r fd3d56f39450 -r 8efb10bf569a host/startup/nginx.default.conf.luan
--- a/host/startup/nginx.default.conf.luan	Tue Dec 14 18:50:43 2021 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-local rootDir, leKey  = ...
-
-%>
-	client_max_body_size 32m;
-
-	proxy_http_version 1.1;
-	proxy_set_header Host $http_host;
-	error_log <%=rootDir%>/logs/nginx_error.log;
-
-	proxy_set_header X-Forwarded-Proto $scheme;
-	proxy_set_header X-Real-IP $remote_addr;
-
-	charset utf-8;
-
-	location ~ "^/\.well-known/acme-challenge/([-_a-zA-Z0-9]+)$" {
-		default_type text/plain;
-		return 200 "$1.<%=leKey%>";
-	}
-
-	location ~ /(?<path>.*) {
-		proxy_cache_key $scheme$host$request_uri;
-		proxy_cache nginx_cache;
-		proxy_cache_revalidate on;
-		proxy_cache_min_uses 1;
-		proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
-		proxy_cache_background_update on;
-		proxy_cache_lock on;
-		add_header X-Cache-Status $upstream_cache_status;
-		proxy_pass http://luan;
-	}
-<%
diff -r fd3d56f39450 -r 8efb10bf569a host/startup/nginx.ssl.conf.luan
--- a/host/startup/nginx.ssl.conf.luan	Tue Dec 14 18:50:43 2021 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-local rootDir, domain = ...
-
-%>
-	server {
-		server_name <%=domain%>;
-		listen 80;
-		return 301 https://$http_host$request_uri;
-	}
-
-	server {
-		server_name <%=domain%>;
-		listen 443 ssl;
-
-		if ($host != $server_name) {
-			return 301 http://$http_host$request_uri;
-		}
-
-		ssl_certificate <%=rootDir%>/sites/<%=domain%>/fullchain.cer;
-		ssl_certificate_key <%=rootDir%>/sites/<%=domain%>/<%=domain%>.key;
-		include <%=rootDir%>/local/nginx.default.conf;
-	}
-<%
diff -r fd3d56f39450 -r 8efb10bf569a host/startup/startLuanhost.sh
--- a/host/startup/startLuanhost.sh	Tue Dec 14 18:50:43 2021 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd "$1";
-
-#can't determine if network is available at startup
-sleep 60;
-
-./start.sh "launchd";