H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(web): change assets paths

Browse Source
This commit is contained in:
Masahiko AMANO 2023-01-26 21:51:11 +03:00
parent a5728f7838
commit b80eaf55ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/web-server.go
View File

@ -47,7 +47,7 @@ func HandlerAuth(w http.ResponseWriter, r *http.Request) {
var hash [sha256.Size]byte var hash [sha256.Size]byte
var passlen = sha256.Size var passlen = sha256.Size
var err error var err error
passfile, err := os.Open("/etc/tfm/password") passfile, err := os.Open("/etc/tanabata/.htpasswd")
if err != nil { if err != nil {
log.Fatalf("Failed to open password file: %s\n", err) log.Fatalf("Failed to open password file: %s\n", err)
} }
@ -124,7 +124,7 @@ func main() {
server := &http.Server{ server := &http.Server{
Addr: ":42776", Addr: ":42776",
} }
public_fs := http.FileServer(http.Dir("/var/www/tfm")) public_fs := http.FileServer(http.Dir("/srv/www/tanabata"))
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/" && path.Ext(r.URL.Path) == "" { if r.URL.Path != "/" && path.Ext(r.URL.Path) == "" {
r.URL.Path += ".html" r.URL.Path += ".html"
@ -136,7 +136,7 @@ func main() {
tfm_fs := http.FileServer(http.Dir("/srv/data/tfm")) tfm_fs := http.FileServer(http.Dir("/srv/data/tfm"))
http.Handle("/static", tfm_fs) http.Handle("/static", tfm_fs)
log.Println("Running...") log.Println("Running...")
err := server.ListenAndServeTLS("/etc/ssl/certs/tfm.crt", "/etc/ssl/private/tfm.key") err = server.ListenAndServeTLS("/etc/ssl/certs/web-global.crt", "/etc/ssl/private/web-global.key")
if errors.Is(err, http.ErrServerClosed) { if errors.Is(err, http.ErrServerClosed) {
log.Fatalln("Server closed") log.Fatalln("Server closed")
} else if err != nil { } else if err != nil {