forked from tangled.org/core
Monorepo for Tangled — https://tangled.org

appview/config: add TANGLED_DEV config

anirudh.fi 6d117f8c 74ac77e6

verified
Changed files
+12 -4
appview
+1
appview/config.go
···
CookieSecret string `env:"TANGLED_COOKIE_SECRET, default=00000000000000000000000000000000"`
DbPath string `env:"TANGLED_DB_PATH, default=appview.db"`
ListenAddr string `env:"TANGLED_LISTEN_ADDR, default=0.0.0.0:3000"`
}
func LoadConfig(ctx context.Context) (*Config, error) {
···
CookieSecret string `env:"TANGLED_COOKIE_SECRET, default=00000000000000000000000000000000"`
DbPath string `env:"TANGLED_DB_PATH, default=appview.db"`
ListenAddr string `env:"TANGLED_LISTEN_ADDR, default=0.0.0.0:3000"`
+
Dev bool `env:"TANGLED_DEV, default=false"`
}
func LoadConfig(ctx context.Context) (*Config, error) {
+5 -3
appview/state/git_http.go
···
knot := r.Context().Value("knot").(string)
repo := chi.URLParam(r, "repo")
-
// TODO: make this https for production!
-
targetURL := fmt.Sprintf("https://%s/%s/%s/info/refs?%s", knot, user.DID, repo, r.URL.RawQuery)
resp, err := http.Get(targetURL)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
···
}
knot := r.Context().Value("knot").(string)
repo := chi.URLParam(r, "repo")
-
// TODO: make this https for production!
targetURL := fmt.Sprintf("https://%s/%s/%s/git-upload-pack?%s", knot, user.DID, repo, r.URL.RawQuery)
client := &http.Client{}
···
knot := r.Context().Value("knot").(string)
repo := chi.URLParam(r, "repo")
+
uri := "https"
+
if s.config.Dev {
+
uri = "http"
+
}
+
targetURL := fmt.Sprintf("%s://%s/%s/%s/info/refs?%s", uri, knot, user.DID, repo, r.URL.RawQuery)
resp, err := http.Get(targetURL)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
···
}
knot := r.Context().Value("knot").(string)
repo := chi.URLParam(r, "repo")
targetURL := fmt.Sprintf("https://%s/%s/%s/git-upload-pack?%s", knot, user.DID, repo, r.URL.RawQuery)
client := &http.Client{}
+6 -1
appview/state/signer.go
···
"fmt"
"net/http"
"net/url"
"time"
)
···
},
}
-
url, err := url.Parse(fmt.Sprintf("https://%s", domain))
if err != nil {
return nil, err
}
···
"fmt"
"net/http"
"net/url"
+
"os"
"time"
)
···
},
}
+
uri := "https"
+
if os.Getenv("TANGLED_DEV") == "true" {
+
uri = "http"
+
}
+
url, err := url.Parse(fmt.Sprintf("%s://%s", uri, domain))
if err != nil {
return nil, err
}