Compare commits
No commits in common. "master" and "v1.0.2" have entirely different histories.
14
README.md
14
README.md
@ -45,8 +45,11 @@ In `/etc/nginx/dumpdom.conf`, paste this:
|
|||||||
|
|
||||||
```
|
```
|
||||||
map $http_user_agent $dumpdom_ua {
|
map $http_user_agent $dumpdom_ua {
|
||||||
|
|
||||||
default 0;
|
default 0;
|
||||||
|
|
||||||
|
"~Prerender" 0;
|
||||||
|
|
||||||
"~*googlebot" 1;
|
"~*googlebot" 1;
|
||||||
"~*bingbot" 1;
|
"~*bingbot" 1;
|
||||||
"~*yandex" 1;
|
"~*yandex" 1;
|
||||||
@ -130,10 +133,10 @@ server {
|
|||||||
if ($uri ~* "\.(js|css|xml|less|png|jpg|jpeg|gif|pdf|doc|txt|ico|rss|zip|mp3|rar|exe|wmv|doc|avi|ppt|mpg|mpeg|tif|wav|mov|psd|ai|xls|mp4|m4a|swf|dat|dmg|iso|flv|m4v|torrent|ttf|woff|svg|eot)") {
|
if ($uri ~* "\.(js|css|xml|less|png|jpg|jpeg|gif|pdf|doc|txt|ico|rss|zip|mp3|rar|exe|wmv|doc|avi|ppt|mpg|mpeg|tif|wav|mov|psd|ai|xls|mp4|m4a|swf|dat|dmg|iso|flv|m4v|torrent|ttf|woff|svg|eot)") {
|
||||||
set $dumpdom 0;
|
set $dumpdom 0;
|
||||||
}
|
}
|
||||||
if ($dumpdom = 1) {
|
if ($prerender = 1) {
|
||||||
proxy_pass http://127.0.0.1:9292;
|
proxy_pass http://127.0.0.1:9292;
|
||||||
}
|
}
|
||||||
if ($dumpdom = 0) {
|
if ($prerender = 0) {
|
||||||
rewrite .* /index.html break;
|
rewrite .* /index.html break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -227,13 +230,16 @@ server {
|
|||||||
if ($args ~ "_escaped_fragment_") {
|
if ($args ~ "_escaped_fragment_") {
|
||||||
set $dumpdom 1;
|
set $dumpdom 1;
|
||||||
}
|
}
|
||||||
|
if ($http_user_agent ~ "Prerender") {
|
||||||
|
set $dumpdom 0;
|
||||||
|
}
|
||||||
if ($uri ~* "\.(js|css|xml|less|png|jpg|jpeg|gif|pdf|doc|txt|ico|rss|zip|mp3|rar|exe|wmv|doc|avi|ppt|mpg|mpeg|tif|wav|mov|psd|ai|xls|mp4|m4a|swf|dat|dmg|iso|flv|m4v|torrent|ttf|woff|svg|eot)") {
|
if ($uri ~* "\.(js|css|xml|less|png|jpg|jpeg|gif|pdf|doc|txt|ico|rss|zip|mp3|rar|exe|wmv|doc|avi|ppt|mpg|mpeg|tif|wav|mov|psd|ai|xls|mp4|m4a|swf|dat|dmg|iso|flv|m4v|torrent|ttf|woff|svg|eot)") {
|
||||||
set $dumpdom 0;
|
set $dumpdom 0;
|
||||||
}
|
}
|
||||||
if ($dumpdom = 1) {
|
if ($prerender = 1) {
|
||||||
proxy_pass http://127.0.0.1:9292;
|
proxy_pass http://127.0.0.1:9292;
|
||||||
}
|
}
|
||||||
if ($dumpdom = 0) {
|
if ($prerender = 0) {
|
||||||
rewrite .* /index.html break;
|
rewrite .* /index.html break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
21
cmd/serve.go
21
cmd/serve.go
@ -16,11 +16,7 @@ limitations under the License.
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/dalu/chromedom/server"
|
"github.com/dalu/chromedom/server"
|
||||||
@ -31,7 +27,6 @@ var (
|
|||||||
binary string
|
binary string
|
||||||
duration time.Duration
|
duration time.Duration
|
||||||
maxmem int
|
maxmem int
|
||||||
addr string
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// serveCmd represents the serve command
|
// serveCmd represents the serve command
|
||||||
@ -43,15 +38,13 @@ var serveCmd = &cobra.Command{
|
|||||||
s := http.DefaultServeMux
|
s := http.DefaultServeMux
|
||||||
h := server.NewHandler(binary, duration, maxmem)
|
h := server.NewHandler(binary, duration, maxmem)
|
||||||
s.Handle("/", h)
|
s.Handle("/", h)
|
||||||
if strings.HasPrefix(addr, "unix:") {
|
return http.ListenAndServe(":9292", s)
|
||||||
return runUnix(strings.TrimPrefix(addr, "unix:"), s)
|
// return runUnix("/tmp/chromedom.sock", s)
|
||||||
} else {
|
|
||||||
fmt.Printf("Listening and serving HTTP on %s", addr)
|
|
||||||
return http.ListenAndServe(addr, s)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
func runUnix(file string, engine *http.ServeMux) (err error) {
|
func runUnix(file string, engine *http.ServeMux) (err error) {
|
||||||
fmt.Printf("Listening and serving HTTP on unix:/%s", file)
|
fmt.Printf("Listening and serving HTTP on unix:/%s", file)
|
||||||
os.Remove(file)
|
os.Remove(file)
|
||||||
@ -60,12 +53,11 @@ func runUnix(file string, engine *http.ServeMux) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer listener.Close()
|
defer listener.Close()
|
||||||
if err := os.Chmod(file, 0777); err != nil {
|
os.Chmod(file, 0777)
|
||||||
return err
|
|
||||||
}
|
|
||||||
err = http.Serve(listener, engine)
|
err = http.Serve(listener, engine)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(serveCmd)
|
rootCmd.AddCommand(serveCmd)
|
||||||
@ -73,5 +65,4 @@ func init() {
|
|||||||
serveCmd.Flags().StringVarP(&binary, "binary", "b", "/usr/bin/google-chrome", "chrome, chromium or headless binary path")
|
serveCmd.Flags().StringVarP(&binary, "binary", "b", "/usr/bin/google-chrome", "chrome, chromium or headless binary path")
|
||||||
serveCmd.Flags().DurationVarP(&duration, "duration", "d", 60*time.Minute, "how long the values live in the cache")
|
serveCmd.Flags().DurationVarP(&duration, "duration", "d", 60*time.Minute, "how long the values live in the cache")
|
||||||
serveCmd.Flags().IntVarP(&maxmem, "maxmem", "m", 512, "maximum memory in MB the cache may use")
|
serveCmd.Flags().IntVarP(&maxmem, "maxmem", "m", 512, "maximum memory in MB the cache may use")
|
||||||
serveCmd.Flags().StringVarP(&addr, "addr", "a", "localhost:9292", "ip:port pair to listen on, or prefixed with unix: the unix socket path to listen on")
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user