fic
/
server
2
0
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

admin: can give the static dir location

This commit is contained in:
nemunaire 2016-11-19 16:35:39 +01:00
parent 5fa19223a9
commit 9894a91948
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/main.go
View File

@ -19,6 +19,7 @@ var BaseURL string
var CloudDAVBase string
var CloudUsername string
var CloudPassword string
var StaticDir string
func main() {
var bind = flag.String("bind", "127.0.0.1:8081", "Bind port/socket")
@ -26,6 +27,7 @@ func main() {
flag.StringVar(&BaseURL, "baseurl", "/", "URL prepended to each URL")
flag.StringVar(&SubmissionDir, "submission", "./submissions/", "Base directory where save submissions")
flag.StringVar(&PKIDir, "pki", "./pki/", "Base directory where found PKI scripts")
flag.StringVar(&StaticDir, "static", "./htdocs-admin/", "Directory containing static files")
flag.StringVar(&fic.FilesDir, "files", "./FILES/", "Base directory where found challenges files, local part")
flag.StringVar(&CloudDAVBase, "clouddav", "https://srs.epita.fr/owncloud/remote.php/webdav/FIC 2016",
"Base directory where found challenges files, cloud part")
@ -35,10 +37,9 @@ func main() {
log.SetPrefix("[admin] ")
var staticDir string
var err error
log.Println("Checking paths...")
if staticDir, err = filepath.Abs("./static/"); err != nil {
if StaticDir, err = filepath.Abs(StaticDir); err != nil {
log.Fatal(err)
}
if fic.FilesDir, err = filepath.Abs(fic.FilesDir); err != nil {
@ -66,11 +67,11 @@ func main() {
}
log.Println("Changing base url...")
if file, err := os.OpenFile(path.Join(staticDir, "index.html"), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.FileMode(0644)); err != nil {
if file, err := os.OpenFile(path.Join(StaticDir, "index.html"), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.FileMode(0644)); err != nil {
log.Println("Unable to open index.html: ", err)
} else if indexTmpl, err := template.New("index").Parse(indextpl); err != nil {
log.Println("Cannot create template: ", err)
} else if err := indexTmpl.Execute(file, map[string]string{"urlbase": path.Clean(path.Join(BaseURL, "nuke"))[:len(path.Clean(path.Join(BaseURL, "nuke"))) - 4]}); err != nil {
} else if err := indexTmpl.Execute(file, map[string]string{"urlbase": path.Clean(path.Join(baseURL + "/", "nuke"))[:len(path.Clean(path.Join(baseURL + "/", "nuke"))) - 4]}); err != nil {
log.Println("An error occurs during template execution: ", err)
}

1
htdocs-admin Symbolic link
View File

@ -0,0 +1 @@
admin/static/