Extract web framework

4 files changed, 6 insertions, 33 deletions

diff --git a/web/config.go b/web/config.go
index 2479e38..b307425 100644
--- a/web/config.go
+++ b/web/config.go
@@ -1,8 +1,6 @@
 package web
 
 import (
-        "encoding/json"
-        "io/ioutil"
         "strings"
 
         "code.crute.me/mcrute/go_ddns_manager/bind"
@@ -18,31 +16,6 @@ type ServerConfig struct {
         AcmeSecrets    map[string]map[string]int `json:"ACME"`
 }
 
-func LoadServerConfig(zonesFile, secretsFile, server, view string) (*ServerConfig, error) {
-        scfg := &ServerConfig{
-                DNSClient:      &dns.DNSClient{Server: server},
-                AcmeView:       view,
-                DynamicDnsView: view,
-        }
-
-        cfg, err := bind.ParseBINDConfig(zonesFile)
-        if err != nil {
-                return nil, err
-        }
-        scfg.BindConfig = cfg
-
-        fd, err := ioutil.ReadFile(secretsFile)
-        if err != nil {
-                return nil, err
-        }
-
-        if err = json.Unmarshal(fd, scfg); err != nil {
-                return nil, err
-        }
-
-        return scfg, nil
-}
-
 func (s *ServerConfig) GetDDNSZoneName(k string) string {
         v, _ := s.DDNSSecrets[k]
         return v
diff --git a/web/controllers/acme.go b/web/controllers/acme.go
index 5090b70..457bee6 100644
--- a/web/controllers/acme.go
+++ b/web/controllers/acme.go
@@ -9,8 +9,8 @@ import (
 
         "github.com/gin-gonic/gin"
 
+        "code.crute.me/mcrute/frame"
         "code.crute.me/mcrute/go_ddns_manager/dns"
-        "code.crute.me/mcrute/go_ddns_manager/util"
         "code.crute.me/mcrute/go_ddns_manager/web/middleware"
 )
 
@@ -103,7 +103,7 @@ func CreateAcmeChallenge(c *gin.Context) {
                 return
         }
 
-        url := util.MakeURL(c.Request, "/acme/%s", AcmeChallengeID{
+        url := frame.MakeURL(c.Request, "/acme/%s", AcmeChallengeID{
                 Zone:      zone.Name,
                 Prefix:    prefix,
                 Challenge: ch.Challenge,
diff --git a/web/controllers/ddns.go b/web/controllers/ddns.go
index d476255..201ee0d 100644
--- a/web/controllers/ddns.go
+++ b/web/controllers/ddns.go
@@ -7,8 +7,8 @@ import (
         "github.com/gin-gonic/gin"
         godns "github.com/miekg/dns"
 
+        "code.crute.me/mcrute/frame"
         "code.crute.me/mcrute/go_ddns_manager/dns"
-        "code.crute.me/mcrute/go_ddns_manager/util"
         "code.crute.me/mcrute/go_ddns_manager/web/middleware"
 )
 
@@ -29,7 +29,7 @@ func UpdateDynamicDNS(c *gin.Context) {
                 return
         }
 
-        inip := util.GetRequestIP(c)
+        inip := frame.GetRequestIP(c)
         if inip == nil {
                 log.Println("ddns: Unable to parse IP")
                 c.AbortWithStatus(http.StatusInternalServerError)
diff --git a/web/controllers/reflect_ip.go b/web/controllers/reflect_ip.go
index 199d736..556f15b 100644
--- a/web/controllers/reflect_ip.go
+++ b/web/controllers/reflect_ip.go
@@ -5,11 +5,11 @@ import (
 
         "github.com/gin-gonic/gin"
 
-        "code.crute.me/mcrute/go_ddns_manager/util"
+        "code.crute.me/mcrute/frame"
 )
 
 func ReflectIP(c *gin.Context) {
-        ip := util.GetRequestIP(c)
+        ip := frame.GetRequestIP(c)
         if ip == nil {
                 c.String(http.StatusInternalServerError, "")
                 return