summaryrefslogtreecommitdiff
path: root/plugins/http/config
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2021-05-13 20:15:00 +0300
committerGitHub <[email protected]>2021-05-13 20:15:00 +0300
commite1ff9daead5033b537296ffb071e551b95af91ab (patch)
treec3755967c7c40a05f12d81d1f7043ccc0bc3da0c /plugins/http/config
parent705b69631dc91323c64a19594dcfeca06ea4fa5a (diff)
parent1dd0db287da4106d99578338ea252004def788a9 (diff)
#671 fix(static): revert static pluginv2.2.1
#671 fix(static): revert static plugin
Diffstat (limited to 'plugins/http/config')
-rw-r--r--plugins/http/config/http.go21
-rw-r--r--plugins/http/config/static.go58
2 files changed, 0 insertions, 79 deletions
diff --git a/plugins/http/config/http.go b/plugins/http/config/http.go
index 59735e2e..8b63395f 100644
--- a/plugins/http/config/http.go
+++ b/plugins/http/config/http.go
@@ -33,9 +33,6 @@ type HTTP struct {
// Uploads configures uploads configuration.
Uploads *Uploads `mapstructure:"uploads"`
- // static configuration
- Static *Static `mapstructure:"static"`
-
// Pool configures worker pool.
Pool *poolImpl.Config `mapstructure:"pool"`
@@ -103,16 +100,6 @@ func (c *HTTP) InitDefaults() error {
c.SSLConfig.Address = "127.0.0.1:443"
}
- // static files
- if c.Static != nil {
- if c.Static.Pattern == "" {
- c.Static.Pattern = "/static/"
- }
- if c.Static.Dir == "" {
- c.Static.Dir = "."
- }
- }
-
err := c.HTTP2Config.InitDefaults()
if err != nil {
return err
@@ -189,13 +176,5 @@ func (c *HTTP) Valid() error {
}
}
- // validate static
- if c.Static != nil {
- err := c.Static.Valid()
- if err != nil {
- return errors.E(op, err)
- }
- }
-
return nil
}
diff --git a/plugins/http/config/static.go b/plugins/http/config/static.go
deleted file mode 100644
index 4b7b3a9b..00000000
--- a/plugins/http/config/static.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package config
-
-import (
- "os"
-
- "github.com/spiral/errors"
-)
-
-// Static describes file location and controls access to them.
-type Static struct {
- // Dir contains name of directory to control access to.
- // Default - "."
- Dir string
-
- // HTTP pattern, where to serve static files
- // for example - `/static/`, `/my-files/static/`, etc
- // Default - /static/
- Pattern string
-
- // CalculateEtag can be true/false and used to calculate etag for the static
- CalculateEtag bool `mapstructure:"calculate_etag"`
-
- // Weak etag `W/`
- Weak bool
-
- // forbid specifies list of file extensions which are forbidden for access.
- // example: .php, .exe, .bat, .htaccess and etc.
- Forbid []string
-
- // Allow specifies list of file extensions which are allowed for access.
- // example: .php, .exe, .bat, .htaccess and etc.
- Allow []string
-
- // Request headers to add to every static.
- Request map[string]string
-
- // Response headers to add to every static.
- Response map[string]string
-}
-
-// Valid returns nil if config is valid.
-func (c *Static) Valid() error {
- const op = errors.Op("static_plugin_valid")
- st, err := os.Stat(c.Dir)
- if err != nil {
- if os.IsNotExist(err) {
- return errors.E(op, errors.Errorf("root directory '%s' does not exists", c.Dir))
- }
-
- return err
- }
-
- if !st.IsDir() {
- return errors.E(op, errors.Errorf("invalid root directory '%s'", c.Dir))
- }
-
- return nil
-}