vh/rest-server
1
0
Fork 0
mirror of https://github.com/restic/rest-server.git synced 2026-09-25 13:31:31 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Miscellaneous server.go changes

Browse Source
This commit is contained in:
Zlatko Čalušić
2016-11-06 19:21:17 +01:00
parent 9bba2f0b78
commit 0b7c460632
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server.go
+1 -8
View File
@@ -10,15 +10,12 @@ import (
) )
func main() { func main() {
var err error
// Parse command line arguments.
var listen = flag.String("listen", ":8000", "listen address") var listen = flag.String("listen", ":8000", "listen address")
var path = flag.String("path", "/tmp/restic", "data directory") var path = flag.String("path", "/tmp/restic", "data directory")
var tls = flag.Bool("tls", false, "turn on TLS support") var tls = flag.Bool("tls", false, "turn on TLS support")
flag.Parse() flag.Parse()
// Create the missing directories. log.Println("Creating repository directories")
dirs := []string{ dirs := []string{
"data", "data",
"index", "index",
@@ -34,7 +31,6 @@ func main() {
os.MkdirAll(filepath.Join(*path, "data", fmt.Sprintf("%02x", i)), 0700) os.MkdirAll(filepath.Join(*path, "data", fmt.Sprintf("%02x", i)), 0700)
} }
// Define the routes.
context := &Context{*path} context := &Context{*path}
router := NewRouter() router := NewRouter()
router.HeadFunc("/config", CheckConfig(context)) router.HeadFunc("/config", CheckConfig(context))
@@ -46,7 +42,6 @@ func main() {
router.PostFunc("/:type/:name", SaveBlob(context)) router.PostFunc("/:type/:name", SaveBlob(context))
router.DeleteFunc("/:type/:name", DeleteBlob(context)) router.DeleteFunc("/:type/:name", DeleteBlob(context))
// Check for a password file.
var handler http.Handler var handler http.Handler
htpasswdFile, err := NewHtpasswdFromFile(filepath.Join(*path, ".htpasswd")) htpasswdFile, err := NewHtpasswdFromFile(filepath.Join(*path, ".htpasswd"))
if err != nil { if err != nil {
@@ -57,7 +52,6 @@ func main() {
handler = AuthHandler(htpasswdFile, router) handler = AuthHandler(htpasswdFile, router)
} }
// Start the server.
if !*tls { if !*tls {
log.Printf("Starting server on %s\n", *listen) log.Printf("Starting server on %s\n", *listen)
err = http.ListenAndServe(*listen, handler) err = http.ListenAndServe(*listen, handler)
@@ -70,7 +64,6 @@ func main() {
log.Printf("Starting server on %s\n", *listen) log.Printf("Starting server on %s\n", *listen)
err = http.ListenAndServeTLS(*listen, publicKey, privateKey, handler) err = http.ListenAndServeTLS(*listen, publicKey, privateKey, handler)
} }
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }