Selaa lähdekoodia

get HTTPD binding from env: respect the documented default

Nicola Murino 4 vuotta sitten
vanhempi
commit
62744e081b
3 muutettua tiedostoa jossa 6 lisäystä ja 6 poistoa
  1. 4 1
      config/config.go
  2. 0 4
      config/config_test.go
  3. 2 1
      docs/howto/getting-started.md

+ 4 - 1
config/config.go

@@ -806,7 +806,10 @@ func getWebDAVDBindingFromEnv(idx int) {
 }
 
 func getHTTPDBindingFromEnv(idx int) {
-	binding := httpd.Binding{}
+	binding := httpd.Binding{
+		EnableWebAdmin:  true,
+		EnableWebClient: true,
+	}
 	if len(globalConf.HTTPDConfig.Bindings) > idx {
 		binding = globalConf.HTTPDConfig.Bindings[idx]
 	}

+ 0 - 4
config/config_test.go

@@ -628,8 +628,6 @@ func TestHTTPDBindingsFromEnv(t *testing.T) {
 	os.Setenv("SFTPGO_HTTPD__BINDINGS__1__ADDRESS", "127.0.0.1")
 	os.Setenv("SFTPGO_HTTPD__BINDINGS__1__PORT", "8000")
 	os.Setenv("SFTPGO_HTTPD__BINDINGS__1__ENABLE_HTTPS", "0")
-	os.Setenv("SFTPGO_HTTPD__BINDINGS__1__ENABLE_WEB_ADMIN", "1")
-	os.Setenv("SFTPGO_HTTPD__BINDINGS__1__ENABLE_WEB_CLIENT", "1")
 	os.Setenv("SFTPGO_HTTPD__BINDINGS__2__ADDRESS", "127.0.1.1")
 	os.Setenv("SFTPGO_HTTPD__BINDINGS__2__PORT", "9000")
 	os.Setenv("SFTPGO_HTTPD__BINDINGS__2__ENABLE_WEB_ADMIN", "0")
@@ -645,8 +643,6 @@ func TestHTTPDBindingsFromEnv(t *testing.T) {
 		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__1__ADDRESS")
 		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__1__PORT")
 		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__1__ENABLE_HTTPS")
-		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__1__ENABLE_WEB_ADMIN")
-		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__1__ENABLE_WEB_CLIENT")
 		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__ADDRESS")
 		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__PORT")
 		os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__ENABLE_HTTPS")

+ 2 - 1
docs/howto/getting-started.md

@@ -346,13 +346,14 @@ We suppose you have installed CocroackDB this way:
 
 ```shell
 sudo su
-export CRDB_VERSION=20.2.10 # set the latest available version here
+export CRDB_VERSION=21.1.2 # set the latest available version here
 wget -qO- https://binaries.cockroachdb.com/cockroach-v${CRDB_VERSION}.linux-amd64.tgz | tar xvz
 cp -i cockroach-v${CRDB_VERSION}.linux-amd64/cockroach /usr/local/bin/
 mkdir -p /usr/local/lib/cockroach
 cp -i cockroach-v${CRDB_VERSION}.linux-amd64/lib/libgeos.so /usr/local/lib/cockroach/
 cp -i cockroach-v${CRDB_VERSION}.linux-amd64/lib/libgeos_c.so /usr/local/lib/cockroach/
 mkdir /var/lib/cockroach
+chown sftpgo:sftpgo /var/lib/cockroach
 mkdir -p /etc/cockroach/{certs,ca}
 chmod 700 /etc/cockroach/ca
 /usr/local/bin/cockroach cert create-ca --certs-dir=/etc/cockroach/certs --ca-key=/etc/cockroach/ca/ca.key