mirror of
https://github.com/goharbor/harbor.git
synced 2024-09-30 06:18:02 +02:00
Merge pull request #7055 from stonezdj/bug7038
Remove verify_remote_cert
This commit is contained in:
commit
dffb971366
@ -72,36 +72,6 @@ type HTTPAuthProxy struct {
|
|||||||
AlwaysOnBoard bool `json:"always_onboard"`
|
AlwaysOnBoard bool `json:"always_onboard"`
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
// Registry ...
|
|
||||||
type Registry struct {
|
|
||||||
URL string `json:"url"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// TokenService ...
|
|
||||||
type TokenService struct {
|
|
||||||
URL string `json:"url"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// SystemCfg holds all configurations of system
|
|
||||||
type SystemCfg struct {
|
|
||||||
DomainName string `json:"domain_name"` // Harbor external URL: protocol://host:port
|
|
||||||
Authentication *Authentication `json:"authentication"`
|
|
||||||
Database *Database `json:"database"`
|
|
||||||
TokenService *TokenService `json:"token_service"`
|
|
||||||
Registry *Registry `json:"registry"`
|
|
||||||
Email *Email `json:"email"`
|
|
||||||
VerifyRemoteCert bool `json:"verify_remote_cert"`
|
|
||||||
ProjectCreationRestriction string `json:"project_creation_restriction"`
|
|
||||||
MaxJobWorkers int `json:"max_job_workers"`
|
|
||||||
JobLogDir string `json:"job_log_dir"`
|
|
||||||
InitialAdminPwd string `json:"initial_admin_pwd,omitempty"`
|
|
||||||
TokenExpiration int `json:"token_expiration"` // in minute
|
|
||||||
SecretKey string `json:"secret_key,omitempty"`
|
|
||||||
CfgExpiration int `json:"cfg_expiration"`
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
// ConfigEntry ...
|
// ConfigEntry ...
|
||||||
type ConfigEntry struct {
|
type ConfigEntry struct {
|
||||||
ID int64 `orm:"pk;auto;column(id)" json:"-"`
|
ID int64 `orm:"pk;auto;column(id)" json:"-"`
|
||||||
|
@ -30,38 +30,23 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var adminServerTestConfig = map[string]interface{}{
|
var adminServerTestConfig = map[string]interface{}{
|
||||||
common.ExtEndpoint: "host01.com",
|
common.ExtEndpoint: "host01.com",
|
||||||
common.AUTHMode: "db_auth",
|
common.AUTHMode: "db_auth",
|
||||||
common.DatabaseType: "postgresql",
|
common.DatabaseType: "postgresql",
|
||||||
common.PostGreSQLHOST: "127.0.0.1",
|
common.PostGreSQLHOST: "127.0.0.1",
|
||||||
common.PostGreSQLPort: 5432,
|
common.PostGreSQLPort: 5432,
|
||||||
common.PostGreSQLUsername: "postgres",
|
common.PostGreSQLUsername: "postgres",
|
||||||
common.PostGreSQLPassword: "root123",
|
common.PostGreSQLPassword: "root123",
|
||||||
common.PostGreSQLDatabase: "registry",
|
common.PostGreSQLDatabase: "registry",
|
||||||
// config.SelfRegistration: true,
|
common.LDAPURL: "ldap://127.0.0.1",
|
||||||
common.LDAPURL: "ldap://127.0.0.1",
|
common.LDAPSearchDN: "cn=admin,dc=example,dc=com",
|
||||||
common.LDAPSearchDN: "cn=admin,dc=example,dc=com",
|
common.LDAPSearchPwd: "admin",
|
||||||
common.LDAPSearchPwd: "admin",
|
common.LDAPBaseDN: "dc=example,dc=com",
|
||||||
common.LDAPBaseDN: "dc=example,dc=com",
|
common.LDAPUID: "uid",
|
||||||
common.LDAPUID: "uid",
|
common.LDAPFilter: "",
|
||||||
common.LDAPFilter: "",
|
common.LDAPScope: 3,
|
||||||
common.LDAPScope: 3,
|
common.LDAPTimeout: 30,
|
||||||
common.LDAPTimeout: 30,
|
common.CfgExpiration: 5,
|
||||||
// config.TokenServiceURL: "",
|
|
||||||
// config.RegistryURL: "",
|
|
||||||
// config.EmailHost: "",
|
|
||||||
// config.EmailPort: 25,
|
|
||||||
// config.EmailUsername: "",
|
|
||||||
// config.EmailPassword: "password",
|
|
||||||
// config.EmailFrom: "from",
|
|
||||||
// config.EmailSSL: true,
|
|
||||||
// config.EmailIdentity: "",
|
|
||||||
// config.ProjectCreationRestriction: config.ProCrtRestrAdmOnly,
|
|
||||||
// config.VerifyRemoteCert: false,
|
|
||||||
// config.MaxJobWorkers: 3,
|
|
||||||
// config.TokenExpiration: 30,
|
|
||||||
common.CfgExpiration: 5,
|
|
||||||
// config.JobLogDir: "/var/log/jobs",
|
|
||||||
common.AdminInitialPassword: "password",
|
common.AdminInitialPassword: "password",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,29 +42,15 @@ var ldapTestConfig = map[string]interface{}{
|
|||||||
common.PostGreSQLPassword: "root123",
|
common.PostGreSQLPassword: "root123",
|
||||||
common.PostGreSQLDatabase: "registry",
|
common.PostGreSQLDatabase: "registry",
|
||||||
// config.SelfRegistration: true,
|
// config.SelfRegistration: true,
|
||||||
common.LDAPURL: "ldap://127.0.0.1",
|
common.LDAPURL: "ldap://127.0.0.1",
|
||||||
common.LDAPSearchDN: "cn=admin,dc=example,dc=com",
|
common.LDAPSearchDN: "cn=admin,dc=example,dc=com",
|
||||||
common.LDAPSearchPwd: "admin",
|
common.LDAPSearchPwd: "admin",
|
||||||
common.LDAPBaseDN: "dc=example,dc=com",
|
common.LDAPBaseDN: "dc=example,dc=com",
|
||||||
common.LDAPUID: "uid",
|
common.LDAPUID: "uid",
|
||||||
common.LDAPFilter: "",
|
common.LDAPFilter: "",
|
||||||
common.LDAPScope: 2,
|
common.LDAPScope: 2,
|
||||||
common.LDAPTimeout: 30,
|
common.LDAPTimeout: 30,
|
||||||
// config.TokenServiceURL: "",
|
common.CfgExpiration: 5,
|
||||||
// config.RegistryURL: "",
|
|
||||||
// config.EmailHost: "",
|
|
||||||
// config.EmailPort: 25,
|
|
||||||
// config.EmailUsername: "",
|
|
||||||
// config.EmailPassword: "password",
|
|
||||||
// config.EmailFrom: "from",
|
|
||||||
// config.EmailSSL: true,
|
|
||||||
// config.EmailIdentity: "",
|
|
||||||
// config.ProjectCreationRestriction: config.ProCrtRestrAdmOnly,
|
|
||||||
// config.VerifyRemoteCert: false,
|
|
||||||
// config.MaxJobWorkers: 3,
|
|
||||||
// config.TokenExpiration: 30,
|
|
||||||
common.CfgExpiration: 5,
|
|
||||||
// config.JobLogDir: "/var/log/jobs",
|
|
||||||
common.AdminInitialPassword: "password",
|
common.AdminInitialPassword: "password",
|
||||||
common.LDAPGroupSearchFilter: "objectclass=groupOfNames",
|
common.LDAPGroupSearchFilter: "objectclass=groupOfNames",
|
||||||
common.LDAPGroupBaseDN: "dc=example,dc=com",
|
common.LDAPGroupBaseDN: "dc=example,dc=com",
|
||||||
|
Loading…
Reference in New Issue
Block a user