mirror of
https://github.com/schollz/cowyo.git
synced 2023-08-10 21:13:00 +03:00
Fixed folders for static
Former-commit-id: 4a38971bd37fe3e363d63f35c23f0600e19ca7f3 [formerly 069f5528afe5d6770c59721e5dca25a2a58ac022] [formerly fc96b8c5a409b606b5c2cd783a6f46aeb005aa2d [formerly fe06f599bd
]]
Former-commit-id: 06bfeeaf5f17c68c24d207e7cc71113d2412eca8 [formerly 5f7834e441f5b3c7c56892eae626d13b8c4e6f2b]
Former-commit-id: 1b9223c05d4b232960d1abbcde01e02514cdb020
This commit is contained in:
parent
9667e3643c
commit
659c15b0bb
4
main.go
4
main.go
@ -26,6 +26,7 @@ var RuntimeArgs struct {
|
||||
DatabaseLocation string
|
||||
ServerCRT string
|
||||
ServerKey string
|
||||
SourcePath string
|
||||
}
|
||||
|
||||
func main() {
|
||||
@ -51,6 +52,7 @@ Options:`)
|
||||
if RuntimeArgs.ExternalIP == "" {
|
||||
log.Fatal("You need to specify the external IP address")
|
||||
}
|
||||
RuntimeArgs.SourcePath = path.Dir(executableFile)
|
||||
Open(RuntimeArgs.DatabaseLocation)
|
||||
defer Close()
|
||||
|
||||
@ -63,7 +65,7 @@ Options:`)
|
||||
//rebuildTexts(q)
|
||||
|
||||
r := gin.Default()
|
||||
r.LoadHTMLGlob(path.Join(path.Dir(executableFile), "templates/*"))
|
||||
r.LoadHTMLGlob(path.Join(RuntimeArgs.SourcePath, "templates/*"))
|
||||
r.GET("/", newNote)
|
||||
r.GET("/:title", editNote)
|
||||
r.GET("/:title/*option", everythingElse)
|
||||
|
@ -4,6 +4,7 @@ import (
|
||||
"html/template"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"path"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
@ -56,7 +57,7 @@ func everythingElse(c *gin.Context) {
|
||||
}
|
||||
|
||||
func serveStaticFile(c *gin.Context, option string) {
|
||||
staticFile, err := ioutil.ReadFile("./static" + option)
|
||||
staticFile, err := ioutil.ReadFile(path.Join(RuntimeArgs.SourcePath, "static") + option)
|
||||
if err != nil {
|
||||
c.AbortWithStatus(404)
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user