Browse Source

Add version string to config endpoint

pull/53/head
Gabe Kangas 5 years ago
parent
commit
1f51ef9668
  1. 6
      config/config.go
  2. 6
      controllers/config.go
  3. 2
      main.go
  4. 2
      webroot/js/app.js

6
config/config.go

@ -24,6 +24,7 @@ type config struct { @@ -24,6 +24,7 @@ type config struct {
WebServerPort int `yaml:"webServerPort"`
S3 s3 `yaml:"s3"`
InstanceDetails InstanceDetails `yaml:"instanceDetails"`
VersionInfo string `yaml:"-"`
}
// InstanceDetails defines the user-visible information about this particular instance.
@ -35,6 +36,7 @@ type InstanceDetails struct { @@ -35,6 +36,7 @@ type InstanceDetails struct {
Tags []string `yaml:"tags" json:"tags"`
SocialHandles []socialHandle `yaml:"socialHandles" json:"socialHandles"`
ExtraInfoFile string `yaml:"extraUserInfoFileName" json:"extraUserInfoFileName"`
Version string `json:"version"`
}
type socialHandle struct {
@ -142,12 +144,14 @@ func (c *config) verifySettings() error { @@ -142,12 +144,14 @@ func (c *config) verifySettings() error {
}
//Load tries to load the configuration file
func Load(filePath string) error {
func Load(filePath string, versionInfo string) error {
Config = new(config)
if err := Config.load(filePath); err != nil {
return err
}
Config.VersionInfo = versionInfo
return Config.verifySettings()
}

6
controllers/config.go

@ -12,7 +12,7 @@ import ( @@ -12,7 +12,7 @@ import (
func GetWebConfig(w http.ResponseWriter, r *http.Request) {
middleware.EnableCors(&w)
config := config.Config.InstanceDetails
json.NewEncoder(w).Encode(config)
configuration := config.Config.InstanceDetails
configuration.Version = config.Config.VersionInfo
json.NewEncoder(w).Encode(configuration)
}

2
main.go

@ -34,7 +34,7 @@ func main() { @@ -34,7 +34,7 @@ func main() {
logrus.SetReportCaller(true)
}
if err := config.Load(*configFile); err != nil {
if err := config.Load(*configFile, getVersion()); err != nil {
panic(err)
}

2
webroot/js/app.js

@ -47,7 +47,7 @@ async function setupApp() { @@ -47,7 +47,7 @@ async function setupApp() {
app.summary = config.summary && addNewlines(config.summary);
app.tags = config.tags;
app.title = config.title;
app.appVersion = config.appVersion;
app.appVersion = config.version;
try {

Loading…
Cancel
Save