Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-16 07:15:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3495 from ywk253100/171031_config

Browse Source 
Add email_insecure and delete verify_remote_cert configuration item from harbor.cfg
This commit is contained in:
Daniel Jiang 2017-11-02 17:47:48 +08:00 committed by GitHub
commit 6a9dc8a133
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/common/templates/adminserver/env
View File

@ -25,6 +25,7 @@ EMAIL_PWD=$email_pwd
EMAIL_SSL=$email_ssl EMAIL_SSL=$email_ssl
EMAIL_FROM=$email_from EMAIL_FROM=$email_from
EMAIL_IDENTITY=$email_identity EMAIL_IDENTITY=$email_identity
EMAIL_INSECURE=$email_insecure
HARBOR_ADMIN_PASSWORD=$harbor_admin_password HARBOR_ADMIN_PASSWORD=$harbor_admin_password
PROJECT_CREATION_RESTRICTION=$project_creation_restriction PROJECT_CREATION_RESTRICTION=$project_creation_restriction
MAX_JOB_WORKERS=$max_job_workers MAX_JOB_WORKERS=$max_job_workers

5
make/harbor.cfg
View File

@ -55,6 +55,7 @@ email_username = sample_admin@mydomain.com
email_password = abc email_password = abc
email_from = admin <sample_admin@mydomain.com> email_from = admin <sample_admin@mydomain.com>
email_ssl = false email_ssl = false
email_insecure = false
##The initial password of Harbor admin, only works for the first time when Harbor starts. ##The initial password of Harbor admin, only works for the first time when Harbor starts.
#It has no effect after the first launch of Harbor. #It has no effect after the first launch of Harbor.
@ -101,10 +102,6 @@ token_expiration = 30
#Set to "adminonly" so that only admin user can create project. #Set to "adminonly" so that only admin user can create project.
project_creation_restriction = everyone project_creation_restriction = everyone
#Determine whether the job service should verify the ssl cert when it connects to a remote registry.
#Set this flag to off when the remote registry uses a self-signed or untrusted certificate.
verify_remote_cert = on
#The follow configurations are for Harbor HA mode only #The follow configurations are for Harbor HA mode only
#the address of the mysql database. #the address of the mysql database.

2
make/prepare
View File

@ -119,6 +119,7 @@ email_usr = rcp.get("configuration", "email_username")
email_pwd = rcp.get("configuration", "email_password") email_pwd = rcp.get("configuration", "email_password")
email_from = rcp.get("configuration", "email_from") email_from = rcp.get("configuration", "email_from")
email_ssl = rcp.get("configuration", "email_ssl") email_ssl = rcp.get("configuration", "email_ssl")
email_insecure = rcp.get("configuration", "email_insecure")
harbor_admin_password = rcp.get("configuration", "harbor_admin_password") harbor_admin_password = rcp.get("configuration", "harbor_admin_password")
auth_mode = rcp.get("configuration", "auth_mode") auth_mode = rcp.get("configuration", "auth_mode")
ldap_url = rcp.get("configuration", "ldap_url") ldap_url = rcp.get("configuration", "ldap_url")
@ -234,6 +235,7 @@ render(os.path.join(templates_dir, "adminserver", "env"),
email_usr=email_usr, email_usr=email_usr,
email_pwd=email_pwd, email_pwd=email_pwd,
email_ssl=email_ssl, email_ssl=email_ssl,
email_insecure=email_insecure,
email_from=email_from, email_from=email_from,
email_identity=email_identity, email_identity=email_identity,
harbor_admin_password=harbor_admin_password, harbor_admin_password=harbor_admin_password,