diff --git a/openflare_agent/docker-compose.yaml b/docker-compose.yaml similarity index 83% rename from openflare_agent/docker-compose.yaml rename to docker-compose.yaml index e6befdc1..fb930229 100644 --- a/openflare_agent/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ services: openflare-agent: build: context: . - dockerfile: Dockerfile + dockerfile: openflare_agent/Dockerfile container_name: openflare-agent restart: unless-stopped @@ -12,7 +12,7 @@ services: - "127.0.0.1:18081:18081" volumes: - - ./data/:/data + - ./openflare_agent/data/:/data environment: OPENFLARE_SERVER_URL: "http://host.docker.internal:3000" diff --git a/openflare_agent/internal/nginx/manager.go b/openflare_agent/internal/nginx/manager.go index 10976714..85a0fc8e 100644 --- a/openflare_agent/internal/nginx/manager.go +++ b/openflare_agent/internal/nginx/manager.go @@ -166,6 +166,9 @@ func (m *Manager) writeTargetFiles(mainConfig string, routeConfig string, suppor if err := m.writePowConfig(supportFiles); err != nil { return err } + if err := m.ensureMimeTypes(); err != nil { + return err + } if strings.TrimSpace(m.OpenrestyResolverDirective) == "" && strings.Contains(routeConfig, "set $openflare_upstream ") { slog.Warn("runtime-resolved hostname upstreams detected without available resolvers; hostname origin requests may fail until resolvers are configured") } @@ -808,6 +811,23 @@ func removeEmptyManagedDirs(baseDir string) error { return nil } +func (m *Manager) ensureMimeTypes() error { + if m.MainConfigPath == "" { + return nil + } + configDir := filepath.Dir(m.MainConfigPath) + mimeTypesPath := filepath.Join(configDir, "mime.types") + if _, err := os.Stat(mimeTypesPath); err == nil { + return nil + } else if !os.IsNotExist(err) { + return err + } + if err := os.MkdirAll(configDir, 0o755); err != nil { + return err + } + return os.WriteFile(mimeTypesPath, []byte(DefaultMimeTypes), 0o644) +} + func (m *Manager) renderRouteConfig(content string) string { rendered := content if m.NginxCertDir != "" { diff --git a/openflare_agent/internal/nginx/mimetypes.go b/openflare_agent/internal/nginx/mimetypes.go new file mode 100644 index 00000000..f3ba4ded --- /dev/null +++ b/openflare_agent/internal/nginx/mimetypes.go @@ -0,0 +1,98 @@ +package nginx + +const DefaultMimeTypes = ` +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; + 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; +} +`