Compare commits
No commits in common. "master" and "1.1.0" have entirely different histories.
5
Makefile
5
Makefile
|
@ -1,7 +1,2 @@
|
||||||
minecraft-site: minecraft-site.go index.html go.mod go.sum
|
minecraft-site: minecraft-site.go index.html go.mod go.sum
|
||||||
go build -tags netgo -ldflags '-extldflags "-static"'
|
go build -tags netgo -ldflags '-extldflags "-static"'
|
||||||
|
|
||||||
.PHONY: deploy
|
|
||||||
deploy: minecraft-site
|
|
||||||
rsync --rsync-path="sudo -u minecraft rsync" minecraft-site zirconium:/home/minecraft/minecraft-site
|
|
||||||
ssh zirconium sudo systemctl restart minecraft-site.service
|
|
||||||
|
|
|
@ -55,9 +55,6 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
</section>
|
</section>
|
||||||
{{end}}
|
{{end}}
|
||||||
<p class="light">
|
<p class="light">This page maintained by chandlerswift's <a href="https://git.chandlerswift.com/chandlerswift/minecraft-site">minecraft server list</a>.</p>
|
||||||
This page maintained by chandlerswift's <a href="https://git.chandlerswift.com/chandlerswift/minecraft-site">minecraft server list</a>.
|
|
||||||
<a href="/data.json">API at /data.json</a>.
|
|
||||||
</p>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -73,10 +73,6 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.URL.Path != "/" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update servers with current data
|
// Update servers with current data
|
||||||
for i, s := range config.Servers {
|
for i, s := range config.Servers {
|
||||||
|
@ -93,23 +89,6 @@ func main() {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
http.HandleFunc("/data.json", func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// Update servers with current data
|
|
||||||
for i, s := range config.Servers {
|
|
||||||
// TODO: Query instead (opportunistically?) to get mod lists, etc
|
|
||||||
config.Servers[i].Status, err = minequery.Ping17(s.Host, s.Port)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Error querying server: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
msg, err := json.Marshal(config.Servers)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, err.Error(), 500)
|
|
||||||
}
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.Write(msg)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Serve backup directory
|
// Serve backup directory
|
||||||
if serveBackups { // TODO: add HTML
|
if serveBackups { // TODO: add HTML
|
||||||
http.Handle("/backups/", http.StripPrefix("/backups/", http.FileServer(http.Dir(config.BackupDir))))
|
http.Handle("/backups/", http.StripPrefix("/backups/", http.FileServer(http.Dir(config.BackupDir))))
|
||||||
|
|
Loading…
Reference in a new issue